diff options
Diffstat (limited to 'GeneralStateTests/stReturnDataTest')
11 files changed, 826 insertions, 291 deletions
diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_0_0_following_successful_create.json b/GeneralStateTests/stReturnDataTest/returndatacopy_0_0_following_successful_create.json index 9cb9ee514..1605c157e 100644 --- a/GeneralStateTests/stReturnDataTest/returndatacopy_0_0_following_successful_create.json +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_0_0_following_successful_create.json @@ -13,57 +13,72 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP150", - "EIP158" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x01" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xe4cebf89f5dd511ecb89b3e97ce05d1225202ff5ce2b0b9d81c96892694ac020", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "shouldexist" : false - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x00" - } + ], + "EIP158" : [ + { + "hash" : "0xe4cebf89f5dd511ecb89b3e97ce05d1225202ff5ce2b0b9d81c96892694ac020", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "storage" : { - "0x00" : "0x01" - } - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xe4cebf89f5dd511ecb89b3e97ce05d1225202ff5ce2b0b9d81c96892694ac020", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xe4cebf89f5dd511ecb89b3e97ce05d1225202ff5ce2b0b9d81c96892694ac020", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xe5612a75f1f88badf3d4faf86108f59eb5c568d658cd7fb37f1fbf8fcf96f307", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (create 0 0 (lll {(SSTORE 0 1)} 0)) (RETURNDATACOPY 0 0 0) (SSTORE 0 0) }", + "code" : "0x600580601b60003960006000f0506000600060003e6000600055006001600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json b/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json index eaef1c5a2..5bfd70d96 100644 --- a/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json @@ -13,56 +13,79 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158", - "Frontier", - "Homestead" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x01" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff" - } - } + ], + "EIP158" : [ + { + "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x376691e9e29f93981011bffcaca3712843ab3756408ab015b3db0c9d12b19291", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }", + "code" : "0x7d111122223333444455556666777788889999aaaabbbbccccddddeeeeffff60005260206000f3", "nonce" : "0x00", "storage" : { } }, "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) )}", + "code" : "0x60006000600060006000730aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6640900000000f1506020600060003e600051600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_following_create.json b/GeneralStateTests/stReturnDataTest/returndatacopy_following_create.json index 94f62ecec..f2e2c9d8c 100644 --- a/GeneralStateTests/stReturnDataTest/returndatacopy_following_create.json +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_following_create.json @@ -13,36 +13,79 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x01" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0xf7b621e953cb638b315fa40cb8a978a4b99c727e701a12cea0de5f298e3c01c8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xf7b621e953cb638b315fa40cb8a978a4b99c727e701a12cea0de5f298e3c01c8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xf7b621e953cb638b315fa40cb8a978a4b99c727e701a12cea0de5f298e3c01c8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xf7b621e953cb638b315fa40cb8a978a4b99c727e701a12cea0de5f298e3c01c8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xf7b621e953cb638b315fa40cb8a978a4b99c727e701a12cea0de5f298e3c01c8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }", + "code" : "0x7d111122223333444455556666777788889999aaaabbbbccccddddeeeeffff60005260206000f3", "nonce" : "0x00", "storage" : { } }, "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (create (STOP)) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) )}", + "code" : "0x596000526001806022600051396000516000f0506020600060003e6000516000550000", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_following_failing_call.json b/GeneralStateTests/stReturnDataTest/returndatacopy_following_failing_call.json index 7ffc8cbb8..f4588a3dd 100644 --- a/GeneralStateTests/stReturnDataTest/returndatacopy_following_failing_call.json +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_following_failing_call.json @@ -13,25 +13,68 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x01" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", @@ -42,7 +85,7 @@ }, "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) (RETURNDATACOPY 0 1 32) (SSTORE 0 (MLOAD 0)) }", + "code" : "0x60006000600060006000730aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6640900000000f1506020600160003e600051600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_following_successful_create.json b/GeneralStateTests/stReturnDataTest/returndatacopy_following_successful_create.json index 73681bb3a..d3ac89eb7 100644 --- a/GeneralStateTests/stReturnDataTest/returndatacopy_following_successful_create.json +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_following_successful_create.json @@ -13,29 +13,72 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x02" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x83d0eeb43ed2b2bec2f8d3838855b1afb2dd777f3de209ac647009b3ec7a3b5e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x83d0eeb43ed2b2bec2f8d3838855b1afb2dd777f3de209ac647009b3ec7a3b5e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x83d0eeb43ed2b2bec2f8d3838855b1afb2dd777f3de209ac647009b3ec7a3b5e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x83d0eeb43ed2b2bec2f8d3838855b1afb2dd777f3de209ac647009b3ec7a3b5e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x83d0eeb43ed2b2bec2f8d3838855b1afb2dd777f3de209ac647009b3ec7a3b5e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (create (STOP)) (RETURNDATACOPY 0 1 32) (SSTORE 0 (MLOAD 0)) }", + "code" : "0x596000526001806022600051396000516000f0506020600160003e6000516000550000", "nonce" : "0x00", "storage" : { "0x00" : "0x02" diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_initial.json b/GeneralStateTests/stReturnDataTest/returndatacopy_initial.json index 255dc2fae..1b40b4a0d 100644 --- a/GeneralStateTests/stReturnDataTest/returndatacopy_initial.json +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_initial.json @@ -13,29 +13,72 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x01" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x038be2c7d9e53c969aee21996b69ddc546ae8b6c0529da599fcf0bf2afcc802d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x038be2c7d9e53c969aee21996b69ddc546ae8b6c0529da599fcf0bf2afcc802d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x038be2c7d9e53c969aee21996b69ddc546ae8b6c0529da599fcf0bf2afcc802d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x038be2c7d9e53c969aee21996b69ddc546ae8b6c0529da599fcf0bf2afcc802d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x038be2c7d9e53c969aee21996b69ddc546ae8b6c0529da599fcf0bf2afcc802d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a7640000", - "code" : "{ (MSTORE 0 0x112233445566778899aabbccddeeff) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) }", + "code" : "0x6e112233445566778899aabbccddeeff6000526020600060003e600051600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json b/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json index f7c291096..31108678d 100644 --- a/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json @@ -13,29 +13,172 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "ALL" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x01" - } - } + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a7640000", - "code" : "{ (RETURNDATACOPY (- 0 (CALLDATALOAD 0)) 0 0x64) (MSTORE 0 0x112233445566778899aabbccddeeff) (SSTORE 0 (MLOAD 0)) }", + "code" : "0x606460006000356000033e6e112233445566778899aabbccddeeff600052600051600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_initial_big_sum.json b/GeneralStateTests/stReturnDataTest/returndatacopy_initial_big_sum.json index 58a10e4ef..3b8a07839 100644 --- a/GeneralStateTests/stReturnDataTest/returndatacopy_initial_big_sum.json +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_initial_big_sum.json @@ -13,29 +13,72 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x01" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0xa842d2afd89227dc81d471796d5c33c2e54c32b0fc51d9bd14c911e5b411a5cc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xa842d2afd89227dc81d471796d5c33c2e54c32b0fc51d9bd14c911e5b411a5cc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xa842d2afd89227dc81d471796d5c33c2e54c32b0fc51d9bd14c911e5b411a5cc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xa842d2afd89227dc81d471796d5c33c2e54c32b0fc51d9bd14c911e5b411a5cc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xa842d2afd89227dc81d471796d5c33c2e54c32b0fc51d9bd14c911e5b411a5cc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a7640000", - "code" : "{ (MSTORE 0 0x112233445566778899aabbccddeeff) (RETURNDATACOPY 0 (EXP 2 63) (EXP 2 63)) (SSTORE 0 (MLOAD 0)) }", + "code" : "0x6e112233445566778899aabbccddeeff600052603f60020a603f60020a60003e600051600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_overrun.json b/GeneralStateTests/stReturnDataTest/returndatacopy_overrun.json index b99c54235..5a30e73e4 100644 --- a/GeneralStateTests/stReturnDataTest/returndatacopy_overrun.json +++ b/GeneralStateTests/stReturnDataTest/returndatacopy_overrun.json @@ -13,36 +13,79 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x01" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0xb313ca207736a8149d8c25df1c1735bdecbaf9b58b17065dab26e7e95b6cf7ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xb313ca207736a8149d8c25df1c1735bdecbaf9b58b17065dab26e7e95b6cf7ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xb313ca207736a8149d8c25df1c1735bdecbaf9b58b17065dab26e7e95b6cf7ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xb313ca207736a8149d8c25df1c1735bdecbaf9b58b17065dab26e7e95b6cf7ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb313ca207736a8149d8c25df1c1735bdecbaf9b58b17065dab26e7e95b6cf7ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }", + "code" : "0x7d111122223333444455556666777788889999aaaabbbbccccddddeeeeffff60005260206000f3", "nonce" : "0x00", "storage" : { } }, "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) (RETURNDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc 100) (SSTORE 0 (MLOAD 0)) )}", + "code" : "0x60006000600060006000730aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6640900000000f15060647ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc60003e600051600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/GeneralStateTests/stReturnDataTest/returndatasize_initial.json b/GeneralStateTests/stReturnDataTest/returndatasize_initial.json index 972351df0..0419ec0a5 100644 --- a/GeneralStateTests/stReturnDataTest/returndatasize_initial.json +++ b/GeneralStateTests/stReturnDataTest/returndatasize_initial.json @@ -13,49 +13,72 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158", - "Frontier", - "Homestead" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x01" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x00" - } - } + ], + "EIP158" : [ + { + "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x5d0ec58a88cf3f6d6f3c7fd229003c587b7f1811e4b0471c588b8a65f0ced347", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a7640000", - "code" : "{ (SSTORE 0 (RETURNDATASIZE)) }", + "code" : "0x3d600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/GeneralStateTests/stReturnDataTest/returndatasize_initial_zero_read.json b/GeneralStateTests/stReturnDataTest/returndatasize_initial_zero_read.json index 700ee441e..749324745 100644 --- a/GeneralStateTests/stReturnDataTest/returndatasize_initial_zero_read.json +++ b/GeneralStateTests/stReturnDataTest/returndatasize_initial_zero_read.json @@ -13,49 +13,122 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "EIP150", - "EIP158", - "Frontier", - "Homestead" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x01" - } - } + { + "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 + ], + "EIP158" : [ + { + "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "0x00" - } - } + { + "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xd754a4f9fbc3b2bb742f7c114b9d72c205df6106b1cb35bd9a21e242b1c504d7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe40f3494b9b09f0f6df817a497e93a890f7aed50a18e6fe1e17d3655a9ec1160", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x0de0b6b3a7640000", - "code" : "{ (RETURNDATACOPY 0 0 0) (SSTORE 0 (MLOAD 0)) }", + "code" : "0x6000600060003e600051600055", "nonce" : "0x00", "storage" : { "0x00" : "0x01" |