Actually use the base fee from the block header for txn validity

Author: jannotti

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)

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"],
@@ -4710,7 +4710,7 @@
             "type": "string"
           },
           "fee": {
-            "description": "Fee id deprecated. It used to express the per-byte fee escalation.",
+            "description": "Fee is deprecated. It used to express the per-byte fee escalation.",
             "type": "integer",
             "x-go-type": "uint64"
           },
@@ -4729,12 +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"
           },
           "base-fee": {
-            "description": "The current base transaction fee (not per byte) required for the\ntxn to validate.",
+            "description": "The current base transaction fee (not per byte) required for the txn to validate with the current congestion conditions.",
             "type": "integer",
             "x-go-type": "uint64"
           }

daemon/algod/api/algod.oas3.yml

@@ -923,7 +923,7 @@
               "description": "TransactionParams contains the parameters that help a client construct\na new transaction.",
               "properties": {
                 "base-fee": {
-                  "description": "The current base transaction fee (not per byte) required for the\ntxn to validate.",
+                  "description": "The current base transaction fee (not per byte) required for the txn to validate with the current congestion conditions.",
                   "type": "integer",
                   "x-go-type": "uint64"
                 },
@@ -932,7 +932,7 @@
                   "type": "string"
                 },
                 "fee": {
-                  "description": "Fee id deprecated. It used to express the per-byte fee escalation.",
+                  "description": "Fee is deprecated. It used to express the per-byte fee escalation.",
                   "type": "integer",
                   "x-go-type": "uint64"
                 },
@@ -952,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"
                 }
@@ -3609,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": [
           {
@@ -7263,7 +7263,7 @@
                   "description": "TransactionParams contains the parameters that help a client construct\na new transaction.",
                   "properties": {
                     "base-fee": {
-                      "description": "The current base transaction fee (not per byte) required for the\ntxn to validate.",
+                      "description": "The current base transaction fee (not per byte) required for the txn to validate with the current congestion conditions.",
                       "type": "integer",
                       "x-go-type": "uint64"
                     },
@@ -7272,7 +7272,7 @@
                       "type": "string"
                     },
                     "fee": {
-                      "description": "Fee id deprecated. It used to express the per-byte fee escalation.",
+                      "description": "Fee is deprecated. It used to express the per-byte fee escalation.",
                       "type": "integer",
                       "x-go-type": "uint64"
                     },
@@ -7292,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"
                     }
@@ -7355,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": [
           {
@@ -7496,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