AVM: Share resource arrays across transactions

data/transactions/logic/assembler_test.go

@@ -428,7 +428,8 @@ pushbytess "1" "2" "1"
 
 const v8Nonsense = v7Nonsense + switchNonsense + frameNonsense + matchNonsense + boxNonsense
 
-const v9Nonsense = v8Nonsense + pairingNonsense
+const v9Nonsense = v8Nonsense
+const v10Nonsense = v9Nonsense + pairingNonsense
 
 const v6Compiled = "2004010002b7a60c26050242420c68656c6c6f20776f726c6421070123456789abcd208dae2087fbba51304eb02b91f656948397a7946390e8cb70fc9ea4d95f92251d047465737400320032013202320380021234292929292b0431003101310231043105310731083109310a310b310c310d310e310f3111311231133114311533000033000133000233000433000533000733000833000933000a33000b33000c33000d33000e33000f3300113300123300133300143300152d2e01022581f8acd19181cf959a1281f8acd19181cf951a81f8acd19181cf1581f8acd191810f082209240a220b230c240d250e230f2310231123122313231418191a1b1c28171615400003290349483403350222231d4a484848482b50512a632223524100034200004322602261222704634848222862482864286548482228246628226723286828692322700048482371004848361c0037001a0031183119311b311d311e311f312023221e312131223123312431253126312731283129312a312b312c312d312e312f447825225314225427042455220824564c4d4b0222382124391c0081e80780046a6f686e2281d00f23241f880003420001892224902291922494249593a0a1a2a3a4a5a6a7a8a9aaabacadae24af3a00003b003c003d816472064e014f012a57000823810858235b235a2359b03139330039b1b200b322c01a23c1001a2323c21a23c3233e233f8120af06002a494905002a49490700b400b53a03b6b7043cb8033a0c2349c42a9631007300810881088120978101c53a8101c6003a"
 
@@ -444,18 +445,20 @@ const matchCompiled = "83030102018e02fff500008203013101320131"
 
 const v8Compiled = v7Compiled + switchCompiled + frameCompiled + matchCompiled + boxCompiled
 
