diff options
6 files changed, 121 insertions, 18 deletions
diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json b/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json new file mode 100644 index 000000000..9550268d3 --- /dev/null +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json @@ -0,0 +1,103 @@ +{ + "returndatacopy_following_call" : { + "env" : { + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x20000", + "currentGasLimit" : "0x0a00000000", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "post" : { + "EIP150" : [ + { + "hash" : "0x061f5bb243c3e77ee12372acc7b2cf560126330c6088354f095250cd63d49e55", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + } + } + ], + "EIP158" : [ + { + "hash" : "0x061f5bb243c3e77ee12372acc7b2cf560126330c6088354f095250cd63d49e55", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + } + } + ], + "Frontier" : [ + { + "hash" : "0x061f5bb243c3e77ee12372acc7b2cf560126330c6088354f095250cd63d49e55", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + } + } + ], + "Homestead" : [ + { + "hash" : "0x061f5bb243c3e77ee12372acc7b2cf560126330c6088354f095250cd63d49e55", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + } + } + ], + "Metropolis" : [ + { + "hash" : "0xd22ea08bfc615bf36895e7dd11f6ee3008478804a753b6e054313dfba40e3e89", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + } + } + ] + }, + "pre" : { + "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "0x00", + "code" : "0x7d111122223333444455556666777788889999aaaabbbbccccddddeeeeffff60005260206000f3", + "nonce" : "0x00", + "storage" : { + } + }, + "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "0x00", + "code" : "0x60206000600060006000730aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6640900000000f1506020600060003e600051600055", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x6400000000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "0x0a00000000" + ], + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "value" : [ + "0x00" + ] + } + } +}
\ No newline at end of file diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_initial.json b/GeneralStateTests/stReturnDataTest/returndatacopy_initial.json index 2c85216d1..5a66b1712 100644 --- a/GeneralStateTests/stReturnDataTest/returndatacopy_initial.json +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_initial.json @@ -11,7 +11,7 @@ "post" : { "EIP150" : [ { - "hash" : "0x4baeeffbe9c16ad39612809ecc9b3b4a770457fda21fc53a2d4f0421be8bdc0d", + "hash" : "0x51fa6c22b1b427de2747dacac21004dd65d69e8e117fdbeee5163f66b25c5e91", "indexes" : { "data" : 0, "gas" : 0, @@ -21,7 +21,7 @@ ], "EIP158" : [ { - "hash" : "0x4baeeffbe9c16ad39612809ecc9b3b4a770457fda21fc53a2d4f0421be8bdc0d", + "hash" : "0x51fa6c22b1b427de2747dacac21004dd65d69e8e117fdbeee5163f66b25c5e91", "indexes" : { "data" : 0, "gas" : 0, @@ -31,7 +31,7 @@ ], "Frontier" : [ { - "hash" : "0x4baeeffbe9c16ad39612809ecc9b3b4a770457fda21fc53a2d4f0421be8bdc0d", + "hash" : "0x51fa6c22b1b427de2747dacac21004dd65d69e8e117fdbeee5163f66b25c5e91", "indexes" : { "data" : 0, "gas" : 0, @@ -41,7 +41,7 @@ ], "Homestead" : [ { - "hash" : "0x4baeeffbe9c16ad39612809ecc9b3b4a770457fda21fc53a2d4f0421be8bdc0d", + "hash" : "0x51fa6c22b1b427de2747dacac21004dd65d69e8e117fdbeee5163f66b25c5e91", "indexes" : { "data" : 0, "gas" : 0, @@ -51,7 +51,7 @@ ], "Metropolis" : [ { - "hash" : "0x8663facd02a82a5cc12e5cdc13e1f71d588f3879e5e112599f2c4d5eb0d76048", + "hash" : "0x9dd2a23ed077511b9f432902b87cbaae380db486d3ac001a430e2909e9dea5d8", "indexes" : { "data" : 0, "gas" : 0, @@ -63,7 +63,7 @@ "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a7640000", - "code" : "0x306000526020600060000e600051600055", + "code" : "0x306000526020600060003e600051600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/GeneralStateTests/stReturnDataTest/returndatasize_initial.json b/GeneralStateTests/stReturnDataTest/returndatasize_initial.json index 70568e72b..f2b2c0507 100644 --- a/GeneralStateTests/stReturnDataTest/returndatasize_initial.json +++ b/GeneralStateTests/stReturnDataTest/returndatasize_initial.json @@ -1,5 +1,5 @@ { - "returndatacopy_initial" : { + "returndatasize_initial" : { "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -11,7 +11,7 @@ "post" : { "EIP150" : [ { - "hash" : "0x1b8b9fece92a631df1c3b962b8844eb113d9152b2c36f16cd918a767bfb97853", + "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993", "indexes" : { "data" : 0, "gas" : 0, @@ -21,7 +21,7 @@ ], "EIP158" : [ { - "hash" : "0x1b8b9fece92a631df1c3b962b8844eb113d9152b2c36f16cd918a767bfb97853", + "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993", "indexes" : { "data" : 0, "gas" : 0, @@ -31,7 +31,7 @@ ], "Frontier" : [ { - "hash" : "0x1b8b9fece92a631df1c3b962b8844eb113d9152b2c36f16cd918a767bfb97853", + "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993", "indexes" : { "data" : 0, "gas" : 0, @@ -41,7 +41,7 @@ ], "Homestead" : [ { - "hash" : "0x1b8b9fece92a631df1c3b962b8844eb113d9152b2c36f16cd918a767bfb97853", + "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993", "indexes" : { "data" : 0, "gas" : 0, @@ -51,7 +51,7 @@ ], "Metropolis" : [ { - "hash" : "0x20af5710d071e985daf5441dc6b85fd1cdd3f70187fcc87ab15b3824420e5bff", + "hash" : "0x5d0ec58a88cf3f6d6f3c7fd229003c587b7f1811e4b0471c588b8a65f0ced347", "indexes" : { "data" : 0, "gas" : 0, @@ -63,7 +63,7 @@ "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a7640000", - "code" : "0x0d600055", + "code" : "0x3d600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_callFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_callFiller.json index 6d0e4e009..2a226f29d 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_callFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_callFiller.json @@ -50,7 +50,7 @@ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", "code" : "{ (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) )}", - "code" : "0x60206000600060006000730aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6640900000000f1506020600060000e600051600055", + "code" : "0x60206000600060006000730aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6640900000000f1506020600060003e600051600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initialFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initialFiller.json index ce2e8a0dc..872f609b1 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initialFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initialFiller.json @@ -41,8 +41,8 @@ "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a7640000", - "code" : "{ (MSTORE 0 0x112233445566778899aabbccddeeff) (RETURNDATACOPY 32 0 0) (SSTORE 0 (MLOAD 0)) }", - "code" : "0x306000526020600060000e600051600055", + "code" : "{ (MSTORE 0 0x112233445566778899aabbccddeeff) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) }", + "code" : "0x306000526020600060003e600051600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_initialFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_initialFiller.json index 3086b9a5b..95fb6a6ad 100644 --- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_initialFiller.json +++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_initialFiller.json @@ -1,5 +1,5 @@ { - "returndatacopy_initial" : { + "returndatasize_initial" : { "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", @@ -42,7 +42,7 @@ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a7640000", "code" : "{ (SSTORE 0 (RETURNDATASIZE)) }", - "code" : "0x0d600055", + "code" : "0x3d600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" |