Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Incentives: Implements "Mining" - diverting a portion of fees to proposers #5740

Closed
wants to merge 9 commits into from
Closed

Incentives: Implements "Mining" - diverting a portion of fees to proposers #5740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
41c7e60
Implements "Mining" - diverting a portion of fees to proposers
jannotti Sep 15, 2023
a340855
Add min and max to receive block incentives
jannotti Nov 28, 2023
96de6e4
Stop checking for incentive payouts in e2e subs.
jannotti Nov 29, 2023
3bc618b
Add IncentiveEligible field to accounts.
jannotti Nov 30, 2023
fe32dae
Maintain and use the acct.Incentiveligible flag
jannotti Nov 30, 2023
fd735c5
Test assembly of new block fields
jannotti Dec 21, 2023
de07ba9
year
jannotti Jan 9, 2024
55917b8
it's v11 now
jannotti Jan 9, 2024
cf1e51b
Merge remote-tracking branch 'upstream/master' into incentives-2
jannotti Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agreement/abstractions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ type ValidatedBlock interface {
//
// Calls to Seed() or to Digest() on the copy's Block must
// reflect the value of the new seed.
WithSeed(committee.Seed) ValidatedBlock
WithSeed(committee.Seed, basics.Address) ValidatedBlock

// Block returns the underlying block that has been validated.
Block() bookkeeping.Block
Expand Down
3 changes: 2 additions & 1 deletion agreement/agreementtest/simulate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,9 @@ func (b testValidatedBlock) Block() bookkeeping.Block {
return b.Inside
}

func (b testValidatedBlock) WithSeed(s committee.Seed) agreement.ValidatedBlock {
func (b testValidatedBlock) WithSeed(s committee.Seed, proposer basics.Address) agreement.ValidatedBlock {
b.Inside.BlockHeader.Seed = s
b.Inside.BlockHeader.Proposer = proposer
return b
}

Expand Down
3 changes: 2 additions & 1 deletion agreement/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,9 @@ func (b testValidatedBlock) Block() bookkeeping.Block {
return b.Inside
}

func (b testValidatedBlock) WithSeed(s committee.Seed) ValidatedBlock {
func (b testValidatedBlock) WithSeed(s committee.Seed, proposer basics.Address) ValidatedBlock {
b.Inside.BlockHeader.Seed = s
b.Inside.BlockHeader.Proposer = proposer
return b
}

Expand Down
3 changes: 2 additions & 1 deletion agreement/fuzzer/ledger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,9 @@ func (b testValidatedBlock) Block() bookkeeping.Block {
return b.Inside
}

func (b testValidatedBlock) WithSeed(s committee.Seed) agreement.ValidatedBlock {
func (b testValidatedBlock) WithSeed(s committee.Seed, proposer basics.Address) agreement.ValidatedBlock {
b.Inside.BlockHeader.Seed = s
b.Inside.BlockHeader.Proposer = proposer
return b
}

Expand Down
Loading
Loading