Skip to content

Commit 567770d

Browse files
committed
Remove the old "out of protocol" congestion checking
1 parent f17cee2 commit 567770d

File tree

25 files changed

+1392
-1601
lines changed

25 files changed

+1392
-1601
lines changed

cmd/algod/main.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@ var startupConfigCheckFields = []string{
478478
"OutgoingMessageFilterBucketSize",
479479
"ProposalAssemblyTime",
480480
"ReservedFDs",
481-
"TxPoolExponentialIncreaseFactor",
482481
"TxPoolSize",
483482
"VerifiedTranscationsCacheSize",
484483
"EnableP2P",

cmd/goal/clerk.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ var sendCmd = &cobra.Command{
432432

433433
// ConstructPayment fills in the suggested fee when fee=0. But if the user actually used --fee=0 on the
434434
// commandline, we ought to do what they asked (especially now that zero or low fees make sense in
435-
// combination with other txns that cover the groups's fee.
435+
// combination with other txns that cover the groups's fee).
436436
explicitFee := cmd.Flags().Changed("fee")
437437
if explicitFee {
438438
payment.Fee = basics.MicroAlgos{Raw: fee}

config/localTemplate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ type Local struct {
228228
// FallbackDNSResolverAddress defines the fallback DNS resolver address that would be used if the system resolver would fail to retrieve SRV records.
229229
FallbackDNSResolverAddress string `version[0]:""`
230230

231-
// TxPoolExponentialIncreaseFactor exponential increase factor of transaction pool's fee threshold, should always be 2 in production.
231+
// TxPoolExponentialIncreaseFactor is deprecated and unused.
232232
TxPoolExponentialIncreaseFactor uint64 `version[0]:"2"`
233233

234234
// SuggestedFeeBlockHistory is deprecated and unused.

daemon/algod/api/algod.oas2.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3403,7 +3403,7 @@
34033403
"Box": {
34043404
"description": "Box name and its content.",
34053405
"type": "object",
3406-
"required": ["round","name","value"],
3406+
"required": ["round", "name", "value"],
34073407
"properties": {
34083408
"round": {
34093409
"description": "The round for which this information is relevant",
@@ -3425,9 +3425,7 @@
34253425
"BoxDescriptor": {
34263426
"description": "Box descriptor describes a Box.",
34273427
"type": "object",
3428-
"required": [
3429-
"name"
3430-
],
3428+
"required": ["name"],
34313429
"properties": {
34323430
"name": {
34333431
"description": "Base64 encoded box name",
@@ -4712,7 +4710,7 @@
47124710
"type": "string"
47134711
},
47144712
"fee": {
4715-
"description": "Fee is the suggested transaction fee\nFee is in units of micro-Algos per byte.\nFee may fall to zero but transactions must still have a fee of\nat least MinTxnFee for the current network protocol.",
4713+
"description": "Fee id deprecated. It used to express the per-byte fee escalation.",
47164714
"type": "integer",
47174715
"x-go-type": "uint64"
47184716
},
@@ -4734,6 +4732,11 @@
47344732
"description": "The minimum transaction fee (not per byte) required for the\ntxn to validate for the current network protocol.",
47354733
"type": "integer",
47364734
"x-go-type": "uint64"
4735+
},
4736+
"base-fee": {
4737+
"description": "The current base transaction fee (not per byte) required for the\ntxn to validate.",
4738+
"type": "integer",
4739+
"x-go-type": "uint64"
47374740
}
47384741
}
47394742
}

daemon/algod/api/algod.oas3.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -922,12 +922,17 @@
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\ntxn to validate.",
927+
"type": "integer",
928+
"x-go-type": "uint64"
929+
},
925930
"consensus-version": {
926931
"description": "ConsensusVersion indicates the consensus protocol version\nas of LastRound.",
927932
"type": "string"
928933
},
929934
"fee": {
930-
"description": "Fee is the suggested transaction fee\nFee is in units of micro-Algos per byte.\nFee may fall to zero but transactions must still have a fee of\nat least MinTxnFee for the current network protocol.",
935+
"description": "Fee id deprecated. It used to express the per-byte fee escalation.",
931936
"type": "integer",
932937
"x-go-type": "uint64"
933938
},
@@ -7257,12 +7262,17 @@
72577262
"schema": {
72587263
"description": "TransactionParams contains the parameters that help a client construct\na new transaction.",
72597264
"properties": {
7265+
"base-fee": {
7266+
"description": "The current base transaction fee (not per byte) required for the\ntxn to validate.",
7267+
"type": "integer",
7268+
"x-go-type": "uint64"
7269+
},
72607270
"consensus-version": {
72617271
"description": "ConsensusVersion indicates the consensus protocol version\nas of LastRound.",
72627272
"type": "string"
72637273
},
72647274
"fee": {
7265-
"description": "Fee is the suggested transaction fee\nFee is in units of micro-Algos per byte.\nFee may fall to zero but transactions must still have a fee of\nat least MinTxnFee for the current network protocol.",
7275+
"description": "Fee id deprecated. It used to express the per-byte fee escalation.",
72667276
"type": "integer",
72677277
"x-go-type": "uint64"
72687278
},

0 commit comments

Comments
 (0)