Skip to content

Commit 15e01ce

Browse files
committed
Actually use the base fee from the block header for txn validity
1 parent bad55c9 commit 15e01ce

File tree

27 files changed

+1249
-1138
lines changed

27 files changed

+1249
-1138
lines changed

cmd/tealdbg/local.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ func (r *LocalRunner) RunAll() error {
536536
start := time.Now()
537537

538538
sep := logic.NewSigEvalParams(r.txnGroup, &r.proto, &logic.NoHeaderLedger{})
539-
aep := logic.NewAppEvalParams(txngroup, &r.proto, &transactions.SpecialAddresses{})
539+
aep := logic.NewAppEvalParams(txngroup, &r.proto, &transactions.SpecialAddresses{}, basics.MicroAlgos{Raw: r.proto.MinTxnFee})
540540
if r.debugger != nil {
541541
t := logic.MakeEvalTracerDebuggerAdaptor(r.debugger)
542542
sep.Tracer = t

cmd/tealdbg/localLedger_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ int 2
112112
a.NoError(err)
113113

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

daemon/algod/api/algod.oas2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4710,7 +4710,7 @@
47104710
"type": "string"
47114711
},
47124712
"fee": {
4713-
"description": "Fee id deprecated. It used to express the per-byte fee escalation.",
4713+
"description": "Fee is deprecated. It used to express the per-byte fee escalation.",
47144714
"type": "integer",
47154715
"x-go-type": "uint64"
47164716
},

daemon/algod/api/algod.oas3.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@
932932
"type": "string"
933933
},
934934
"fee": {
935-
"description": "Fee id deprecated. It used to express the per-byte fee escalation.",
935+
"description": "Fee is deprecated. It used to express the per-byte fee escalation.",
936936
"type": "integer",
937937
"x-go-type": "uint64"
938938
},
@@ -7272,7 +7272,7 @@
72727272
"type": "string"
72737273
},
72747274
"fee": {
7275-
"description": "Fee id deprecated. It used to express the per-byte fee escalation.",
7275+
"description": "Fee is deprecated. It used to express the per-byte fee escalation.",
72767276
"type": "integer",
72777277
"x-go-type": "uint64"
72787278
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ func doDryrunRequest(dr *DryrunRequest, response *model.DryrunResponse) {
433433
proto := config.Consensus[protocol.ConsensusVersion(dr.ProtocolVersion)]
434434
txgroup := transactions.WrapSignedTxnsWithAD(dr.Txns)
435435
specials := transactions.SpecialAddresses{}
436-
ep := logic.NewAppEvalParams(txgroup, &proto, &specials)
436+
ep := logic.NewAppEvalParams(txgroup, &proto, &specials, basics.MicroAlgos{Raw: uint64(proto.MinTxnFee)})
437437
sep := logic.NewSigEvalParams(dr.Txns, &proto, &dl)
438438

439439
origEnableAppCostPooling := proto.EnableAppCostPooling

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

Lines changed: 157 additions & 157 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: 162 additions & 162 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: 1 addition & 1 deletion
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: 162 additions & 162 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: 235 additions & 235 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)