diff options
| author | Dimitry <winsvega@mail.ru> | 2017-08-01 16:04:30 +0800 |
|---|---|---|
| committer | Dimitry <winsvega@mail.ru> | 2017-08-01 16:04:30 +0800 |
| commit | 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 (patch) | |
| tree | c3d6bf604954c6fbd3f0416d972ca922dda331c3 /GeneralStateTests/stNonZeroCallsTest | |
| parent | f71c2688e1a839f8429f7e94ec5e56bb182d82cf (diff) | |
| download | dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar.gz dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar.bz2 dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar.lz dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar.xz dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.tar.zst dexon-tests-78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43.zip | |
update general tests
Diffstat (limited to 'GeneralStateTests/stNonZeroCallsTest')
24 files changed, 1842 insertions, 1583 deletions
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL.json index a57eb925f..251a0ddf0 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL.json @@ -6,75 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x63", - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x07bac9" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x9df178851e255b9eca0b8f56c64426c1aad2ab88fb32bc1ef272a472e67c52c3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x63", - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x07bd5d" - } + ], + "EIP158" : [ + { + "hash" : "0x9df178851e255b9eca0b8f56c64426c1aad2ab88fb32bc1ef272a472e67c52c3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x18fde033bb93d4edd7f65d0bf26b1ae113fae2abe0b6d9f51571b9bd41e8ba89", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x18fde033bb93d4edd7f65d0bf26b1ae113fae2abe0b6d9f51571b9bd41e8ba89", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x9df178851e255b9eca0b8f56c64426c1aad2ab88fb32bc1ef272a472e67c52c3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100", - "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x64", + "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455", + "nonce" : "0x00", "storage" : { } } @@ -84,14 +96,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json index 2d0238fcc..c3df475bf 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json @@ -6,73 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x081c71" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xe034c4ab4e487e066337e27811b39dc4b3a63c127b1e8968e3d57d6dc7c2ac11", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x081f05" - } + ], + "EIP158" : [ + { + "hash" : "0xe034c4ab4e487e066337e27811b39dc4b3a63c127b1e8968e3d57d6dc7c2ac11", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xfc851b9f0ae9a9b21a39bd3567a405dde667c95ea642e2b2adf2a6e5cde10175", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xfc851b9f0ae9a9b21a39bd3567a405dde667c95ea642e2b2adf2a6e5cde10175", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xe034c4ab4e487e066337e27811b39dc4b3a63c127b1e8968e3d57d6dc7c2ac11", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100", - "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x64", + "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455", + "nonce" : "0x00", "storage" : { } } @@ -82,14 +96,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json index e9ad56da2..001211c59 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json @@ -6,88 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmptyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x081c71" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x30e803dcb470910b21cbc5afe6f4e10c0255e41681c2798792a46c45aeab8b85", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "0x", - "nonce" : "0", - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x081f05" - } + ], + "EIP158" : [ + { + "hash" : "0x30e803dcb470910b21cbc5afe6f4e10c0255e41681c2798792a46c45aeab8b85", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "0x", - "nonce" : "0", - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x4323085a2521bdac4f581cd301feb82a04ca8f6715bffad04bf59bf41e34e13f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x4323085a2521bdac4f581cd301feb82a04ca8f6715bffad04bf59bf41e34e13f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x30e803dcb470910b21cbc5afe6f4e10c0255e41681c2798792a46c45aeab8b85", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100", - "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x64", + "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "0x", - "nonce" : "0", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", "storage" : { } } @@ -97,14 +103,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json index dacc51040..d821b268f 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json @@ -6,78 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x64" : "0x085709" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x73c1b3d3ff93afd00bab54b6c2ba55cf832755ddb84300c1fe67f7a8c9adc9f1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x64" : "0x08599d" - } + ], + "EIP158" : [ + { + "hash" : "0x73c1b3d3ff93afd00bab54b6c2ba55cf832755ddb84300c1fe67f7a8c9adc9f1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x75e88dfadd9e54ba0f0655edc26b76b4c4d81f44f1c08463db104ffb99e5801f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x75e88dfadd9e54ba0f0655edc26b76b4c4d81f44f1c08463db104ffb99e5801f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x73c1b3d3ff93afd00bab54b6c2ba55cf832755ddb84300c1fe67f7a8c9adc9f1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x64", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -87,14 +103,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json index fce782900..0b70847df 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json @@ -6,86 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKeyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x081c71" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x6594ecae20668651e6810ff24736106050666ce43d3d194a424072aedb8ac36f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "storage" : { - "0x00" : "0x01" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x081f05" - } + ], + "EIP158" : [ + { + "hash" : "0x6594ecae20668651e6810ff24736106050666ce43d3d194a424072aedb8ac36f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "storage" : { - "0x00" : "0x01" - } - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x810d61625df378cb6b11b70292d47ef172a8ba6b3ee2a980d0ced31543f4d8ef", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x810d61625df378cb6b11b70292d47ef172a8ba6b3ee2a980d0ced31543f4d8ef", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x6594ecae20668651e6810ff24736106050666ce43d3d194a424072aedb8ac36f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000", - "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x03e8", + "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { "0x00" : "0x01" } @@ -96,14 +104,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json index 7ede1710d..7093c5aa1 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json @@ -6,101 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToEmptyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x07bac9" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x0475fdbe6f5d3b56c1a456bdf38b1af774714b49d972141014a773d341abff8c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x081c71" - } + ], + "EIP158" : [ + { + "hash" : "0xb28eed23e9dad726338ac265dcf79d8c4232a554477c3b7ce825904ec31a80c7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x081f05" - } + ], + "Frontier" : [ + { + "hash" : "0x9776a6d31fb2793d3cecca684189f597321414fade8fa4285f5f5591ea932bf0", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01" - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x9776a6d31fb2793d3cecca684189f597321414fade8fa4285f5f5591ea932bf0", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb28eed23e9dad726338ac265dcf79d8c4232a554477c3b7ce825904ec31a80c7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000", - "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x03e8", + "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -110,14 +103,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json index 880262a96..1557139c1 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json @@ -6,78 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x64" : "0x085709" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xb56615545150230d234f9959803c1390853e12cf8c5c343b76b9869e3812f074", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x64" : "0x08599d" - } + ], + "EIP158" : [ + { + "hash" : "0xb56615545150230d234f9959803c1390853e12cf8c5c343b76b9869e3812f074", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x8ee7323d74cc905937313476a96b647b1df86592aa403abcce0ca08928829aec", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x8ee7323d74cc905937313476a96b647b1df86592aa403abcce0ca08928829aec", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb56615545150230d234f9959803c1390853e12cf8c5c343b76b9869e3812f074", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x64", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -87,14 +103,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json index ca5f10127..5987424d6 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json @@ -6,110 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKeyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x07bac9" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x58d12eb2afd9e732567022aac3eaaa0c5d5d5007551aef55ee02ef1b1b135dd7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "storage" : { - "0x00" : "0x01" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x081c71" - } + ], + "EIP158" : [ + { + "hash" : "0xc348bb0448946bdf5ba1c3e9c3751048bc78aa866d2c9de1e5fc82892f5eb099", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "storage" : { - "0x00" : "0x01" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x081f05" - } + ], + "Frontier" : [ + { + "hash" : "0x059510b79136780b74bc8dc28c65f719826ab4702456b8c8d81c951cb4c05bcf", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "storage" : { - "0x00" : "0x01" - } - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x059510b79136780b74bc8dc28c65f719826ab4702456b8c8d81c951cb4c05bcf", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xc348bb0448946bdf5ba1c3e9c3751048bc78aa866d2c9de1e5fc82892f5eb099", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000", - "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x03e8", + "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { "0x00" : "0x01" } @@ -120,14 +104,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json index 52e4b7734..e8c907d9a 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json @@ -6,94 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALLFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" + "post" : { + "EIP150" : [ + { + "hash" : "0xe131f40988e218780d2e8b009da72c874f92a48b6ca844afb3ca7e529ebf257d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x0836a0" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier" - ], - "result" : { - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" + ], + "EIP158" : [ + { + "hash" : "0xe131f40988e218780d2e8b009da72c874f92a48b6ca844afb3ca7e529ebf257d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0", - "0x01" : "0", - "0x64" : "0" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Homestead" - ], - "result" : { - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" + ], + "Frontier" : [ + { + "hash" : "0x0736a19073698ddc647cf82eed7589a7776bc227ca27788b12ca6bc5f94e39b8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x083934" - } - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x45a8638184a3027700edeb6478c08dd19a400d1ddb864e23c7f5b7faa9aed22c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xe131f40988e218780d2e8b009da72c874f92a48b6ca844afb3ca7e529ebf257d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455", + "nonce" : "0x00", "storage" : { } } @@ -103,14 +96,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json index 7b1dd5d1a..486a61464 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json @@ -6,113 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmptyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x0836a0" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "0x", - "nonce" : "0", - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0", - "0x01" : "0", - "0x64" : "0" - } + ], + "EIP158" : [ + { + "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "0x", - "nonce" : "0", - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x083934" - } + ], + "Frontier" : [ + { + "hash" : "0x2679e492e89edbb16b20be31663b8d783e92a85db08be2e2fcddfe0beb6ba088", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "0x", - "nonce" : "0", - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0xdd53adf5f25628ca817be7df8e5a57b5446689ed145a4ac46abf3a45013fe2af", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -122,14 +103,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json index 580fa0d6d..26731456a 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json @@ -6,101 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x0836a0" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0", - "0x01" : "0", - "0x64" : "0" - } + ], + "EIP158" : [ + { + "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x083934" - } + ], + "Frontier" : [ + { + "hash" : "0x490c7a4c7f7de525caa617975740e598c8b5d67fdf0b1299a85cbabd29b42d0a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100" - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0xf5814da69510fc59eb19ff9a78e870ed05d7e529ac9ccbe17a7a46db4e4369a0", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x64", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -110,14 +103,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json index ad0eca77f..6adcf2d68 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json @@ -6,110 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x0836a0" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "storage" : { - "0x00" : "0x01" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0", - "0x01" : "0", - "0x64" : "0" - } + ], + "EIP158" : [ + { + "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "storage" : { - "0x00" : "0x01" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x01", - "0x64" : "0x083934" - } + ], + "Frontier" : [ + { + "hash" : "0xb910ee1c13f68cb2c31ebf954a3682dacc4b2bc55eb576f6c42f44d9853d7e80", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "storage" : { - "0x00" : "0x01" - } - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x6baf84679c6338c00371b0e3246c4feaf08e07db41e1e0d191069ae5611645e5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { "0x00" : "0x01" } @@ -120,14 +104,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json index fc3633c97..bdffbcb18 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json @@ -6,68 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x697b" + "post" : { + "EIP150" : [ + { + "hash" : "0xc019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xc019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" + ], + "Frontier" : [ + { + "hash" : "0x80756cac9d08bad90d4111bd79b4dff1c6f1c0048822a7e1831b1152840c33cb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x80756cac9d08bad90d4111bd79b4dff1c6f1c0048822a7e1831b1152840c33cb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xc019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff", + "nonce" : "0x00", "storage" : { } } @@ -77,14 +96,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json index d0498246b..44f7f1ac2 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json @@ -6,72 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" + "post" : { + "EIP150" : [ + { + "hash" : "0xb31731ecc10e0cf52b8a47f22cb2c18bbf44d7548299432733efeec8c5e55608", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" + ], + "EIP158" : [ + { + "hash" : "0xc019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x80756cac9d08bad90d4111bd79b4dff1c6f1c0048822a7e1831b1152840c33cb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x80756cac9d08bad90d4111bd79b4dff1c6f1c0048822a7e1831b1152840c33cb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xc019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -81,14 +103,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json index bef14d814..7eefbe311 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json @@ -6,72 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" + "post" : { + "EIP150" : [ + { + "hash" : "0x29639facdc2ec378b5f8b30d7031af440030906818c65e5ce501be46e7673a6f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "101" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" + ], + "EIP158" : [ + { + "hash" : "0x29639facdc2ec378b5f8b30d7031af440030906818c65e5ce501be46e7673a6f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "101" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xee399cdbb90811501e58caaca483d656e0624d7465fdac67292b777e31ded659", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xee399cdbb90811501e58caaca483d656e0624d7465fdac67292b777e31ded659", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x29639facdc2ec378b5f8b30d7031af440030906818c65e5ce501be46e7673a6f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x64", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -81,14 +103,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json index a3d78b3b1..cd2313c1d 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json @@ -6,79 +6,95 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" + "post" : { + "EIP150" : [ + { + "hash" : "0x4d5ad37c709dfa330027d407eec5cd81657cc985006ae08573a2bebe550f7413", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "storage" : { - "0x00" : "0x01" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" + ], + "EIP158" : [ + { + "hash" : "0xeb8655c8a78e91811abc48ebc52669602d1e1e74cead359d88456dc60a293209", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "storage" : { - "0x00" : "0x01" - } - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x402b17e4f614ce2354257025fc55022b09dd55fc8de31637c8779c163d12600f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x402b17e4f614ce2354257025fc55022b09dd55fc8de31637c8779c163d12600f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xeb8655c8a78e91811abc48ebc52669602d1e1e74cead359d88456dc60a293209", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff", + "nonce" : "0x00", "storage" : { "0x00" : "0x01" } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { "0x00" : "0x01" } @@ -89,14 +105,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json index d586cf470..cbf063dfe 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json @@ -6,68 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x5208" + "post" : { + "EIP150" : [ + { + "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a4bdf7" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x5208" + ], + "Frontier" : [ + { + "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a4bdf7" + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ], + "Metropolis" : [ + { + "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -77,14 +89,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json index 496db2d9b..b07051f6a 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json @@ -6,59 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmptyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01" - } + ], + "EIP158" : [ + { + "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -68,14 +96,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json index b5a486699..e85dd5a26 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json @@ -6,59 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "101" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "101" - } + ], + "EIP158" : [ + { + "hash" : "0x1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x64", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -68,14 +96,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json index 108e4a851..3863020e1 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json @@ -6,65 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKeyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "storage" : { - "0x00" : "0x01" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "storage" : { - "0x00" : "0x01" - } - } + ], + "EIP158" : [ + { + "hash" : "0x35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { "0x00" : "0x01" } @@ -75,14 +97,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json index eb531560b..5618680a5 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json @@ -6,68 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x5758" + "post" : { + "EIP150" : [ + { + "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a4b8a7" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x5758" + ], + "Frontier" : [ + { + "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a4b8a7" + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ], + "Metropolis" : [ + { + "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -77,14 +89,14 @@ "0x1122334455667788991011121314151617181920" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json index cc5c096e6..7099077a2 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json @@ -6,59 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmptyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01" - } + ], + "EIP158" : [ + { + "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -68,14 +96,14 @@ "0x1122334455667788991011121314151617181920" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json index 31a36810f..41437717c 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json @@ -6,59 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "101" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "101" - } + ], + "EIP158" : [ + { + "hash" : "0x44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x64", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -68,14 +96,14 @@ "0x1122334455667788991011121314151617181920" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json index 05bc31fb6..85bc5d05d 100644 --- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json +++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json @@ -6,65 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "storage" : { - "0x00" : "0x01" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "storage" : { - "0x00" : "0x01" - } - } + ], + "EIP158" : [ + { + "hash" : "0x15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { "0x00" : "0x01" } @@ -75,14 +97,14 @@ "0x1122334455667788991011121314151617181920" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "1" + "0x01" ] } } |