From 2562d0da24bb26dad1754aa1dab7b0779b353109 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Tue, 2 Jan 2018 17:37:48 +0100 Subject: Add a test for RETURNDATASIZE/COPY after a revert during a CALLCODE --- .../stRevertTest/RevertInCallCodeFiller.json | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'src/GeneralStateTestsFiller/stRevertTest') diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertInCallCodeFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertInCallCodeFiller.json index ef3cbf743..1b8019865 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertInCallCodeFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertInCallCodeFiller.json @@ -15,26 +15,42 @@ "gas" : -1, "value" : -1 }, - "network" : "ALL", + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "1000000000000000000000000000000000000000" : { "storage" : { } } } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : "Byzantium", + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x20", + "0x02" : "0x2232" + } + } + } } ], "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000", - "code" : "{ [[ 0 ]] (CALLCODE 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1000 0 64 0 64 )}", + "code" : "{ [[ 0 ]] (CALLCODE 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1000 0 64 0 64 ) [[ 1 ]] (RETURNDATASIZE) (RETURNDATACOPY 64 0 32) [[ 2 ]] (MLOAD 64) }", "nonce" : "0", "storage" : { } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "0", - "code" : "{ (REVERT 0 0) }", + "code" : "{ (MSTORE 0 0x2232) (REVERT 0 32) }", "nonce" : "0", "storage" : { } -- cgit v1.2.3