From dad5e8a06757f5261facc56e2f426b6a8409e409 Mon Sep 17 00:00:00 2001 From: Adrian Sutton Date: Tue, 20 Nov 2018 10:38:29 +1000 Subject: Add STATICCALL variant. --- .../extCodeHashCreatedAndDeletedAccount.json | 63 -------------------- .../extCodeHashCreatedAndDeletedAccountCall.json | 63 ++++++++++++++++++++ ...CodeHashCreatedAndDeletedAccountStaticCall.json | 63 ++++++++++++++++++++ ...CodeHashCreatedAndDeletedAccountCallFiller.json | 68 ++++++++++++++++++++++ ...shCreatedAndDeletedAccountStaticCallFiller.json | 68 ++++++++++++++++++++++ 5 files changed, 262 insertions(+), 63 deletions(-) delete mode 100644 GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccount.json create mode 100644 GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall.json create mode 100644 GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall.json create mode 100644 src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCallFiller.json create mode 100644 src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCallFiller.json diff --git a/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccount.json b/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccount.json deleted file mode 100644 index be92529f1..000000000 --- a/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccount.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "extCodeHashCreatedAndDeletedAccount" : { - "_info" : { - "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted in same transaction", - "filledwith" : "testeth 1.5.0-alpha.6-1+commit.19ad7d95.dirty", - "lllcversion" : "Version: 0.5.0-develop.2018.9.29+commit.c4b5101b.Darwin.appleclang", - "source" : "src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountFiller.json", - "sourceHash" : "ee152cae68b3cb6ec88aad0ba375c095c51f38c0442eaf5dfffcb9b35a71f6d0" - }, - "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" - }, - "post" : { - "Constantinople" : [ - { - "hash" : "0x28ec9cc4d5b3359131820d265caadf88b559339e71e83d19459e0fc3e7c7d91f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" - } - ] - }, - "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xdeadbeef00000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6010600f80604360803960806000f56000526000513f6000556000513b6001556000600060006000600060005162010000f1506000513f6002556000513b60035500fe600380600c6000396000f3fe6000ff", - "nonce" : "0x00", - "storage" : { - } - } - }, - "transaction" : { - "data" : [ - "0x" - ], - "gasLimit" : [ - "0x061a80" - ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xdeadbeef00000000000000000000000000000000", - "value" : [ - "0x01" - ] - } - } -} \ No newline at end of file diff --git a/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall.json b/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall.json new file mode 100644 index 000000000..f0555b27a --- /dev/null +++ b/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall.json @@ -0,0 +1,63 @@ +{ + "extCodeHashCreatedAndDeletedAccountCall" : { + "_info" : { + "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted in same transaction", + "filledwith" : "testeth 1.5.0-alpha.6-1+commit.19ad7d95.dirty", + "lllcversion" : "Version: 0.5.0-develop.2018.9.29+commit.c4b5101b.Darwin.appleclang", + "source" : "src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCallFiller.json", + "sourceHash" : "645179b4be0326e99e7c2c406dc1a8504610db115f4027e4006b29b32a06aed0" + }, + "env" : { + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x20000", + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "post" : { + "Constantinople" : [ + { + "hash" : "0x28ec9cc4d5b3359131820d265caadf88b559339e71e83d19459e0fc3e7c7d91f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ] + }, + "pre" : { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xdeadbeef00000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6010600f80604360803960806000f56000526000513f6000556000513b6001556000600060006000600060005162010000f1506000513f6002556000513b60035500fe600380600c6000396000f3fe6000ff", + "nonce" : "0x00", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "0x" + ], + "gasLimit" : [ + "0x061a80" + ], + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xdeadbeef00000000000000000000000000000000", + "value" : [ + "0x01" + ] + } + } +} \ No newline at end of file diff --git a/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall.json b/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall.json new file mode 100644 index 000000000..b9c9aa84b --- /dev/null +++ b/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall.json @@ -0,0 +1,63 @@ +{ + "extCodeHashCreatedAndDeletedAccountStaticCall" : { + "_info" : { + "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted in same transaction", + "filledwith" : "testeth 1.5.0-alpha.6-1+commit.19ad7d95.dirty", + "lllcversion" : "Version: 0.5.0-develop.2018.9.29+commit.c4b5101b.Darwin.appleclang", + "source" : "src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCallFiller.json", + "sourceHash" : "f110c2b9f36efac20a8e0d875c7852f54e725b1e5d87e7ce6d7b6b139514d338" + }, + "env" : { + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x20000", + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "post" : { + "Constantinople" : [ + { + "hash" : "0x2a9219a37ffe90d03dfe63744d59b93c1dfb4ba60de6c9015efc04090060a2af", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ] + }, + "pre" : { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xdeadbeef00000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6010600f80604160803960806000f56000526000513f6000556000513b600155600060006000600060005162010000fa506000513f6002556000513b60035500fe600380600c6000396000f3fe6000ff", + "nonce" : "0x00", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "0x" + ], + "gasLimit" : [ + "0x061a80" + ], + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xdeadbeef00000000000000000000000000000000", + "value" : [ + "0x01" + ] + } + } +} \ No newline at end of file diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCallFiller.json b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCallFiller.json new file mode 100644 index 000000000..5cb7475d8 --- /dev/null +++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCallFiller.json @@ -0,0 +1,68 @@ +{ + "extCodeHashCreatedAndDeletedAccountCall": { + "_info": { + "comment": "EXTCODEHASH/EXTCODESIZE of an account created then deleted via CALL in same transaction" + }, + "env": { + "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty": "0x20000", + "currentGasLimit": "1000000", + "currentNumber": "1", + "currentTimestamp": "1000", + "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect": [ + { + "indexes": { + "data": -1, + "gas": -1, + "value": -1 + }, + "network": [ + ">=Constantinople" + ], + "result": { + "deadbeef00000000000000000000000000000000": { + "storage": { + "0x00": "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd", + "0x01": "0x03", + "0x02": "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd", + "0x03": "0x03" + } + } + } + } + ], + "pre": { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": { + "balance": "1000000000000000000", + "code": "0x", + "nonce": "0", + "storage": { + } + }, + "deadbeef00000000000000000000000000000000": { + "balance": "1000000000000000000", + "code": "{ (MSTORE 0 (CREATE2 0 128 (lll { (RETURN 0 (lll { (SELFDESTRUCT 0x0) } 0)) } 128) 0x10)) [[0]] (EXTCODEHASH (MLOAD 0)) [[1]] (EXTCODESIZE (MLOAD 0)) (CALL 0x10000 (MLOAD 0) 0 0 0 0 0) [[2]] (EXTCODEHASH (MLOAD 0)) [[3]] (EXTCODESIZE (MLOAD 0)) (STOP) }", + "nonce": "0", + "storage": { + } + } + }, + "transaction": { + "data": [ + "" + ], + "gasLimit": [ + "400000" + ], + "gasPrice": "1", + "nonce": "0", + "secretKey": "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to": "deadbeef00000000000000000000000000000000", + "value": [ + "1" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCallFiller.json b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCallFiller.json new file mode 100644 index 000000000..5a31948e0 --- /dev/null +++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCallFiller.json @@ -0,0 +1,68 @@ +{ + "extCodeHashCreatedAndDeletedAccountStaticCall": { + "_info": { + "comment": "EXTCODEHASH/EXTCODESIZE of an account created then deleted via STATICCALL in same transaction" + }, + "env": { + "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty": "0x20000", + "currentGasLimit": "1000000", + "currentNumber": "1", + "currentTimestamp": "1000", + "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect": [ + { + "indexes": { + "data": -1, + "gas": -1, + "value": -1 + }, + "network": [ + ">=Constantinople" + ], + "result": { + "deadbeef00000000000000000000000000000000": { + "storage": { + "0x00": "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd", + "0x01": "0x03", + "0x02": "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd", + "0x03": "0x03" + } + } + } + } + ], + "pre": { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": { + "balance": "1000000000000000000", + "code": "0x", + "nonce": "0", + "storage": { + } + }, + "deadbeef00000000000000000000000000000000": { + "balance": "1000000000000000000", + "code": "{ (MSTORE 0 (CREATE2 0 128 (lll { (RETURN 0 (lll { (SELFDESTRUCT 0x0) } 0)) } 128) 0x10)) [[0]] (EXTCODEHASH (MLOAD 0)) [[1]] (EXTCODESIZE (MLOAD 0)) (STATICCALL 0x10000 (MLOAD 0) 0 0 0 0) [[2]] (EXTCODEHASH (MLOAD 0)) [[3]] (EXTCODESIZE (MLOAD 0)) (STOP) }", + "nonce": "0", + "storage": { + } + } + }, + "transaction": { + "data": [ + "" + ], + "gasLimit": [ + "400000" + ], + "gasPrice": "1", + "nonce": "0", + "secretKey": "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to": "deadbeef00000000000000000000000000000000", + "value": [ + "1" + ] + } + } +} -- cgit v1.2.3