diff options
Diffstat (limited to 'src')
12 files changed, 117 insertions, 59 deletions
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json index ecff0c027..a652a4e8d 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json @@ -16,7 +16,7 @@ "1000000000000000000000000000000000000000" : { "storage" : { "0x00" : "0x00", - "0x01" : "0x00", + "0x01" : "0x014b7e", "0x02" : "0x00", "0x03" : "0x00" } @@ -45,7 +45,14 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] (GAS) }", + "nonce" : "0", + "storage" : { + } + }, + "2000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1) ) }", "nonce" : "0", "storage" : { } @@ -81,7 +88,8 @@ }, "transaction" : { "data" : [ - "" + "0x0000000000000000000000001000000000000000000000000000000000000001", + "0x0000000000000000000000002000000000000000000000000000000000000001" ], "gasLimit" : [ "172000" diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json index 01b1e6093..18e7cbd9d 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json @@ -20,7 +20,7 @@ "1000000000000000000000000000000000000000" : { "storage" : { "0x00" : "0x00", - "0x01" : "0x00", + "0x01" : "0x014b7e", "0x02" : "0x00" } }, @@ -57,28 +57,35 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] (GAS) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000001" : { "balance" : "0", - "code" : "{ [[ 1 ]] (STATICCALL 40085 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 3 1) }", + "code" : "{ (MSTORE 3 1) (STATICCALL 40085 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SSTORE 3 1) }", + "nonce" : "0", + "storage" : { + } + }, + "2000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (MSTORE 3 1) (STATICCALL 40085 0x1000000000000000000000000000000000000002 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1) ) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000002" : { "balance" : "0", - "code" : "{ [[ 2 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (MSTORE 3 1) (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) (MSTORE 32 1) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000003" : { "balance" : "0", - "code" : "{ (SSTORE 3 1) }", + "code" : "{ (MSTORE 3 1) }", "nonce" : "0", "storage" : { } @@ -93,7 +100,8 @@ }, "transaction" : { "data" : [ - "" + "0x0000000000000000000000001000000000000000000000000000000000000001", + "0x0000000000000000000000002000000000000000000000000000000000000001" ], "gasLimit" : [ "172000" diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json index a3dee7650..c53cdc1d5 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json @@ -20,7 +20,7 @@ "1000000000000000000000000000000000000000" : { "storage" : { "0x00" : "0x00", - "0x01" : "0x00", + "0x01" : "0x014b7e", "0x02" : "0x00" } }, @@ -58,9 +58,16 @@ "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] (GAS)}", "storage": {} }, + "2000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (STATICCALL 40085 0x1000000000000000000000000000000000000002 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1) ) }", + "nonce" : "0", + "storage" : { + } + }, "1000000000000000000000000000000000000001" : { "balance" : "0", "code" : "{ (STATICCALL 40085 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SSTORE 3 1) }", @@ -90,7 +97,8 @@ }, "transaction" : { "data" : [ - "" + "0x0000000000000000000000001000000000000000000000000000000000000001", + "0x0000000000000000000000002000000000000000000000000000000000000001" ], "gasLimit" : [ "172000" diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json index 3cebed8a2..75310a2fb 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json @@ -20,7 +20,7 @@ "1000000000000000000000000000000000000000" : { "storage" : { "0x00" : "0x00", - "0x01" : "0x00", + "0x01" : "0x014b7e", "0x02" : "0x00", "0x03" : "0x00" } @@ -50,7 +50,7 @@ "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", "nonce" : "0", - "code" : "{ [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] (GAS) }", "storage": {} }, "1000000000000000000000000000000000000001" : { @@ -60,6 +60,13 @@ "storage" : { } }, + "2000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1) )}", + "nonce" : "0", + "storage" : { + } + }, "1000000000000000000000000000000000000002" : { "balance" : "0", "code" : "{ (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", @@ -82,7 +89,8 @@ }, "transaction" : { "data" : [ - "" + "0x0000000000000000000000001000000000000000000000000000000000000001", + "0x0000000000000000000000002000000000000000000000000000000000000001" ], "gasLimit" : [ "172000" diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBefore2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBefore2Filler.json index 7a006e03a..7d29a9c74 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBefore2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBefore2Filler.json @@ -11,12 +11,12 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Metropolis"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00", + "0x00" : "0x01", + "0x01" : "0x015c55", "0x02" : "0x00", "0x03" : "0x00" } @@ -45,28 +45,35 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 32 0 64 ) [[ 1 ]] (GAS) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000001" : { "balance" : "0", - "code" : "{ [[ 1 ]] (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) }", + "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (STATICCALL 40080 (CALLDATALOAD 0) 0 64 0 64 ) (MSTORE 32 1) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000002" : { "balance" : "0", - "code" : "{ (MSTORE 3 1) [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SSTORE 1 1) (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", + "storage" : { + } + }, + "2000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000003" : { "balance" : "0", - "code" : "{ (SSTORE 3 1) }", + "code" : "{ (MSTORE 3 1) }", "nonce" : "0", "storage" : { } @@ -81,7 +88,8 @@ }, "transaction" : { "data" : [ - "" + "0x0000000000000000000000001000000000000000000000000000000000000002", + "0x0000000000000000000000002000000000000000000000000000000000000002" ], "gasLimit" : [ "172000" diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBeforeFiller.json index 8750a1027..bf4c0f8d2 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBeforeFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_OOGMBeforeFiller.json @@ -19,8 +19,8 @@ "result" : { "1000000000000000000000000000000000000000" : { "storage" : { - "0x00" : "0x00", - "0x01" : "0x00", + "0x00" : "0x01", + "0x01" : "0x015c58", "0x02" : "0x00", "0x03" : "0x00" } @@ -55,28 +55,35 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 32 0 64 ) [[ 1 ]] (GAS) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000001" : { "balance" : "0", - "code" : "{ [[ 1 ]] (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) }", + "code" : "{ (MSTORE 3 1) (STATICCALL 40080 (CALLDATALOAD 0) 0 64 0 64 ) (MSTORE 32 1) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000002" : { "balance" : "0", - "code" : "{ (MSTORE 3 1) [[ 2 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1) ) (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) (MSTORE 3 1) }", + "nonce" : "0", + "storage" : { + } + }, + "2000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (SSTORE 1 1) (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) (MSTORE 3 1) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000003" : { "balance" : "0", - "code" : "{ (SSTORE 3 1) }", + "code" : "{ (MSTORE 3 1) }", "nonce" : "0", "storage" : { } @@ -91,7 +98,8 @@ }, "transaction" : { "data" : [ - "" + "0x0000000000000000000000001000000000000000000000000000000000000002", + "0x0000000000000000000000002000000000000000000000000000000000000002" ], "gasLimit" : [ "172000" diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEnd2Filler.json index 3a19988df..57c3c4477 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEnd2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEnd2Filler.json @@ -11,8 +11,14 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Metropolis"], "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x2b9a4b" + } + }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000" }, @@ -28,28 +34,28 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] (GAS) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }", + "code" : "{ (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", + "code" : "{ (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000003" : { "balance" : "10000000000", - "code" : "{ (SSTORE 3 1) }", + "code" : "{ (MSTORE 3 1) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEndFiller.json index b5c16a6ff..32dbae7f5 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEndFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideEndFiller.json @@ -19,11 +19,13 @@ "result" : { "1000000000000000000000000000000000000000" : { "storage" : { - "0x00" : "0x00", + "0x00" : "0x01", + "0x01" : "0x2b9a4b", "0x02" : "0x00" } }, "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", "storage" : { "0x01" : "0x00", "0x03" : "0x00" @@ -49,28 +51,28 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] (GAS) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }", + "code" : "{ (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", + "code" : "{ (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000003" : { "balance" : "10000000000", - "code" : "{ (SSTORE 3 1) }", + "code" : "{ (MSTORE 3 1) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.json index c320a420e..3441ae64a 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.json @@ -11,12 +11,13 @@ "expect" : [ { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : ["ALL"], + "network" : ["Metropolis"], "result" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", "storage" : { - "0x00" : "0x00" + "0x00" : "0x01", + "0x01" : "0x2b9a37" } }, "1000000000000000000000000000000000000003" : { @@ -32,28 +33,28 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] (GAS) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }", + "code" : "{ (MSTORE 3 1) (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 32 1) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000003" : { "balance" : "10000000000", - "code" : "{ (SSTORE 3 1) }", + "code" : "{ (MSTORE 3 1) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddleFiller.json index f7e59f4ac..2d8d04015 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddleFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddleFiller.json @@ -20,7 +20,8 @@ "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", "storage" : { - "0x00" : "0x00" + "0x00" : "0x01", + "0x01" : "0x2b9a37" } }, "1000000000000000000000000000000000000001" : { @@ -49,28 +50,28 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] (GAS) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }", + "code" : "{ (MSTORE 3 1) (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 32 1) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000003" : { "balance" : "10000000000", - "code" : "{ (SSTORE 3 1) }", + "code" : "{ (MSTORE 3 1) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json index 6340cd716..ea92ad3cf 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json @@ -32,7 +32,7 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "25026727" + "balance" : "140109" } } } @@ -40,21 +40,21 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ (MSTORE 1 1) (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 64 0 64 ) (MSTORE 3 1) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (STATICCALL 1000000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }", + "code" : "{ (MSTORE 1 1) (STATICCALL 1000000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 2 1) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (CALLCODE 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "code" : "{ (MSTORE 1 1) (CALLCODE 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) (MSTORE 2 1) }", "nonce" : "0", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json index 8cf3c2322..86a544ba9 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json @@ -36,7 +36,7 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "25026727" + "balance" : "139959" } } } @@ -44,21 +44,21 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ (MSTORE 1 1) (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 64 0 64 ) (MSTORE 31 1)}", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000001" : { "balance" : "10000000000", - "code" : "{ [[ 1 ]] (STATICCALL 1000000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }", + "code" : "{ (MSTORE 1 1) (STATICCALL 1000000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 31 1) }", "nonce" : "0", "storage" : { } }, "1000000000000000000000000000000000000002" : { "balance" : "10000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 500000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "code" : "{ (MSTORE 1 1) (DELEGATECALL 500000 0x1000000000000000000000000000000000000001 0 64 0 64 ) (MSTORE 21 1) }", "nonce" : "0", "storage" : { } |