Skip to content

Commit 98ce027

Browse files
committed
Switch to CongestionFee so that 0 is common case
1 parent ee194e4 commit 98ce027

File tree

32 files changed

+1468
-1401
lines changed

32 files changed

+1468
-1401
lines changed

agreement/msgp_gen.go

Lines changed: 42 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

agreement/proposal.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,9 @@ func verifyProposer(p unauthenticatedProposal, ledger LedgerReader) error {
225225
if err != nil {
226226
return fmt.Errorf("failed to determine incentive eligibility %w", err)
227227
}
228-
if !eligible && p.ProposerPayout().Raw > 0 {
229-
return fmt.Errorf("proposer payout (%d) for ineligible Proposer %v",
230-
p.ProposerPayout().Raw, p.Proposer())
228+
if !eligible && !p.ProposerPayout().IsZero() {
229+
return fmt.Errorf("proposer payout (%s) for ineligible Proposer %v",
230+
p.ProposerPayout(), p.Proposer())
231231
}
232232

233233
var alpha crypto.Digest

config/consensus.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ type ConsensusParams struct {
574574
EnableInnerClawbackWithoutSenderHolding bool
575575

576576
// CongestionFees enables header values that track Load and a running
577-
// BaseFee that grows/shrinks when blocks are more/less than half full
577+
// CongestionFee that grows/shrinks when blocks are more/less than half full
578578
CongestionFees bool
579579
}
580580

daemon/algod/api/algod.oas2.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4733,8 +4733,8 @@
47334733
"type": "integer",
47344734
"x-go-type": "uint64"
47354735
},
4736-
"base-fee": {
4737-
"description": "The current base transaction fee (not per byte) required for the txn to validate with the current congestion conditions.",
4736+
"congestion-fee": {
4737+
"description": "The current extra fee beyond min-fee required for the txn to validate with the current congestion conditions.",
47384738
"type": "integer",
47394739
"x-go-type": "uint64"
47404740
}

daemon/algod/api/algod.oas3.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -922,8 +922,8 @@
922922
"schema": {
923923
"description": "TransactionParams contains the parameters that help a client construct\na new transaction.",
924924
"properties": {
925-
"base-fee": {
926-
"description": "The current base transaction fee (not per byte) required for the txn to validate with the current congestion conditions.",
925+
"congestion-fee": {
926+
"description": "The current extra fee beyond min-fee required for the txn to validate with the current congestion conditions.",
927927
"type": "integer",
928928
"x-go-type": "uint64"
929929
},
@@ -7262,8 +7262,8 @@
72627262
"schema": {
72637263
"description": "TransactionParams contains the parameters that help a client construct\na new transaction.",
72647264
"properties": {
7265-
"base-fee": {
7266-
"description": "The current base transaction fee (not per byte) required for the txn to validate with the current congestion conditions.",
7265+
"congestion-fee": {
7266+
"description": "The current extra fee beyond min-fee required for the txn to validate with the current congestion conditions.",
72677267
"type": "integer",
72687268
"x-go-type": "uint64"
72697269
},

daemon/algod/api/server/v2/generated/data/routes.go

Lines changed: 158 additions & 158 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

daemon/algod/api/server/v2/generated/experimental/routes.go

Lines changed: 163 additions & 163 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

daemon/algod/api/server/v2/generated/model/types.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

daemon/algod/api/server/v2/generated/nonparticipating/private/routes.go

Lines changed: 164 additions & 164 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

daemon/algod/api/server/v2/generated/nonparticipating/public/routes.go

Lines changed: 271 additions & 271 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)