-const v9Compiled = v8Compiled + pairingCompiled
+const v9Compiled = v8Compiled
+const v10Compiled = v9Compiled + pairingCompiled
 
 var nonsense = map[uint64]string{
-	1: v1Nonsense,
-	2: v2Nonsense,
-	3: v3Nonsense,
-	4: v4Nonsense,
-	5: v5Nonsense,
-	6: v6Nonsense,
-	7: v7Nonsense,
-	8: v8Nonsense,
-	9: v9Nonsense,
+	1:  v1Nonsense,
+	2:  v2Nonsense,
+	3:  v3Nonsense,
+	4:  v4Nonsense,
+	5:  v5Nonsense,
+	6:  v6Nonsense,
+	7:  v7Nonsense,
+	8:  v8Nonsense,
+	9:  v9Nonsense,
+	10: v9Nonsense,
 }
 
 var compiled = map[uint64]string{
@@ -468,6 +471,8 @@ var compiled = map[uint64]string{
 	7: "07" + v7Compiled,
 	8: "08" + v8Compiled,
 	9: "09" + v9Compiled,
+
+	10: "10" + v10Compiled,
 }
 
 func pseudoOp(opcode string) bool {
@@ -1774,7 +1779,7 @@ func TestAssembleDisassembleErrors(t *testing.T) {
 	require.Contains(t, err.Error(), "invalid opcode")
 
 	source = "int 0\nint 0\nasset_holding_get AssetFrozen"
-	ops, err = AssembleStringWithVersion(source, AssemblerMaxVersion)
+	ops, err = AssembleStringWithVersion(source, sharedResourcesVersion-1)
 	require.NoError(t, err)
 	ops.Program[7] = 0x50 // holding field
 	_, err = Disassemble(ops.Program)
@@ -1885,10 +1890,20 @@ func TestAssembleAsset(t *testing.T) {
 			Expect{1, "asset_holding_get ABC 1 expects 2 stack arguments..."})
 		testProg(t, "int 1; asset_holding_get ABC 1", v,
 			Expect{1, "asset_holding_get ABC 1 expects 2 stack arguments..."})
-		testProg(t, "int 1; int 1; asset_holding_get ABC 1", v,
-			Expect{1, "asset_holding_get expects 1 immediate argument"})
-		testProg(t, "int 1; int 1; asset_holding_get ABC", v,
-			Expect{1, "asset_holding_get unknown field: \"ABC\""})
+
+		if v < sharedResourcesVersion {
+			testProg(t, "int 1; int 1; asset_holding_get ABC 1", v,
+				Expect{1, "asset_holding_get expects 1 immediate argument"})
+			testProg(t, "int 1; int 1; asset_holding_get ABC", v,
+				Expect{1, "asset_holding_get unknown field: \"ABC\""})
+		} else {
+			testProg(t, "int 1; int 1; asset_holding_get ABC 1", v,
+				Expect{1, "asset_holding_get ABC 1 arg 0 wanted type..."})
+			testProg(t, "txn Sender; int 1; asset_holding_get ABC 1", v,
+				Expect{1, "asset_holding_get expects 1 immediate argument"})
+			testProg(t, "txn Sender; int 1; asset_holding_get ABC", v,
+				Expect{1, "asset_holding_get unknown field: \"ABC\""})
+		}
 
 		testProg(t, "byte 0x1234; asset_params_get ABC 1", v,
 			Expect{1, "asset_params_get ABC 1 arg 0 wanted type uint64..."})
@@ -2159,15 +2174,17 @@ func TestHasStatefulOps(t *testing.T) {
 	require.NoError(t, err)
 	require.False(t, has)
 
-	source = `int 1
-int 1
-app_opted_in
-err
-`
+	source = `txn Sender; int 1; app_opted_in; err`
 	ops = testProg(t, source, AssemblerMaxVersion)
 	has, err = HasStatefulOps(ops.Program)
 	require.NoError(t, err)
 	require.True(t, has)
+
+	source = `int 1; int 1; app_opted_in; err`
+	ops = testProg(t, source, sharedResourcesVersion-1)
+	has, err = HasStatefulOps(ops.Program)
+	require.NoError(t, err)
+	require.True(t, has)
 }
 
 func TestStringLiteralParsing(t *testing.T) {

data/transactions/logic/box_test.go

@@ -556,7 +556,7 @@ func TestBoxTotals(t *testing.T) {
 
 	ledger.NewApp(txn.Sender, 888, basics.AppParams{})
 	// The SENDER certainly has no boxes (but does exist)
-	logic.TestApp(t, `int 0; acct_params_get AcctTotalBoxes; pop; !`, ep)
+	logic.TestApp(t, `txn Sender; acct_params_get AcctTotalBoxes; pop; !`, ep)
 	// Nor does the app account, to start
 	logic.TestApp(t, `int 888; app_params_get AppAddress; assert;
 	                  acct_params_get AcctTotalBoxes; pop; !; `, ep)

data/transactions/logic/eval.go

@@ -4015,9 +4015,11 @@ func (cx *EvalContext) assignAccount(sv stackValue) (basics.Address, error) {
 // not, based on version.
 
 func (cx *EvalContext) accountReference(account stackValue) (basics.Address, uint64, error) {
-	if account.argType() == StackUint64 {
-		addr, err := cx.txn.Txn.AddressByIndex(account.Uint, cx.txn.Txn.Sender)
-		return addr, account.Uint, err
+	if cx.version < sharedResourcesVersion {
+		if account.argType() == StackUint64 {
+			addr, err := cx.txn.Txn.AddressByIndex(account.Uint, cx.txn.Txn.Sender)
+			return addr, account.Uint, err
+		}
 	}
 	addr, err := account.address()
 	if err != nil {
@@ -4479,13 +4481,7 @@ func (cx *EvalContext) appReference(ref uint64, foreign bool) (basics.AppIndex,
 func (cx *EvalContext) localsReference(account stackValue, ref uint64) (basics.Address, basics.AppIndex, uint64, error) {
 	if cx.version >= sharedResourcesVersion {
 		unused := uint64(0) // see function comment
-		var addr basics.Address
-		var err error
-		if account.Bytes != nil {
-			addr, err = account.address()
-		} else {
-			addr, err = cx.txn.Txn.AddressByIndex(account.Uint, cx.txn.Txn.Sender)
-		}
+		addr, err := account.address()
 		if err != nil {
 			return basics.Address{}, 0, 0, err
 		}
@@ -4562,13 +4558,7 @@ func (cx *EvalContext) assetReference(ref uint64, foreign bool) (basics.AssetInd
 
 func (cx *EvalContext) holdingReference(account stackValue, ref uint64) (basics.Address, basics.AssetIndex, error) {
 	if cx.version >= sharedResourcesVersion {
-		var addr basics.Address
-		var err error
-		if account.Bytes != nil {
-			addr, err = account.address()
-		} else {
-			addr, err = cx.txn.Txn.AddressByIndex(account.Uint, cx.txn.Txn.Sender)
-		}
+		addr, err := account.address()
 		if err != nil {
 			return basics.Address{}, 0, err
 		}