Use TEAL v4, rather than new consenus parameter to go dynamic.

algorand · tsachiherman · May 14, 2021 · Mar 15, 2021 · Mar 19, 2021 · Apr 27, 2021
commit f8e281d1fe8bc1a9dbc5a39d5b9b59898edc24c9
diff --git a/config/consensus.go b/config/consensus.go
@@ -212,9 +212,6 @@ type ConsensusParams struct {
 	// sum of estimated op cost must be less than this
 	LogicSigMaxCost uint64
 
-	// calculate TEAL costs at runtime
-	DynamicTealCost bool
-
 	// max decimal precision for assets
 	MaxAssetDecimals uint32
 
@@ -913,7 +910,8 @@ func initConsensusProtocols() {
 	// Enable transaction Merkle tree.
 	vFuture.PaysetCommit = PaysetCommitMerkle
 
-	vFuture.DynamicTealCost = true
+	// Enable TEAL 4
+	vFuture.LogicSigVersion = 4
 
 	Consensus[protocol.ConsensusFuture] = vFuture
 }

diff --git a/data/transactions/logic/backwardCompat_test.go b/data/transactions/logic/backwardCompat_test.go
@@ -340,14 +340,28 @@ func TestBackwardCompatTEALv1(t *testing.T) {
 	txn.Lsig.Logic = program
 	txn.Lsig.Args = [][]byte{data[:], sig[:], pk[:], txn.Txn.Sender[:], txn.Txn.Note}
 
-	// Cost is now dynamic and exactly 1 less, because bnz skips "err". It's caught during Eval
-	ep.Proto.LogicSigMaxCost = 2138
+	// Cost remains the same, because v0 does not get dynamic treatment
+	ep.Proto.LogicSigMaxCost = 2139
+	err = Check(program, ep)
+	require.Error(t, err)
+
+	ep.Proto.LogicSigMaxCost = 2140
+	err = Check(program, ep)
+	require.NoError(t, err)
+	pass, err = Eval(program, ep)
+	require.NoError(t, err)
+	require.True(t, pass)
+
+	// But in v4, cost is now dynamic and exactly 1 less than v2/v3,
+	// because bnz skips "err". It's caught during Eval
+	program[0] = 4
+	ep.Proto.LogicSigMaxCost = 2306
 	err = Check(program, ep)
 	require.NoError(t, err)
 	_, err = Eval(program, ep)
 	require.Error(t, err)
 
-	ep.Proto.LogicSigMaxCost = 2139
+	ep.Proto.LogicSigMaxCost = 2307
 	err = Check(program, ep)
 	require.NoError(t, err)
 	pass, err = Eval(program, ep)

diff --git a/data/transactions/logic/eval.go b/data/transactions/logic/eval.go
@@ -434,17 +434,17 @@ func eval(program []byte, cx *evalContext) (pass bool, err error) {
 // CheckStateful should be faster than EvalStateful.  It can perform
 // static checks and reject programs that are invalid. Returns a cost
 // estimate of relative execution time. This cost is not relevent when
-// params.Proto.DynamicTealCost is true, and so 1 is returned so that
-// callers may continue to check for a high cost being invalid.
+// the program is v4 or higher, and so 1 is returned so that callers
+// may continue to check for a high cost being invalid.
 func CheckStateful(program []byte, params EvalParams) error {
 	params.runModeFlags = runModeApplication
 	return check(program, params)
 }
 
 // Check should be faster than Eval.  It can perform static checks and
 // reject programs that are invalid. Returns a cost estimate of
-// relative execution time. This cost is no relevent when
-// proto.DynamicTealCost is true, and so 1 is returned so that callers
+// relative execution time. This cost is not relevent when
+// the program is v4 or higher, and so 1 is returned so that callers
 // may continue to check for a high cost being invalid.
 func Check(program []byte, params EvalParams) error {
 	params.runModeFlags = runModeSignature
@@ -499,7 +499,7 @@ func check(program []byte, params EvalParams) (err error) {
 	cx.instructionStarts = make(map[int]bool)
 
 	maxCost := params.budget()
-	if params.Proto.DynamicTealCost {
+	if version >= backBranchEnabledVersion {
 		maxCost = math.MaxInt32
 	}
 	staticCost := 0
@@ -511,7 +511,7 @@ func check(program []byte, params EvalParams) (err error) {
 		}
 		staticCost += stepCost
 		if staticCost > maxCost {
-			return fmt.Errorf("pc=%3d static cost budget %d exceeded", cx.pc, maxCost)
+			return fmt.Errorf("pc=%3d static cost budget of %d exceeded", cx.pc, maxCost)
 		}
 		if cx.pc <= prevpc {
 			// Recall, this is advancing through opcodes
@@ -583,7 +583,7 @@ func (cx *evalContext) step() {
 	}
 	cx.cost += deets.Cost
 	if cx.cost > cx.budget() {
-		cx.err = fmt.Errorf("budget of %d exceeded at pc=%d, executing %s", cx.budget(), cx.pc, spec.Name)
+		cx.err = fmt.Errorf("pc=%3d dynamic cost budget of %d exceeded, executing %s", cx.pc, cx.budget(), spec.Name)
 		return
 	}
 	spec.op(cx)

diff --git a/data/transactions/logic/eval_test.go b/data/transactions/logic/eval_test.go
@@ -51,7 +51,6 @@ func defaultEvalProtoWithVersion(version uint64) config.ConsensusParams {
 	return config.ConsensusParams{
 		LogicSigVersion:     version,
 		LogicSigMaxCost:     20000,
-		DynamicTealCost:     version >= backBranchEnabledVersion,
 		MaxAppProgramCost:   700,
 		MaxAppKeyLen:        64,
 		MaxAppBytesValueLen: 64,
@@ -2409,14 +2408,14 @@ func TestSlowLogic(t *testing.T) {
 	require.NoError(t, err)
 	_, err = Eval(ops.Program, ep4)
 	require.Error(t, err)
-	require.Contains(t, err.Error(), "exceeded at pc")
+	require.Contains(t, err.Error(), "dynamic cost")
 
 	ops = testProg(t, v2overspend, 4)
 	err = Check(ops.Program, ep4)
 	require.NoError(t, err)
 	_, err = Eval(ops.Program, ep4)
 	require.Error(t, err)
-	require.Contains(t, err.Error(), "exceeded at pc")
+	require.Contains(t, err.Error(), "dynamic cost")
 }
 
 func isNotPanic(t *testing.T, err error) {

diff --git a/test/e2e-go/cli/goal/expect/tealConsensusTest.exp b/test/e2e-go/cli/goal/expect/tealConsensusTest.exp
@@ -35,7 +35,7 @@ if { [catch {
     set TEST_ROOT_DIR $TEST_ALGO_DIR/root
     set TEST_PRIMARY_NODE_DIR $TEST_ROOT_DIR/Primary/
     set NETWORK_NAME test_net_expect_$TIME_STAMP
-    set NETWORK_TEMPLATE "$TEST_DATA_DIR/nettemplates/TwoNodes50Each.json"
+    set NETWORK_TEMPLATE "$TEST_DATA_DIR/nettemplates/TwoNodes50EachFuture.json"
 
     # Create network
     ::AlgorandGoal::CreateNetwork $NETWORK_NAME $NETWORK_TEMPLATE $TEST_ALGO_DIR $TEST_ROOT_DIR
@@ -80,18 +80,19 @@ if { [catch {
     exec goal clerk send -F "$TEST_ROOT_DIR/small-sig.teal" -t GXBNLU4AXQABPLHXJDMTG2YXSDT4EWUZACT7KTPFXDQW52XPTIUS5OZ5HQ -a 100 -d $TEST_PRIMARY_NODE_DIR -o $TEST_ROOT_DIR/small-sig.tx
     spawn goal clerk dryrun -t $TEST_ROOT_DIR/small-sig.tx
     expect {
-        " - pass -" { puts "smallsig dryrun pass" }
+        " - pass -" { puts "small-sig dryrun pass" }
         "REJECT" { ::AlgorandGoal::Abort $expect_out(buffer) }
-        "too large" { ::AlgorandGoal::Abort $expect_out(buffer) }
+        "static cost budget" { ::AlgorandGoal::Abort $expect_out(buffer) }
     }
 
     teal "$TEST_ROOT_DIR/slow-sig.teal" 2 1 20001
     exec goal clerk compile "$TEST_ROOT_DIR/slow-sig.teal"
     exec goal clerk send -F "$TEST_ROOT_DIR/slow-sig.teal" -t GXBNLU4AXQABPLHXJDMTG2YXSDT4EWUZACT7KTPFXDQW52XPTIUS5OZ5HQ -a 100 -d $TEST_PRIMARY_NODE_DIR -o $TEST_ROOT_DIR/slow-sig.tx
-    spawn goal clerk dryrun -t $TEST_ROOT_DIR/slow-sig.tx
+    spawn goal clerk dryrun -P future -t $TEST_ROOT_DIR/slow-sig.tx  # Should succeed Check, fail Eval
     expect {
-        "program cost too large" {puts "slowsig pass"}
-        "\n" { ::AlgorandGoal::Abort $expect_out(buffer) }
+        "dynamic cost budget" { puts "slow-sig dryrun pass" }
+        " - pass -" { ::AlgorandGoal::Abort $expect_out(buffer) }
+        "REJECT" { ::AlgorandGoal::Abort $expect_out(buffer) }
     }
 
     # Shutdown the network