Eval: Move congestion monitoring and fee escalation on-chain

Makefile

@@ -146,10 +146,10 @@ generate: deps
 msgp: $(patsubst %,%/msgp_gen.go,$(MSGP_GENERATE))
 
 api:
-	make -C daemon/algod/api
+	$(MAKE) -j7 -C daemon/algod/api
 
 logic:
-	make -C data/transactions/logic
+	$(MAKE) -C data/transactions/logic
 
 
 %/msgp_gen.go: deps ALWAYS

agreement/proposal.go

@@ -225,9 +225,9 @@ func verifyProposer(p unauthenticatedProposal, ledger LedgerReader) error {
 	if err != nil {
 		return fmt.Errorf("failed to determine incentive eligibility %w", err)
 	}
-	if !eligible && p.ProposerPayout().Raw > 0 {
-		return fmt.Errorf("proposer payout (%d) for ineligible Proposer %v",
-			p.ProposerPayout().Raw, p.Proposer())
+	if !eligible && !p.ProposerPayout().IsZero() {
+		return fmt.Errorf("proposer payout (%s) for ineligible Proposer %v",
+			p.ProposerPayout(), p.Proposer())
 	}
 
 	var alpha crypto.Digest

cmd/algod/main.go

@@ -481,7 +481,6 @@ var startupConfigCheckFields = []string{
 	"OutgoingMessageFilterBucketSize",
 	"ProposalAssemblyTime",
 	"ReservedFDs",
-	"TxPoolExponentialIncreaseFactor",
 	"TxPoolSize",
 	"VerifiedTranscationsCacheSize",
 	"EnableP2P",

cmd/goal/clerk.go

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

cmd/tealdbg/local.go

@@ -536,7 +536,7 @@ func (r *LocalRunner) RunAll() error {
 	start := time.Now()
 
 	sep := logic.NewSigEvalParams(r.txnGroup, &r.proto, &logic.NoHeaderLedger{})
-	aep := logic.NewAppEvalParams(txngroup, &r.proto, &transactions.SpecialAddresses{})
+	aep := logic.NewAppEvalParams(txngroup, &r.proto, &transactions.SpecialAddresses{}, basics.MicroAlgos{Raw: r.proto.MinTxnFee})
 	if r.debugger != nil {
 		t := logic.MakeEvalTracerDebuggerAdaptor(r.debugger)
 		sep.Tracer = t

cmd/tealdbg/localLedger_test.go

@@ -112,7 +112,7 @@ int 2
 	a.NoError(err)
 
 	proto := config.Consensus[protocol.ConsensusCurrentVersion]
-	ep := logic.NewAppEvalParams([]transactions.SignedTxnWithAD{{SignedTxn: txn}}, &proto, &transactions.SpecialAddresses{})
+	ep := logic.NewAppEvalParams([]transactions.SignedTxnWithAD{{SignedTxn: txn}}, &proto, &transactions.SpecialAddresses{}, basics.MicroAlgos{Raw: proto.MinTxnFee})
 	pass, delta, err := ba.StatefulEval(0, ep, appIdx, program)
 	a.NoError(err)
 	a.True(pass)

config/consensus.go

@@ -102,11 +102,6 @@ type ConsensusParams struct {
 	// a way of making the spender subsidize the cost of storing this transaction.
 	MinTxnFee uint64
 
-	// EnableFeePooling specifies that the sum of the fees in a
-	// group must exceed one MinTxnFee per Txn, rather than check that
-	// each Txn has a MinFee.
-	EnableFeePooling bool
-
 	// EnableAppCostPooling specifies that the sum of fees for application calls
 	// in a group is checked against the sum of the budget for application calls,
 	// rather than check each individual app call is within the budget.
@@ -577,6 +572,10 @@ type ConsensusParams struct {
 	// available. This parameters can be removed and assumed true after the
 	// first consensus release in which it is set true.
 	EnableInnerClawbackWithoutSenderHolding bool
+
+	// CongestionFees enables header values that track Load and a running
+	// CongestionFee that grows/shrinks when blocks are more/less than half full
+	CongestionFees bool
 }
 
 // ProposerPayoutRules puts several related consensus parameters in one place. The same
@@ -1181,7 +1180,6 @@ func initConsensusProtocols() {
 	// "reachability" between accounts and creatables, so we
 	// retain 4 x 4 as worst case.
 
-	v28.EnableFeePooling = true
 	v28.EnableKeyregCoherencyCheck = true
 
 	Consensus[protocol.ConsensusV28] = v28
@@ -1461,6 +1459,7 @@ func initConsensusProtocols() {
 	vFuture.ApprovedUpgrades = map[protocol.ConsensusVersion]uint64{}
 
 	vFuture.LogicSigVersion = 13 // When moving this to a release, put a new higher LogicSigVersion here
+	vFuture.CongestionFees = true
 
 	Consensus[protocol.ConsensusFuture] = vFuture
 

config/localTemplate.go

@@ -228,7 +228,7 @@ type Local struct {
 	// FallbackDNSResolverAddress defines the fallback DNS resolver address that would be used if the system resolver would fail to retrieve SRV records.
 	FallbackDNSResolverAddress string `version[0]:""`
 
-	// TxPoolExponentialIncreaseFactor exponential increase factor of transaction pool's fee threshold, should always be 2 in production.
+	// TxPoolExponentialIncreaseFactor is deprecated and unused.
 	TxPoolExponentialIncreaseFactor uint64 `version[0]:"2"`
 
 	// SuggestedFeeBlockHistory is deprecated and unused.

daemon/algod/api/algod.oas2.json

@@ -371,7 +371,7 @@
     },
     "/v2/accounts/{address}/transactions/pending": {
       "get": {
-        "description": "Get the list of pending transactions by address, sorted by priority, in decreasing order, truncated at the end at MAX. If MAX = 0, returns all pending transactions.\n",
+        "description": "Get the list of pending transactions by address, sorted by priority, in decreasing order, truncated at the end at MAX. If MAX = 0, returns all pending transactions.",
         "tags": ["public", "participating"],
         "produces": ["application/json", "application/msgpack"],
         "schemes": ["http"],
@@ -1323,7 +1323,7 @@
     },
     "/v2/transactions/pending": {
       "get": {
-        "description": "Get the list of pending transactions, sorted by priority, in decreasing order, truncated at the end at MAX. If MAX = 0, returns all pending transactions.\n",
+        "description": "Get the list of pending transactions, sorted by priority, in decreasing order, truncated at the end at MAX. If MAX = 0, returns all pending transactions.",
         "tags": ["public", "participating"],
         "produces": ["application/json", "application/msgpack"],
         "schemes": ["http"],
@@ -1367,7 +1367,7 @@
     },
     "/v2/transactions/pending/{txid}": {
       "get": {
-        "description": "Given a transaction ID of a recently submitted transaction, it returns information about it.  There are several cases when this might succeed:\n- transaction committed (committed round \u003e 0)\n- transaction still in the pool (committed round = 0, pool error = \"\")\n- transaction removed from pool due to error (committed round = 0, pool error != \"\")\nOr the transaction may have happened sufficiently long ago that the node no longer remembers it, and this will return an error.\n",
+        "description": "Given a transaction ID of a recently submitted transaction, it returns information about it.  There are several cases when this might succeed:\n- transaction committed (committed round \u003e 0)\n- transaction still in the pool (committed round = 0, pool error = \"\")\n- transaction removed from pool due to error (committed round = 0, pool error != \"\")\nOr the transaction may have happened sufficiently long ago that the node no longer remembers it, and this will return an error.",
         "tags": ["public", "participating"],
         "produces": ["application/json", "application/msgpack"],
         "schemes": ["http"],
@@ -3403,7 +3403,7 @@
     "Box": {
       "description": "Box name and its content.",
       "type": "object",
-      "required": ["round","name","value"],
+      "required": ["round", "name", "value"],
       "properties": {
         "round": {
           "description": "The round for which this information is relevant",
@@ -3425,9 +3425,7 @@
     "BoxDescriptor": {
       "description": "Box descriptor describes a Box.",
       "type": "object",
-      "required": [
-        "name"
-      ],
+      "required": ["name"],
       "properties": {
         "name": {
           "description": "Base64 encoded box name",
@@ -4712,7 +4710,7 @@
             "type": "string"
           },
           "fee": {
-            "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.",
+            "description": "Fee is deprecated. It used to express the per-byte fee escalation.",
             "type": "integer",
             "x-go-type": "uint64"
           },
@@ -4731,7 +4729,12 @@
             "x-go-type": "basics.Round"
           },
           "min-fee": {
-            "description": "The minimum transaction fee (not per byte) required for the\ntxn to validate for the current network protocol.",
+            "description": "The minimum transaction fee (not per byte) required for the txn to validate for the current network protocol.",
+            "type": "integer",
+            "x-go-type": "uint64"
+          },
+          "congestion-fee": {
+            "description": "The current extra fee beyond min-fee required for the txn to validate with the current congestion conditions.",
             "type": "integer",
             "x-go-type": "uint64"
           }

daemon/algod/api/algod.oas3.yml

@@ -922,12 +922,17 @@
             "schema": {
               "description": "TransactionParams contains the parameters that help a client construct\na new transaction.",
               "properties": {
+                "congestion-fee": {
+                  "description": "The current extra fee beyond min-fee required for the txn to validate with the current congestion conditions.",
+                  "type": "integer",
+                  "x-go-type": "uint64"
+                },
                 "consensus-version": {
                   "description": "ConsensusVersion indicates the consensus protocol version\nas of LastRound.",
                   "type": "string"
                 },
                 "fee": {
-                  "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.",
+                  "description": "Fee is deprecated. It used to express the per-byte fee escalation.",
                   "type": "integer",
                   "x-go-type": "uint64"
                 },
@@ -947,7 +952,7 @@
                   "x-go-type": "basics.Round"
                 },
                 "min-fee": {
-                  "description": "The minimum transaction fee (not per byte) required for the\ntxn to validate for the current network protocol.",
+                  "description": "The minimum transaction fee (not per byte) required for the txn to validate for the current network protocol.",
                   "type": "integer",
                   "x-go-type": "uint64"
                 }
@@ -3604,7 +3609,7 @@
     },
     "/v2/accounts/{address}/transactions/pending": {
       "get": {
-        "description": "Get the list of pending transactions by address, sorted by priority, in decreasing order, truncated at the end at MAX. If MAX = 0, returns all pending transactions.\n",
+        "description": "Get the list of pending transactions by address, sorted by priority, in decreasing order, truncated at the end at MAX. If MAX = 0, returns all pending transactions.",
         "operationId": "GetPendingTransactionsByAddress",
         "parameters": [
           {
@@ -7257,12 +7262,17 @@
                 "schema": {
                   "description": "TransactionParams contains the parameters that help a client construct\na new transaction.",
                   "properties": {
+                    "congestion-fee": {
+                      "description": "The current extra fee beyond min-fee required for the txn to validate with the current congestion conditions.",
+                      "type": "integer",
+                      "x-go-type": "uint64"
+                    },
                     "consensus-version": {
                       "description": "ConsensusVersion indicates the consensus protocol version\nas of LastRound.",
                       "type": "string"
                     },
                     "fee": {
-                      "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.",
+                      "description": "Fee is deprecated. It used to express the per-byte fee escalation.",
                       "type": "integer",
                       "x-go-type": "uint64"
                     },
@@ -7282,7 +7292,7 @@
                       "x-go-type": "basics.Round"
                     },
                     "min-fee": {
-                      "description": "The minimum transaction fee (not per byte) required for the\ntxn to validate for the current network protocol.",
+                      "description": "The minimum transaction fee (not per byte) required for the txn to validate for the current network protocol.",
                       "type": "integer",
                       "x-go-type": "uint64"
                     }
@@ -7345,7 +7355,7 @@
     },
     "/v2/transactions/pending": {
       "get": {
-        "description": "Get the list of pending transactions, sorted by priority, in decreasing order, truncated at the end at MAX. If MAX = 0, returns all pending transactions.\n",
+        "description": "Get the list of pending transactions, sorted by priority, in decreasing order, truncated at the end at MAX. If MAX = 0, returns all pending transactions.",
         "operationId": "GetPendingTransactions",
         "parameters": [
           {
@@ -7486,7 +7496,7 @@
     },
     "/v2/transactions/pending/{txid}": {
       "get": {
-        "description": "Given a transaction ID of a recently submitted transaction, it returns information about it.  There are several cases when this might succeed:\n- transaction committed (committed round > 0)\n- transaction still in the pool (committed round = 0, pool error = \"\")\n- transaction removed from pool due to error (committed round = 0, pool error != \"\")\nOr the transaction may have happened sufficiently long ago that the node no longer remembers it, and this will return an error.\n",
+        "description": "Given a transaction ID of a recently submitted transaction, it returns information about it.  There are several cases when this might succeed:\n- transaction committed (committed round > 0)\n- transaction still in the pool (committed round = 0, pool error = \"\")\n- transaction removed from pool due to error (committed round = 0, pool error != \"\")\nOr the transaction may have happened sufficiently long ago that the node no longer remembers it, and this will return an error.",
         "operationId": "PendingTransactionInformation",
         "parameters": [
           {

daemon/algod/api/server/v2/dryrun.go

@@ -433,7 +433,7 @@ func doDryrunRequest(dr *DryrunRequest, response *model.DryrunResponse) {
 	proto := config.Consensus[protocol.ConsensusVersion(dr.ProtocolVersion)]
 	txgroup := transactions.WrapSignedTxnsWithAD(dr.Txns)
 	specials := transactions.SpecialAddresses{}
-	ep := logic.NewAppEvalParams(txgroup, &proto, &specials)
+	ep := logic.NewAppEvalParams(txgroup, &proto, &specials, basics.MicroAlgos{Raw: uint64(proto.MinTxnFee)})
 	sep := logic.NewSigEvalParams(dr.Txns, &proto, &dl)
 
 	origEnableAppCostPooling := proto.EnableAppCostPooling