diff options
| author | Yoichi Hirai <i@yoichihirai.com> | 2017-12-21 20:35:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 20:35:33 +0800 |
| commit | 2ee7c50caf8c9d24eac8dbfd89b83b7d563db882 (patch) | |
| tree | 7c2ea71e767781694aa4bb3154fbf876d0e97bad /src | |
| parent | 3ab7d5b32543b8b7a82be97afc1ac3be89220eef (diff) | |
| parent | cc4af0976a0eabbd0da71e55ce6c38344d25f031 (diff) | |
| download | tangerine-tests-2ee7c50caf8c9d24eac8dbfd89b83b7d563db882.tar tangerine-tests-2ee7c50caf8c9d24eac8dbfd89b83b7d563db882.tar.gz tangerine-tests-2ee7c50caf8c9d24eac8dbfd89b83b7d563db882.tar.bz2 tangerine-tests-2ee7c50caf8c9d24eac8dbfd89b83b7d563db882.tar.lz tangerine-tests-2ee7c50caf8c9d24eac8dbfd89b83b7d563db882.tar.xz tangerine-tests-2ee7c50caf8c9d24eac8dbfd89b83b7d563db882.tar.zst tangerine-tests-2ee7c50caf8c9d24eac8dbfd89b83b7d563db882.zip | |
Merge pull request #384 from ethereum/revert_in_delegate_call_more
Test RETURNDATASIZE and RETURNDATACOPY in RevertInDelegateCallFiller
Diffstat (limited to 'src')
| -rw-r--r-- | src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInDelegateCall_d0g0v0Filler.json | 4 | ||||
| -rw-r--r-- | src/GeneralStateTestsFiller/stRevertTest/RevertInDelegateCallFiller.json | 22 |
2 files changed, 21 insertions, 5 deletions
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInDelegateCall_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInDelegateCall_d0g0v0Filler.json index acaaddb93..40fe2dfa5 100644 --- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInDelegateCall_d0g0v0Filler.json +++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInDelegateCall_d0g0v0Filler.json @@ -45,14 +45,14 @@ "pre" : { "0x1000000000000000000000000000000000000000" : { "balance" : "0x03e8", - "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055", + "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f46000553d60015560206000603f3e603f51600255", "nonce" : "0x00", "storage" : { } }, "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "0x00", - "code" : "0x60006000fd", + "code" : "0x600a60205260206020fd", "nonce" : "0x00", "storage" : { } diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertInDelegateCallFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertInDelegateCallFiller.json index 04dd6dfc4..87de005e3 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertInDelegateCallFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertInDelegateCallFiller.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" : { + "1": "32", + "2": "10" + } + } + } } ], "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000", - "code" : "{ [[ 0 ]] (DELEGATECALL 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 64 0 64 )}", + "code" : "{ [[ 0 ]] (DELEGATECALL 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 64 0 64 ) [[ 1 ]] (RETURNDATASIZE) (RETURNDATACOPY 63 0 32) [[2]](MLOAD 63)}", "nonce" : "0", "storage" : { } }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "0", - "code" : "{ (REVERT 0 0) }", + "code" : "{ (MSTORE 32 10) (REVERT 32 32) }", "nonce" : "0", "storage" : { } |