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/stRevertTest | |
| 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/stRevertTest')
35 files changed, 6990 insertions, 2997 deletions
diff --git a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert.json b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert.json index b4062b85c..ff122f8ad 100644 --- a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert.json +++ b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert.json @@ -6,81 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevertFiller.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" : 0, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "storage" : { - } + "post" : { + "EIP150" : [ + { + "hash" : "0x81b5f1c57a1dcae800a1b87c67808809006e77f1b7645ba21eba71f5fc2a9852", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "999990000000" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x81b5f1c57a1dcae800a1b87c67808809006e77f1b7645ba21eba71f5fc2a9852", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b000000000000000000000000000000000000000" : { - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 0, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x69" - } + ], + "Frontier" : [ + { + "hash" : "0xd9c98049def493351df6808ceef42a14c3d4f3321c816d64bb57332e82426a0d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x69" - } - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0xd9c98049def493351df6808ceef42a14c3d4f3321c816d64bb57332e82426a0d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x81b5f1c57a1dcae800a1b87c67808809006e77f1b7645ba21eba71f5fc2a9852", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ [[0]] (+ (SLOAD 0) 1) (CALL (GAS) 0xb000000000000000000000000000000000000000 0 0 0 0 0) }", - "nonce" : "0", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6001600054016000556000600060006000600073b0000000000000000000000000000000000000005af1", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ [[0]] (+ (SLOAD 0) 1) (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0) }", - "nonce" : "", + "0xb000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6001600054016000556000600060006000600073a0000000000000000000000000000000000000005af1", + "nonce" : "0x00", "storage" : { } } @@ -90,14 +103,14 @@ "" ], "gasLimit" : [ - "10000000" + "0x989680" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json index de0f86809..e89bf1f30 100644 --- a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json +++ b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json @@ -6,43 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert2Filler.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0x03", - "nonce" : "0x01" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x43a070c3751b629ac30b1fda3954b5301b0c92a2173eb3dd71f9726fba3cd2b5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x216fd3110280abe8b81a5f5fde77efa3326f81dbb1edcd1334fccd093cdc935f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x2286ae15ac5ec3440acd73430954bf809f070b2c508ac564043adc7260be5e9f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x2286ae15ac5ec3440acd73430954bf809f070b2c508ac564043adc7260be5e9f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x216fd3110280abe8b81a5f5fde77efa3326f81dbb1edcd1334fccd093cdc935f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "10", - "code" : "{ (JUMPI 63 (EQ (SLOAD 0) 1023)) [[0]] (+ (SLOAD 0) 1) (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0) (JUMPI 83 (LT (SLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", - "nonce" : "0", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x0a", + "code" : "0x6103ff60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000000000000000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x13426172c74d822b878fe800000000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -54,12 +98,12 @@ "gasLimit" : [ "0x7ffffffffffffff0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json index f68fc9cd8..d0e95d8b0 100644 --- a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json +++ b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json @@ -6,47 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert3Filler.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0x01", - "nonce" : "0x02" + "post" : { + "EIP150" : [ + { + "hash" : "0xe31213d4682a6d7e8754702229f6aea87486ccbbdfa8da864726be4085bd904e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "cd6807039caffddbd1c28a749ec91bef15f448e5" : { - "balance" : "0x02", - "nonce" : "0x01" - } + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x2c776844bb275ce1d4e7e7c41ed0136ccb8af0dd37f903ce487769efd8a6f88a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x40b9433e63136b733583d1920393a816bf2dfe8a0fc383f2c92800ab4a27b6fc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x40b9433e63136b733583d1920393a816bf2dfe8a0fc383f2c92800ab4a27b6fc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x2c776844bb275ce1d4e7e7c41ed0136ccb8af0dd37f903ce487769efd8a6f88a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "10", - "code" : "{ (JUMPI 63 (EQ (SLOAD 0) 1022)) [[0]] (+ (SLOAD 0) 1) (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0) (JUMPI 83 (LT (SLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", - "nonce" : "0", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x0a", + "code" : "0x6103fe60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000000000000000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x13426172c74d822b878fe800000000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -58,12 +98,12 @@ "gasLimit" : [ "0x7ffffffffffffff0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/LoopCallsThenRevert.json b/GeneralStateTests/stRevertTest/LoopCallsThenRevert.json index 1a2e080eb..776c67976 100644 --- a/GeneralStateTests/stRevertTest/LoopCallsThenRevert.json +++ b/GeneralStateTests/stRevertTest/LoopCallsThenRevert.json @@ -6,103 +6,145 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/LoopCallsThenRevertFiller.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" : 0, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0x01422f9f38e9ac49e24d119a250f58979b44d1b2e99ef2f9032dc33dcf9c1df1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "ALL" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0" - } + { + "hash" : "0xda2f7fa251260ee3f45c72597ba85421a88492749f2c7e7276cbce63436b99be", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "850" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + ], + "EIP158" : [ + { + "hash" : "0x01422f9f38e9ac49e24d119a250f58979b44d1b2e99ef2f9032dc33dcf9c1df1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "850" - } + { + "hash" : "0xda2f7fa251260ee3f45c72597ba85421a88492749f2c7e7276cbce63436b99be", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0xd2cf7d4f9abde7c247783fbb366baa64189ec2d482de9638723a49059eb5e4aa", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Homestead", - "Frontier" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0" - } + { + "hash" : "0xd2cf7d4f9abde7c247783fbb366baa64189ec2d482de9638723a49059eb5e4aa", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "850" - } - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0xd2cf7d4f9abde7c247783fbb366baa64189ec2d482de9638723a49059eb5e4aa", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd2cf7d4f9abde7c247783fbb366baa64189ec2d482de9638723a49059eb5e4aa", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x01422f9f38e9ac49e24d119a250f58979b44d1b2e99ef2f9032dc33dcf9c1df1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xda2f7fa251260ee3f45c72597ba85421a88492749f2c7e7276cbce63436b99be", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ (JUMPDEST) [[0]] (- (SLOAD 0) 1) (CALL 50000 0xb000000000000000000000000000000000000000 0 0 0 0 0) (JUMPI 0 (SLOAD 0))}", - "nonce" : "0", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x5b6001600054036000556000600060006000600073b00000000000000000000000000000000000000061c350f150600054600057", + "nonce" : "0x00", "storage" : { - "0x00" : "850" + "0x00" : "0x0352" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ [[0]] (ADD 1 (SLOAD 0)) }", - "nonce" : "", + "0xb000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x600054600101600055", + "nonce" : "0x00", "storage" : { } } @@ -112,15 +154,15 @@ "" ], "gasLimit" : [ - "10000000", - "9000000" + "0x989680", + "0x895440" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert.json b/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert.json index 314d961f4..6c8d0e417 100644 --- a/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert.json +++ b/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert.json @@ -6,80 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/LoopDelegateCallsDepthThenRevertFiller.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" : [ - "Frontier", - "Homestead" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "storage" : { - } + "post" : { + "EIP150" : [ + { + "hash" : "0xb8e2ecbaeed90b5e892a2832cfc3231496ff86680f0fb898fcdf7ec894f92d45", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "999990000000" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xb8e2ecbaeed90b5e892a2832cfc3231496ff86680f0fb898fcdf7ec894f92d45", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b000000000000000000000000000000000000000" : { - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158", - "EIP150" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0xd2" - } + ], + "Frontier" : [ + { + "hash" : "0xf9d4a72012836575c25f1b5e8bd7b573ebf132caf6b10bd891636f80fc792117", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b000000000000000000000000000000000000000" : { - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0xf9d4a72012836575c25f1b5e8bd7b573ebf132caf6b10bd891636f80fc792117", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb8e2ecbaeed90b5e892a2832cfc3231496ff86680f0fb898fcdf7ec894f92d45", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ [[0]] (+ (SLOAD 0) 1) (DELEGATECALL (GAS) 0xb000000000000000000000000000000000000000 0 0 0 0) }", - "nonce" : "0", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x600160005401600055600060006000600073b0000000000000000000000000000000000000005af4", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ [[0]] (+ (SLOAD 0) 1) (DELEGATECALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0) }", - "nonce" : "", + "0xb000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x600160005401600055600060006000600073a0000000000000000000000000000000000000005af4", + "nonce" : "0x00", "storage" : { } } @@ -89,14 +103,14 @@ "" ], "gasLimit" : [ - "10000000" + "0x989680" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert.json b/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert.json index ae0c4ae11..96a57e056 100644 --- a/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert.json +++ b/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert.json @@ -6,47 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/NashatyrevSuicideRevertFiller.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" : [ - "ALL" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - } + "post" : { + "EIP150" : [ + { + "hash" : "0xdd821ab265cb0ac289d94a1c22540a9f1e1e96f59011a2e150618c38323a6c95", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0x01" - } + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xdd821ab265cb0ac289d94a1c22540a9f1e1e96f59011a2e150618c38323a6c95", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x0d347869d80f37b94370f30f18e3cb6e9521425c1587f150709ea7fdb889f6f1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x0d347869d80f37b94370f30f18e3cb6e9521425c1587f150709ea7fdb889f6f1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xdd821ab265cb0ac289d94a1c22540a9f1e1e96f59011a2e150618c38323a6c95", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "0", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x00", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680639c3674fc14610049578063c040622614610058575b610000565b3461000057610056610067565b005b3461000057610065610147565b005b600060405160a680610200833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff1660405180807f6628290000000000000000000000000000000000000000000000000000000000815250600301905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f19250505050610000565b50565b3073ffffffffffffffffffffffffffffffffffffffff1660405180807f6261642829000000000000000000000000000000000000000000000000000000815250600501905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b56006060604052346000575b608f806100176000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806326121ff014603c575b6000565b3460005760466048565b005b3373ffffffffffffffffffffffffffffffffffffffff16ff5b5600a165627a7a723058203d1a897befde21eff26abc325fb3da2f526bbc99de1c5c857d1835f673744ebd0029a165627a7a72305820850a52b31ec4745b7af15ba3bffdb1ba17f5d9a00a5f263ee287a92b568f534c0029", - "nonce" : "", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -56,14 +96,14 @@ "0xc0406226" ], "gasLimit" : [ - "500000" + "0x07a120" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertDepth2.json b/GeneralStateTests/stRevertTest/RevertDepth2.json index eb623f25f..b8f1f3021 100644 --- a/GeneralStateTests/stRevertTest/RevertDepth2.json +++ b/GeneralStateTests/stRevertTest/RevertDepth2.json @@ -6,88 +6,108 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertDepth2Filler.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" : [ - "ALL" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x00", - "0x01" : "0x00", - "0x02" : "0x00" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x00", - "0x01" : "0x00" - } + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x00" - } + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "d000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x00", - "0x01" : "0x00", - "0x02" : "0x00" - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 150000 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[2]] (CALL 150000 0xd000000000000000000000000000000000000000 0 0 0 0 0)}", - "nonce" : "0", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6000546001016000556000600060006000600073b000000000000000000000000000000000000000620249f0f16001556000600060006000600073d000000000000000000000000000000000000000620249f0f1600255", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0)}", - "nonce" : "", + "0xb000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f1600155", + "nonce" : "0x00", "storage" : { } }, - "c000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ [[0]] (ADD 1 (SLOAD 0)) }", - "nonce" : "0", + "0xc000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x600054600101600055", + "nonce" : "0x00", "storage" : { } }, - "d000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0) [[2]] (GAS)}", - "nonce" : "0", + "0xd000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f16001555a600255", + "nonce" : "0x00", "storage" : { } } @@ -97,14 +117,14 @@ "" ], "gasLimit" : [ - "170685" + "0x029abd" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json index 713c363c5..4dc6d4f53 100644 --- a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json +++ b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json @@ -6,217 +6,444 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.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" : [ - { - "comment" : "NO OOG", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 - }, - "network" : [ - "EIP158" - ], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x06", - "code" : "0x", - "nonce" : "1", - "storage" : { - "0x00" : "0x01", - "0x01" : "0x01", - "0x04" : "0x0c" - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x02" : "0x08", - "0x03" : "0x0c" - } - } - } - }, - { - "comment" : "NO OOG", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 - }, - "network" : [ - "EIP150" - ], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x06", - "code" : "0x", - "nonce" : "0", - "storage" : { - "0x00" : "0x01", - "0x01" : "0x01", - "0x04" : "0x0c" - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x02" : "0x08", - "0x03" : "0x0c" - } - } - } - }, - { - "comment" : "NO OOG", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", - "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455", - "nonce" : "54", - "storage" : { - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7560732379294ff6671be9416e3ef32c5bbea2785aee6eb590b4f0902565e9a1", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x202e9b30c59094b99dee8afcea83947ff626ee7a910486e25920f4fa7b2ecfb9", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9406f62f8076b4aeda0df90dda740f7baf01a974a60a0e2f4a1c6d3b82d2dad0", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x351e539bd904c6a9c1f78675c78b4263f58f6922dfc3c92cc05ee30ef36c5f6b", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "comment" : "OOG in subcall", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "network" : [ - "ALL" - ], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x06", - "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", - "nonce" : "54", - "storage" : { - "0x00" : "0x01", - "0x04" : "0x0c" - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - } - } + ], + "EIP158" : [ + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7560732379294ff6671be9416e3ef32c5bbea2785aee6eb590b4f0902565e9a1", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x202e9b30c59094b99dee8afcea83947ff626ee7a910486e25920f4fa7b2ecfb9", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x0c7b356c3b36ebac5243f47fccfe6f036e6fc039fdaa87696c897c42b79806f3", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x4e6ed5a94aa24414b64250913a2450a9fdcfd07a585fb83083e6215b898cd7b9", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "comment" : "OOG after subcall", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - }, - "network" : [ - "EIP158", - "EIP150" - ], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", - "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", - "nonce" : "54", - "storage" : { - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - } - } + ], + "Frontier" : [ + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xa4c92564fafcbf444c74b858c7dc9b9204c7a5337901022830016b213475e3a6", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb6ee3d1d29671d2cd93222c0f2019e49dad12aee70f3a3591be6f27e04052a2c", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "comment" : "OOG after subcall", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - }, - "network" : [ - "Homestead", - "Frontier" - ], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", - "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455", - "nonce" : "54", - "storage" : { - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - } - } + ], + "Homestead" : [ + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xa4c92564fafcbf444c74b858c7dc9b9204c7a5337901022830016b213475e3a6", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb6ee3d1d29671d2cd93222c0f2019e49dad12aee70f3a3591be6f27e04052a2c", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "comment" : "double OOG", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "network" : [ - "ALL" - ], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x05", - "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", - "nonce" : "54", - "storage" : { - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - } - } + ], + "Metropolis" : [ + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7560732379294ff6671be9416e3ef32c5bbea2785aee6eb590b4f0902565e9a1", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x202e9b30c59094b99dee8afcea83947ff626ee7a910486e25920f4fa7b2ecfb9", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "5", - "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", - "nonce" : "54", + "0x3e180b1862f9d158abb5e519a6d8605540c23682" : { + "balance" : "0x05", + "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455", + "nonce" : "0x36", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ [[2]] 8 (CREATE 0 0 0) [[3]] 12}", - "nonce" : "", + "0xb000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6008600255600060006000f050600c600355", + "nonce" : "0x00", "storage" : { } } @@ -227,16 +454,16 @@ "000000000000000000000000000000000000000000000000000000000001ea60" ], "gasLimit" : [ - "110000", - "160000" + "0x01adb0", + "0x027100" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "3e180b1862f9d158abb5e519a6d8605540c23682", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x3e180b1862f9d158abb5e519a6d8605540c23682", "value" : [ - "1", - "0" + "0x01", + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json b/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json index fe14c60a1..ff41e24bf 100644 --- a/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json +++ b/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json @@ -6,170 +6,444 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.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" : [ - { - "comment" : "NO OOG", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 - }, - "network" : [ - "EIP158" - ], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "nonce" : "1" - }, - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x01", - "0x04" : "0x0c" - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x02" : "0x08", - "0x03" : "0x0c" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x2792964862a467219a4d5e497f798176b09d8177f290c39eca662befff5f3a60", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x42ca5d93f92acb6a80eb20a11fa0528865c1ac9a9bf67c39a6191d060ca7ce4f", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e0fae46b35d00d90eb311a335fffbfb18b5bb6fb97d2e8fd81b20179745ce4e", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x24a0106e5d29661bd6c5adcac678ffe1715cbc1ef0a5b5db39a084695cc737be", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "comment" : "NO OOG", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 - }, - "network" : [ - "EIP150" - ], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "nonce" : "0" - }, - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x01", - "0x04" : "0x0c" - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x02" : "0x08", - "0x03" : "0x0c" - } - } + ], + "EIP158" : [ + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x2792964862a467219a4d5e497f798176b09d8177f290c39eca662befff5f3a60", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x42ca5d93f92acb6a80eb20a11fa0528865c1ac9a9bf67c39a6191d060ca7ce4f", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x327f51edf987241a0a59405a62804d1a574cc7f285a875e3fbd7cd01863b1e4b", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1a18a2344a9244b257d4d16e2e9abb6dcb53d17d5a4c5fbb240f1c6011f14b50", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "comment" : "NO OOG", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "shouldnotexist" : "1" - }, - "a000000000000000000000000000000000000000" : { - "storage" : { - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - } - } + ], + "Frontier" : [ + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd8e4aee5a220887aa9a11f33979816e6dfd43d8566f2ae977b49afa17042ac17", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x46c459fa446969520040529dc429163a5c4304c9c0b774fd1e178dbf1d27eb86", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "comment" : "OOG in subcall", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - }, - "network" : [ - "ALL" - ], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "shouldnotexist" : "1" - }, - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x04" : "0x0c" - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - } - } + ], + "Homestead" : [ + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd8e4aee5a220887aa9a11f33979816e6dfd43d8566f2ae977b49afa17042ac17", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x46c459fa446969520040529dc429163a5c4304c9c0b774fd1e178dbf1d27eb86", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "comment" : "OOG after subcall / double OOG", - "indexes" : { - "data" : [ - 1, - 0 - ], - "gas" : 0, - "value" : 0 - }, - "network" : [ - "ALL" - ], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "shouldnotexist" : "1" - }, - "a000000000000000000000000000000000000000" : { - "storage" : { - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - } - } + ], + "Metropolis" : [ + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x2792964862a467219a4d5e497f798176b09d8177f290c39eca662befff5f3a60", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x42ca5d93f92acb6a80eb20a11fa0528865c1ac9a9bf67c39a6191d060ca7ce4f", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x327f51edf987241a0a59405a62804d1a574cc7f285a875e3fbd7cd01863b1e4b", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1a18a2344a9244b257d4d16e2e9abb6dcb53d17d5a4c5fbb240f1c6011f14b50", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "5", - "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }", - "nonce" : "54", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x05", + "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455", + "nonce" : "0x36", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ [[2]] 8 (CREATE 0 0 0) [[3]] 12}", - "nonce" : "", + "0xb000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6008600255600060006000f050600c600355", + "nonce" : "0x00", "storage" : { } } @@ -180,16 +454,16 @@ "000000000000000000000000000000000000000000000000000000000001ea60" ], "gasLimit" : [ - "110000", - "160000" + "0x01adb0", + "0x027100" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "1", - "0" + "0x01", + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertOpcode.json b/GeneralStateTests/stRevertTest/RevertOpcode.json index 41c65d23b..34b69027d 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcode.json +++ b/GeneralStateTests/stRevertTest/RevertOpcode.json @@ -6,92 +6,237 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.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 + "post" : { + "EIP150" : [ + { + "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier", - "Homestead", - "EIP150", - "EIP158" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "0", - "storage" : { - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } + { + "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 0, - "value" : -1 + ], + "EIP158" : [ + { + "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "0", - "storage" : { - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "999999958985", - "nonce" : "1" - } + { + "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "0", - "storage" : { - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "999999970000", - "nonce" : "1" - } + { + "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x94cc837a7eecd810063cc425e84e9467e74134c9a516d4df91f71f201fe77676", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x94cc837a7eecd810063cc425e84e9467e74134c9a516d4df91f71f201fe77676", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "0", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x00", "code" : "0x600160005560016000fd6011600155", - "nonce" : "", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -101,16 +246,16 @@ "" ], "gasLimit" : [ - "800000", - "30000" + "0x0c3500", + "0x7530" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0", - "10" + "0x00", + "0x0a" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json b/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json index b22535462..a68e543c5 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json +++ b/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json @@ -6,301 +6,479 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.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" : 0, - "gas" : 0, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP150", - "EIP158" - ], - "result" : { - "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x0a" : "0x01" - } - }, - "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x02" : "0x0e" - } - }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } - } - }, - { - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP150", - "EIP158" - ], - "result" : { - "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } - } - }, - { - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x0a" : "0x01" - } - }, - "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0", - "storage" : { - "0x00" : "0x00", - "0x02" : "0x0e" - } - }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } - } - }, - { - "comment" : "OOG", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } - } - }, - { - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x0a" : "0x01" - } - }, - "b1005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0", - "storage" : { - "0x00" : "0x00", - "0x02" : "0x0e" - } - }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x710afb013436152320710b84da2b4546bf0aef1d68f634c478d4981d4105f255", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc879f36afaeace32cc8b9462dad38f688ec506a89884b21b6e60d8249b3ab136", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7b5aea4a6d7e6ac3b1a96651dc76c4171af4cb599bb4e8c242e18c83dd7533c8", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd5a14b2554f5d08626ce5cdfac36217426d292b62ff994e25fe89cf8d3c93743", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "b1005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } + ], + "EIP158" : [ + { + "hash" : "0x710afb013436152320710b84da2b4546bf0aef1d68f634c478d4981d4105f255", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc879f36afaeace32cc8b9462dad38f688ec506a89884b21b6e60d8249b3ab136", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7b5aea4a6d7e6ac3b1a96651dc76c4171af4cb599bb4e8c242e18c83dd7533c8", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd5a14b2554f5d08626ce5cdfac36217426d292b62ff994e25fe89cf8d3c93743", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 2, - "gas" : 0, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x0a" : "0x01" - } - }, - "b2005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0", - "storage" : { - "0x00" : "0x00", - "0x02" : "0x0e" - } - }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } + ], + "Frontier" : [ + { + "hash" : "0x917fea5fed77119230c4120bc4df0d7f1e038160c5c733cd1e779038b67e122a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb30ce1d2c038b2632e9bf010a78c665339513f1d2e762c6b9bb12a7494831ac2", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9eaa832bba7dc43eb5e2b097c9a33430d6957285873991c69847ced845ba4f26", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x249083970cef69bb1a73955e5f3faff87414f280b3010de5409c70aa2f35d8dc", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 2, - "gas" : 1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "b2005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } + ], + "Homestead" : [ + { + "hash" : "0x917fea5fed77119230c4120bc4df0d7f1e038160c5c733cd1e779038b67e122a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb30ce1d2c038b2632e9bf010a78c665339513f1d2e762c6b9bb12a7494831ac2", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9a43f317297c23f76ed28075273dd8667a5fd0f0bb5d45dca4c86c311706d26a", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x249083970cef69bb1a73955e5f3faff87414f280b3010de5409c70aa2f35d8dc", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 3, - "gas" : 0, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x0a" : "0x01" - } - }, - "b3005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0", - "storage" : { - "0x00" : "0x01", - "0x02" : "0x0e" - } - }, - "b3305374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0", - "storage" : { - "0x04" : "0x00", - "0x05" : "0x0e" - } - }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } + ], + "Metropolis" : [ + { + "hash" : "0x407fb3b03966b0d591a120f7b35135ddf221aadedee169c7d9d1a946e0354252", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x145fbde74591c64f02a4a791ccc1b96d60f031559605f8206bf0fe3c07de982d", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xfcf18c617e61b5a16e9b550620ce5926908bf0ee8d9e049f62ce9c924b88ae2c", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xbd8e9a2719f36730a9c3dcbcb952d55fca79fab9cd57231196647975467c471f", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[10]] (CALL 260000 (CALLDATALOAD 0) 0 0 0 0 0)}", - "nonce" : "0", + "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x600060006000600060006000356203f7a0f1600a55", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[0]] (CALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }", - "nonce" : "0", + "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255", + "nonce" : "0x00", "storage" : { } }, - "b1005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[0]] (CALLCODE 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }", - "nonce" : "0", + "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255", + "nonce" : "0x00", "storage" : { } }, - "b2005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[0]] (DELEGATECALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[2]] 14 }", - "nonce" : "0", + "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255", + "nonce" : "0x00", "storage" : { } }, - "b3005374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[0]] (CALL 100000 0xb3305374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }", - "nonce" : "0", + "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255", + "nonce" : "0x00", "storage" : { } }, - "b3305374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[4]] (CALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[5]] 14 }", - "nonce" : "0", + "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[1]] 12 (REVERT 0 1) [[3]] 13 }", - "nonce" : "0", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x600c60015560016000fd", + "nonce" : "0x00", "storage" : { } } @@ -313,15 +491,15 @@ "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b" ], "gasLimit" : [ - "460000", - "88000" + "0x0704e0", + "0x0157c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "094f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeCreate.json b/GeneralStateTests/stRevertTest/RevertOpcodeCreate.json index 6e646db12..d463857c5 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcodeCreate.json +++ b/GeneralStateTests/stRevertTest/RevertOpcodeCreate.json @@ -6,88 +6,137 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.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 + "post" : { + "EIP150" : [ + { + "hash" : "0x2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier", - "Homestead", - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0" + { + "hash" : "0xb72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 0, - "value" : -1 + ], + "EIP158" : [ + { + "hash" : "0x2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1", - "storage" : { - "0x00" : "0x0c", - "0x01" : "0x00" - } + { + "hash" : "0xb72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0x2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0" + { + "hash" : "0xb72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xeeac7cc67af32c9fc40749602cda167c54269830d2cb71fd3586e1ed4f458baa", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ (MSTORE 0 0x600160005560016000fd6011600155 ) [[1]](CREATE 1 17 15) [[0]] 12 }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x6e600160005560016000fd6011600155600052600f60116001f0600155600c600055", + "nonce" : "0x00", "storage" : { } } @@ -97,15 +146,15 @@ "0x600160005560016000fe6011600155" ], "gasLimit" : [ - "460000", - "70000" + "0x0704e0", + "0x011170" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json b/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json index 435b42ad7..23ffedca1 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json +++ b/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json @@ -6,105 +6,151 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.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 + "post" : { + "EIP150" : [ + { + "hash" : "0x4b5855c46e03a2b0f21f4e6e80b6a24551be97416f9eb725e191edb78fecc8b8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier", - "Homestead", - "EIP150", - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0" + { + "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 0, - "value" : -1 + ], + "EIP158" : [ + { + "hash" : "0x4b5855c46e03a2b0f21f4e6e80b6a24551be97416f9eb725e191edb78fecc8b8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0", - "storage" : { - "0x00" : "0x00", - "0x02" : "0x0e" - } + { + "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0x0c45c39cc33809ab7c3f91ebbe39b933e3968b9dbb885b3e60c6b743e536061b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } + { + "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x0c45c39cc33809ab7c3f91ebbe39b933e3968b9dbb885b3e60c6b743e536061b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb1da2f7f7736fefd7d61d0938e43457d2f48fd610a26a35bf94f5247aa672887", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[10]] (CALL 60000 (CALLDATALOAD 0) 0 0 0 0 0)}", - "nonce" : "0", + "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x6000600060006000600060003561ea60f1600a55", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[0]] (CALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1", - "code" : "{ [[1]] 12 (REVERT 0 1) [[3]] 13 }", - "nonce" : "0", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x01", + "code" : "0x600c60015560016000fd", + "nonce" : "0x00", "storage" : { } } @@ -114,15 +160,15 @@ "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b" ], "gasLimit" : [ - "460000", - "68000" + "0x0704e0", + "0x0109a0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeInCreateReturns.json b/GeneralStateTests/stRevertTest/RevertOpcodeInCreateReturns.json index f6ab6fcfd..c4cea39b9 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcodeInCreateReturns.json +++ b/GeneralStateTests/stRevertTest/RevertOpcodeInCreateReturns.json @@ -13,49 +13,72 @@ "currentTimestamp" : "0x03e8", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP150", - "EIP158" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "1" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x8fcc22c78f69ebea32ecc3a7de600adbb880b827e999cda3e48813df7e8c6452", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0x00" : "32" - } - } + ], + "EIP158" : [ + { + "hash" : "0x8fcc22c78f69ebea32ecc3a7de600adbb880b827e999cda3e48813df7e8c6452", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x8fcc22c78f69ebea32ecc3a7de600adbb880b827e999cda3e48813df7e8c6452", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x8fcc22c78f69ebea32ecc3a7de600adbb880b827e999cda3e48813df7e8c6452", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb64861edcf7d90039fa4a050b54bc953a2467a8035ea36706ad3b0d09560ae46", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0x00", - "code" : "{ (seq (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) )}", + "code" : "0x600c80601360003960006000f0503d600055006211223360005260206000fd", "nonce" : "0x00", "storage" : { "0x00" : "0x01" diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeInInit.json b/GeneralStateTests/stRevertTest/RevertOpcodeInInit.json index 04cf42137..1e45fec6f 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcodeInInit.json +++ b/GeneralStateTests/stRevertTest/RevertOpcodeInInit.json @@ -6,115 +6,230 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.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" : 0, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier", - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { - "shouldnotexist" : "1" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } + { + "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + ], + "EIP158" : [ + { + "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier" - ], - "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { - "shouldnotexist" : "1" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } + { + "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x191cd75344d7c8fac8c7356ea544a74818271d12aabe0f5a830c92ba3c2383c2", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { - "shouldnotexist" : "1" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0" - } + { + "hash" : "0x191cd75344d7c8fac8c7356ea544a74818271d12aabe0f5a830c92ba3c2383c2", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 0, - "value" : -1 + ], + "Homestead" : [ + { + "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { - "shouldnotexist" : "1" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } + { + "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + ], + "Metropolis" : [ + { + "hash" : "0x79be816b8d710425c26c8c1ee39110a77775145d625ba505cdaa08b02cc85aa9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x79be816b8d710425c26c8c1ee39110a77775145d625ba505cdaa08b02cc85aa9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { - "shouldnotexist" : "1" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0" - } + { + "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -124,16 +239,16 @@ "0x600160005560016000fd6011600155" ], "gasLimit" : [ - "160000", - "40000" + "0x027100", + "0x9c40" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0", - "10" + "0x00", + "0x0a" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json b/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json index 573bcac7b..acb62e22b 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json +++ b/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json @@ -6,413 +6,1686 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.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" : 0, - "gas" : 0, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP150", - "EIP158" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x04" : "0x0c", - "0x05" : "0x0c" - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0x01" - } - } - }, - { - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - "0x04" : "0x0c", - "0x05" : "0x0c", - "0x0a" : "0x00", - "0x0b" : "0x00", - "0x0c" : "0x00" - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0x01" - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - }, - "c000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - }, - "d000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - } - } - }, - { - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "a100000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - "0x04" : "0x0c", - "0x05" : "0x0c", - "0x0a" : "0x00", - "0x0b" : "0x00", - "0x0c" : "0x00" - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0x01" - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - }, - "c000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - }, - "d000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0xd8f4e54b56f537699870c958f97ff83480035abfbd13d3511d418baa5cae7c09", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb6cc57520d9770d30f2ae303a3011772a6a92d1746b1a4ef6f6894ddefb8b78b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 0, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 0, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x5d50590051ccaf4888d6aaea2e67c3c221418e6d63ac08ccaeb83f8972cef939", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x34b72637b56181f53edcff598845763a878c55eeb2366ba4d1e4f3e6244c9062", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8", + "indexes" : { + "data" : 1, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1", + "indexes" : { + "data" : 1, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 1, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 1, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc5a643f1bfb926531f64c8bacaed120944594d9d40bb9623bab4da7b3a223f12", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe5636003a6a46f677815d577aa34d0327e1ffb059035e6d7bd1c0cde96bbcc68", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8", + "indexes" : { + "data" : 2, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1", + "indexes" : { + "data" : 2, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 2, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 2, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1afdbdfbba02f176a74a058ce687039fc418c16426ee072cf820edaa1136a20a", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x4ad3d92aa98e194cb4b7bf8f889adc498f316c5a026fc36e4150b2cfa026a83c", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8", + "indexes" : { + "data" : 3, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1", + "indexes" : { + "data" : 3, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 3, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 3, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 2, - "gas" : 0, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "a200000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - "0x04" : "0x0c", - "0x05" : "0x0c", - "0x0a" : "0x00", - "0x0b" : "0x00", - "0x0c" : "0x00" - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0x01" - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - }, - "c000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - }, - "d000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - } + ], + "EIP158" : [ + { + "hash" : "0xd8f4e54b56f537699870c958f97ff83480035abfbd13d3511d418baa5cae7c09", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb6cc57520d9770d30f2ae303a3011772a6a92d1746b1a4ef6f6894ddefb8b78b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 0, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 0, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x5d50590051ccaf4888d6aaea2e67c3c221418e6d63ac08ccaeb83f8972cef939", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x34b72637b56181f53edcff598845763a878c55eeb2366ba4d1e4f3e6244c9062", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8", + "indexes" : { + "data" : 1, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1", + "indexes" : { + "data" : 1, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 1, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 1, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc5a643f1bfb926531f64c8bacaed120944594d9d40bb9623bab4da7b3a223f12", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe5636003a6a46f677815d577aa34d0327e1ffb059035e6d7bd1c0cde96bbcc68", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8", + "indexes" : { + "data" : 2, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1", + "indexes" : { + "data" : 2, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 2, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 2, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1afdbdfbba02f176a74a058ce687039fc418c16426ee072cf820edaa1136a20a", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x4ad3d92aa98e194cb4b7bf8f889adc498f316c5a026fc36e4150b2cfa026a83c", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8", + "indexes" : { + "data" : 3, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1", + "indexes" : { + "data" : 3, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 3, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 3, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 3, - "gas" : 0, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "a300000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - "0x04" : "0x0c", - "0x05" : "0x0c", - "0x0a" : "0x00", - "0x0b" : "0x00", - "0x0c" : "0x00" - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0x01" - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - }, - "c000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - }, - "d000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - } + ], + "Frontier" : [ + { + "hash" : "0x1e6f2866ebc2ec3bd095dd5d1e0a9003dff8c46d740422e032564e23800e401c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1092feb631e5d2b0bb2ca83f9f68b54c53717f8ceda091616c67aa01bf2f6715", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 0, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 0, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x69e43bbf019adedcae45878e4efb53768e49d66b68fa4ed04f0e1e4568ca41a7", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf6b3cbbd0610954032c6d46f6415ef5bff8742fbee55230fe12211ded4220c3d", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 1, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 1, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 1, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 1, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd82deee3a810865a30ee17dee27244ecc812f3270ae1eb67c40f7aaf80907622", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1a19c6ab26d1bc1fb3130c16132d82cc6bb770cc7e3f235be283a9c6a574d706", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 2, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 2, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 2, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 2, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd82deee3a810865a30ee17dee27244ecc812f3270ae1eb67c40f7aaf80907622", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1a19c6ab26d1bc1fb3130c16132d82cc6bb770cc7e3f235be283a9c6a574d706", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 3, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 3, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 3, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 3, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 0, - "gas" : [ - 2 - ], - "value" : [ - 1, - 0 - ] - }, - "network" : [ - "Metropolis" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - "0x04" : "0x0c", - "0x05" : "0x0c", - "0x0a" : "0x00", - "0x0b" : "0x00", - "0x0c" : "0x00" - } - }, - "a100000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - } - }, - "a200000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - } - }, - "a300000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0x01" - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - }, - "c000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - }, - "d000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - } + ], + "Homestead" : [ + { + "hash" : "0x1e6f2866ebc2ec3bd095dd5d1e0a9003dff8c46d740422e032564e23800e401c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1092feb631e5d2b0bb2ca83f9f68b54c53717f8ceda091616c67aa01bf2f6715", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 0, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 0, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x69e43bbf019adedcae45878e4efb53768e49d66b68fa4ed04f0e1e4568ca41a7", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf6b3cbbd0610954032c6d46f6415ef5bff8742fbee55230fe12211ded4220c3d", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 1, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 1, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 1, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 1, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf831c6b1f491ca064a59088ac753fe9b9f6376112b08acd3ee9d7b2dd56ba209", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x5f9dbebae5fe583e47a8e4a2212dca465e4679785618107655e492a9c38f8397", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 2, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 2, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 2, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 2, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x06d00ec0437967bfa535b2c7830db5a63042d73368beb07d68d2ed93bc769f03", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x697f6c1e9bc4bcb230fa4a941c977d44e74245e9af445c132d83d9cced610adb", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 3, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820", + "indexes" : { + "data" : 3, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 3, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73", + "indexes" : { + "data" : 3, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : [ - 1 - ], - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - "0x04" : "0x00", - "0x05" : "0x00", - "0x0a" : "0x00", - "0x0b" : "0x00", - "0x0c" : "0x00" - } - }, - "a100000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - } - }, - "a200000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - } - }, - "a300000000000000000000000000000000000000" : { - "nonce" : "0x00", - "storage" : { - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0x01" - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - }, - "c000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - }, - "d000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - } + ], + "Metropolis" : [ + { + "hash" : "0x349fa19f377350ecaea31dd8486a281546eb070214059f1551d24d4f9cdaa565", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x6117f1c9999903c9289b0c1415c895f0810166df78f60b6297ced2ea76e34651", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x349fa19f377350ecaea31dd8486a281546eb070214059f1551d24d4f9cdaa565", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x6117f1c9999903c9289b0c1415c895f0810166df78f60b6297ced2ea76e34651", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 0, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 0, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x43f18bb29c7d3a5ea26d340fc239438fb05b0644d49db8f1559bddd38ed86cfa", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x94d5c3ff4637fc5d129802b625852d64498497bc1b7ec55a8c16ea01af9f19ad", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x43f18bb29c7d3a5ea26d340fc239438fb05b0644d49db8f1559bddd38ed86cfa", + "indexes" : { + "data" : 1, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x94d5c3ff4637fc5d129802b625852d64498497bc1b7ec55a8c16ea01af9f19ad", + "indexes" : { + "data" : 1, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 1, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 1, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x86ac739c87c10de1e46ac532093e30be8639e0830d859f32b949b13a9e12dc2b", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb7ec28e0f6f769330401a3213ea9d2e5f6337fce4337ebbad1fd01f8946289c8", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x86ac739c87c10de1e46ac532093e30be8639e0830d859f32b949b13a9e12dc2b", + "indexes" : { + "data" : 2, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb7ec28e0f6f769330401a3213ea9d2e5f6337fce4337ebbad1fd01f8946289c8", + "indexes" : { + "data" : 2, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 2, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 2, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x4ff6ba73eb495fbfdf2a5fc9b13307e541cc9426af96827451cd6fa08528486e", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7395a1a844d205bf2bc5bf8ff97f597815ccc9f2092c69ef90253682a5b51847", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x4ff6ba73eb495fbfdf2a5fc9b13307e541cc9426af96827451cd6fa08528486e", + "indexes" : { + "data" : 3, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7395a1a844d205bf2bc5bf8ff97f597815ccc9f2092c69ef90253682a5b51847", + "indexes" : { + "data" : 3, + "gas" : 2, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7", + "indexes" : { + "data" : 3, + "gas" : 3, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07", + "indexes" : { + "data" : 3, + "gas" : 3, + "value" : 1 + }, + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ [[10]](CALL 50000 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[11]](CALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0) [[12]](CALL 50000 0xd000000000000000000000000000000000000000 0 0 0 0 0) [[4]]12 [[5]]12 }", - "nonce" : "", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555", + "nonce" : "0x00", "storage" : { } }, - "a100000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ [[10]](CALLCODE 50000 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[11]](CALLCODE 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0) [[12]](CALLCODE 50000 0xd000000000000000000000000000000000000000 0 0 0 0 0) [[4]]12 [[5]]12 }", - "nonce" : "", + "0xa100000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555", + "nonce" : "0x00", "storage" : { } }, - "a200000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ [[10]](DELEGATECALL 50000 0xb000000000000000000000000000000000000000 0 0 0 0) [[11]](DELEGATECALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0) [[12]](DELEGATECALL 50000 0xd000000000000000000000000000000000000000 0 0 0 0) [[4]]12 [[5]]12 }", - "nonce" : "", + "0xa200000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555", + "nonce" : "0x00", "storage" : { } }, - "a300000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ [[10]](CALL 50000 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[11]](DELEGATECALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0) [[12]](CALLCODE 50000 0xd000000000000000000000000000000000000000 0 0 0 0 0) [[4]]12 [[5]]12 }", - "nonce" : "", + "0xa300000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "ac00000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ (CALL 260000 (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) }", - "nonce" : "0", + "0xac00000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6000600060006000346000356203f7a0f1", + "nonce" : "0x00", "storage" : { } }, - "b000000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ [[1]] 12 (REVERT 0 1) }", - "nonce" : "", + "0xb000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x600c60015560016000fd", + "nonce" : "0x00", "storage" : { } }, - "c000000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ [[2]] 12 (REVERT 0 1) }", - "nonce" : "", + "0xc000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x600c60025560016000fd", + "nonce" : "0x00", "storage" : { } }, - "d000000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ [[3]] 12 (REVERT 0 1) }", - "nonce" : "", + "0xd000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x600c60035560016000fd", + "nonce" : "0x00", "storage" : { } } @@ -425,18 +1698,18 @@ "000000000000000000000000a300000000000000000000000000000000000000" ], "gasLimit" : [ - "800000", - "140000", - "160000", - "50000" + "0x0c3500", + "0x0222e0", + "0x027100", + "0xc350" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "ac00000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xac00000000000000000000000000000000000000", "value" : [ - "0", - "10" + "0x00", + "0x0a" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeReturn.json b/GeneralStateTests/stRevertTest/RevertOpcodeReturn.json index 501c99865..29e31cffa 100644 --- a/GeneralStateTests/stRevertTest/RevertOpcodeReturn.json +++ b/GeneralStateTests/stRevertTest/RevertOpcodeReturn.json @@ -6,148 +6,679 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeReturnFiller.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" : [ - "Frontier", - "Homestead", - "EIP150", - "EIP158" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "0", - "storage" : { - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 4, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 4, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 5, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 5, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x726576657274206d657373616765" - } - }, - "a100000000000000000000000000000000000000" : { - "storage" : { - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } + ], + "EIP158" : [ + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 4, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 4, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 5, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 5, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : [ - 1, - 2, - 3, - 4, - 5 - ], - "gas" : 0, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00" - } - }, - "a100000000000000000000000000000000000000" : { - "storage" : { - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } + ], + "Frontier" : [ + { + "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd", + "indexes" : { + "data" : 4, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 4, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd", + "indexes" : { + "data" : 5, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 5, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd", + "indexes" : { + "data" : 4, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 4, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd", + "indexes" : { + "data" : 5, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 5, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x60b9ed910a10118d39799374bf0defc97313bbbc449a621cbf7eb3d4d68ad450", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x60b9ed910a10118d39799374bf0defc97313bbbc449a621cbf7eb3d4d68ad450", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4", + "indexes" : { + "data" : 1, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc", + "indexes" : { + "data" : 2, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4", + "indexes" : { + "data" : 3, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4", + "indexes" : { + "data" : 4, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4", + "indexes" : { + "data" : 4, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4", + "indexes" : { + "data" : 5, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4", + "indexes" : { + "data" : 5, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ [[1]](CALL 150000 (CALLDATALOAD 0) 0 0 0 0 32) [[2]] (MLOAD 0) }", - "nonce" : "", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x60206000600060006000600035620249f0f1600155600051600255", + "nonce" : "0x00", "storage" : { } }, - "a100000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ (SSTORE 0 0x72657665727465642064617461) (MSTORE 0 0x726576657274206d657373616765) (REVERT 0 32) }", - "nonce" : "0", + "0xa100000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd", + "nonce" : "0x00", "storage" : { } }, - "a200000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ (SSTORE 0 0x72657665727465642064617461) (MSTORE 0 0x726576657274206d657373616765) (REVERT 0 0) }", - "nonce" : "0", + "0xa200000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd", + "nonce" : "0x00", "storage" : { } }, - "a300000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ (SSTORE 0 0x72657665727465642064617461) (MSTORE 0 0x726576657274206d657373616765) (REVERT 0 0xfffffffffffffffffffffffffffff) }", - "nonce" : "0", + "0xa300000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd", + "nonce" : "0x00", "storage" : { } }, - "a400000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ (SSTORE 0 0x72657665727465642064617461) (MSTORE 0 0x726576657274206d657373616765) (REVERT 0x0100 0x00) }", - "nonce" : "0", + "0xa400000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd", + "nonce" : "0x00", "storage" : { } }, - "a500000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ (SSTORE 0 0x72657665727465642064617461) (MSTORE 0 0x726576657274206d657373616765) (REVERT 0x01 0x00) }", - "nonce" : "0", + "0xa500000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd", + "nonce" : "0x00", "storage" : { } }, - "a600000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ (SSTORE 0 0x72657665727465642064617461) (MSTORE 0 0x726576657274206d657373616765) (REVERT 0xfffffffffffffffffffffffffffff 0x00) }", - "nonce" : "0", + "0xa600000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -162,15 +693,15 @@ "000000000000000000000000a600000000000000000000000000000000000000" ], "gasLimit" : [ - "800000", - "70000" + "0x0c3500", + "0x011170" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertPrecompiledTouch.json b/GeneralStateTests/stRevertTest/RevertPrecompiledTouch.json index abdfb0ce5..3a11afd23 100644 --- a/GeneralStateTests/stRevertTest/RevertPrecompiledTouch.json +++ b/GeneralStateTests/stRevertTest/RevertPrecompiledTouch.json @@ -6,119 +6,143 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrecompiledTouchFiller.json" }, "env" : { - "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", + "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", "currentDifficulty" : "0x020000", - "currentGasLimit" : "4012015", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x3d37ef", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "0000000000000000000000000000000000000001" : { - "balance" : "0" + "post" : { + "EIP150" : [ + { + "hash" : "0x424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000002" : { - "balance" : "0" - }, - "0000000000000000000000000000000000000003" : { - "balance" : "0" - }, - "0000000000000000000000000000000000000004" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000005" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000006" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000007" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000008" : { - "balance" : "0" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "0000000000000000000000000000000000000001" : { - "balance" : "0", + "0x0000000000000000000000000000000000000001" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000002" : { - "balance" : "0", + "0x0000000000000000000000000000000000000002" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000003" : { - "balance" : "0", + "0x0000000000000000000000000000000000000003" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000004" : { - "balance" : "0", + "0x0000000000000000000000000000000000000004" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000005" : { - "balance" : "0", + "0x0000000000000000000000000000000000000005" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000006" : { - "balance" : "0", + "0x0000000000000000000000000000000000000006" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000007" : { - "balance" : "0", + "0x0000000000000000000000000000000000000007" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000008" : { - "balance" : "0", + "0x0000000000000000000000000000000000000008" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "1", + "nonce" : "0x01", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ (CALL 50000 1 0 0 0 0 0) (CALL 50000 2 0 0 0 0 0) (CALL 50000 3 0 0 0 0 0) (CALL 50000 4 0 0 0 0 0) (CALL 50000 5 0 0 0 0 0) (CALL 50000 6 0 0 0 0 0) (CALL 50000 7 0 0 0 0 0) (CALL 50000 8 0 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x60006000600060006000600161c350f15060006000600060006000600261c350f15060006000600060006000600361c350f15060006000600060006000600461c350f15060006000600060006000600561c350f15060006000600060006000600661c350f15060006000600060006000600761c350f15060006000600060006000600861c350f1505a6001555a6002555a600355", + "nonce" : "0x00", "storage" : { } } @@ -128,14 +152,14 @@ "" ], "gasLimit" : [ - "60000" + "0xea60" ], - "gasPrice" : "1", - "nonce" : "1", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x01", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json b/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json index b801cecca..76c72710d 100644 --- a/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json +++ b/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json @@ -6,119 +6,143 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrecompiledTouchCCFiller.json" }, "env" : { - "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", + "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", "currentDifficulty" : "0x020000", - "currentGasLimit" : "4012015", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x3d37ef", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "0000000000000000000000000000000000000001" : { - "balance" : "0" + "post" : { + "EIP150" : [ + { + "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000002" : { - "balance" : "0" - }, - "0000000000000000000000000000000000000003" : { - "balance" : "0" - }, - "0000000000000000000000000000000000000004" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000005" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000006" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000007" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000008" : { - "balance" : "0" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "0000000000000000000000000000000000000001" : { - "balance" : "0", + "0x0000000000000000000000000000000000000001" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000002" : { - "balance" : "0", + "0x0000000000000000000000000000000000000002" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000003" : { - "balance" : "0", + "0x0000000000000000000000000000000000000003" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000004" : { - "balance" : "0", + "0x0000000000000000000000000000000000000004" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000005" : { - "balance" : "0", + "0x0000000000000000000000000000000000000005" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000006" : { - "balance" : "0", + "0x0000000000000000000000000000000000000006" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000007" : { - "balance" : "0", + "0x0000000000000000000000000000000000000007" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000008" : { - "balance" : "0", + "0x0000000000000000000000000000000000000008" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "1", + "nonce" : "0x01", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ (CALLCODE 50000 1 0 0 0 0 0) (CALLCODE 50000 2 0 0 0 0 0) (CALLCODE 50000 3 0 0 0 0 0) (CALLCODE 50000 4 0 0 0 0 0) (CALLCODE 50000 5 0 0 0 0 0) (CALLCODE 50000 6 0 0 0 0 0) (CALLCODE 50000 7 0 0 0 0 0) (CALLCODE 50000 8 0 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x60006000600060006000600161c350f25060006000600060006000600261c350f25060006000600060006000600361c350f25060006000600060006000600461c350f25060006000600060006000600561c350f25060006000600060006000600661c350f25060006000600060006000600761c350f25060006000600060006000600861c350f2505a6001555a6002555a600355", + "nonce" : "0x00", "storage" : { } } @@ -128,14 +152,14 @@ "" ], "gasLimit" : [ - "60000" + "0xea60" ], - "gasPrice" : "1", - "nonce" : "1", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x01", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertPrecompiledTouchDC.json b/GeneralStateTests/stRevertTest/RevertPrecompiledTouchDC.json index 736f6cd04..20baf06b7 100644 --- a/GeneralStateTests/stRevertTest/RevertPrecompiledTouchDC.json +++ b/GeneralStateTests/stRevertTest/RevertPrecompiledTouchDC.json @@ -6,119 +6,143 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrecompiledTouchDCFiller.json" }, "env" : { - "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", + "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da", "currentDifficulty" : "0x020000", - "currentGasLimit" : "4012015", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x3d37ef", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "0000000000000000000000000000000000000001" : { - "balance" : "0" + "post" : { + "EIP150" : [ + { + "hash" : "0xf6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000002" : { - "balance" : "0" - }, - "0000000000000000000000000000000000000003" : { - "balance" : "0" - }, - "0000000000000000000000000000000000000004" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xf6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000005" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xf6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000006" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xf6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000007" : { - "balance" : "0" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xf6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0000000000000000000000000000000000000008" : { - "balance" : "0" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "0000000000000000000000000000000000000001" : { - "balance" : "0", + "0x0000000000000000000000000000000000000001" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000002" : { - "balance" : "0", + "0x0000000000000000000000000000000000000002" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000003" : { - "balance" : "0", + "0x0000000000000000000000000000000000000003" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000004" : { - "balance" : "0", + "0x0000000000000000000000000000000000000004" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000005" : { - "balance" : "0", + "0x0000000000000000000000000000000000000005" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000006" : { - "balance" : "0", + "0x0000000000000000000000000000000000000006" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000007" : { - "balance" : "0", + "0x0000000000000000000000000000000000000007" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "0000000000000000000000000000000000000008" : { - "balance" : "0", + "0x0000000000000000000000000000000000000008" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "1", + "nonce" : "0x01", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ (DELEGATECALL 50000 1 0 0 0 0) (DELEGATECALL 50000 2 0 0 0 0) (DELEGATECALL 50000 3 0 0 0 0) (DELEGATECALL 50000 4 0 0 0 0) (DELEGATECALL 50000 5 0 0 0 0) (DELEGATECALL 50000 6 0 0 0 0) (DELEGATECALL 50000 7 0 0 0 0) (DELEGATECALL 50000 8 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x6000600060006000600161c350f4506000600060006000600261c350f4506000600060006000600361c350f4506000600060006000600461c350f4506000600060006000600561c350f4506000600060006000600661c350f4506000600060006000600761c350f4506000600060006000600861c350f4505a6001555a6002555a600355", + "nonce" : "0x00", "storage" : { } } @@ -128,14 +152,14 @@ "" ], "gasLimit" : [ - "60000" + "0xea60" ], - "gasPrice" : "1", - "nonce" : "1", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x01", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertPrefound.json b/GeneralStateTests/stRevertTest/RevertPrefound.json index f4afd0ffd..79a8235c5 100644 --- a/GeneralStateTests/stRevertTest/RevertPrefound.json +++ b/GeneralStateTests/stRevertTest/RevertPrefound.json @@ -6,92 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundFiller.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" : [ - "Frontier", - "Homestead" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "1", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x13e72a366d61652d0793db7748e4403bb523238d390736520834918f4483b030", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "1", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + ], + "EIP158" : [ + { + "hash" : "0xbf9cac93b8f08ed994e2f738612995f8a41f412f1e6756a956e29053646ac96c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "1", - "code" : "", - "nonce" : "1", - "storage" : { - } - } + ], + "Frontier" : [ + { + "hash" : "0x13e72a366d61652d0793db7748e4403bb523238d390736520834918f4483b030", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x13e72a366d61652d0793db7748e4403bb523238d390736520834918f4483b030", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xbf9cac93b8f08ed994e2f738612995f8a41f412f1e6756a956e29053646ac96c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "1", + "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { + "balance" : "0x01", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "code" : "{ [[0]] (CREATE 0 0 32) [[1]]12 }", - "nonce" : "", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x01", + "code" : "0x602060006000f0600055600c600155", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -101,14 +103,14 @@ "" ], "gasLimit" : [ - "94000" + "0x016f30" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundCall.json b/GeneralStateTests/stRevertTest/RevertPrefoundCall.json index 197374c12..b8b245872 100644 --- a/GeneralStateTests/stRevertTest/RevertPrefoundCall.json +++ b/GeneralStateTests/stRevertTest/RevertPrefoundCall.json @@ -6,92 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundCallFiller.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" : [ - "Frontier", - "Homestead" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "1", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0xed72adb985f07be27c7fa0aed129485c9fe288082184d69560967cfca89dccba", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "1", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + ], + "EIP158" : [ + { + "hash" : "0xed72adb985f07be27c7fa0aed129485c9fe288082184d69560967cfca89dccba", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "1", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + ], + "Frontier" : [ + { + "hash" : "0xe06a0eec31a3a3ef18732bc4f5ec10475e4791591728e3222ead654c3990343e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0xe06a0eec31a3a3ef18732bc4f5ec10475e4791591728e3222ead654c3990343e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xed72adb985f07be27c7fa0aed129485c9fe288082184d69560967cfca89dccba", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "1", + "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { + "balance" : "0x01", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "code" : "{ [[0]] (CALL 50000 0x7db299e0885c85039f56fa504a13dd8ce8a56aa7 0 0 32 0 32) [[1]]12 }", - "nonce" : "", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x01", + "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -101,14 +103,14 @@ "" ], "gasLimit" : [ - "94000" + "0x016f30" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG.json b/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG.json index 44fa982c9..0ab75316e 100644 --- a/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG.json +++ b/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG.json @@ -6,53 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundCallOOGFiller.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" : [ - "ALL" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "1", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0xd929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xd929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xd929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xd929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xd929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "1", + "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { + "balance" : "0x01", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "code" : "{ [[0]] (CALL 50000 0x7db299e0885c85039f56fa504a13dd8ce8a56aa7 0 0 32 0 32) [[1]]12 [[2]]12 }", - "nonce" : "", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x01", + "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155600c600255", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -62,14 +103,14 @@ "" ], "gasLimit" : [ - "63000" + "0xf618" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundEmpty.json b/GeneralStateTests/stRevertTest/RevertPrefoundEmpty.json index 94846430c..916e80949 100644 --- a/GeneralStateTests/stRevertTest/RevertPrefoundEmpty.json +++ b/GeneralStateTests/stRevertTest/RevertPrefoundEmpty.json @@ -6,92 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyFiller.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" : [ - "Frontier", - "Homestead" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x7928c8f99a40ee4e90832070c4cb9c8ed2450c32dfe63a4c441fa6b2183e3946", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + ], + "EIP158" : [ + { + "hash" : "0xc2ea011c70b9915217b5443a28ce2e2831ae80d401946d58b5b6cb98c14a5786", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0", - "code" : "", - "nonce" : "1", - "storage" : { - } - } + ], + "Frontier" : [ + { + "hash" : "0x7928c8f99a40ee4e90832070c4cb9c8ed2450c32dfe63a4c441fa6b2183e3946", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x7928c8f99a40ee4e90832070c4cb9c8ed2450c32dfe63a4c441fa6b2183e3946", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xc2ea011c70b9915217b5443a28ce2e2831ae80d401946d58b5b6cb98c14a5786", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0", + "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "code" : "{ [[0]] (CREATE 0 0 32) [[1]]12 }", - "nonce" : "", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x01", + "code" : "0x602060006000f0600055600c600155", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -101,14 +103,14 @@ "" ], "gasLimit" : [ - "94000" + "0x016f30" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall.json b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall.json index 76c731322..36aa4f1d5 100644 --- a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall.json +++ b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall.json @@ -6,88 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyCallFiller.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" : [ - "Frontier", - "Homestead" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x7ded03faa6a98d0e873172b3b0a346b6651730a957883ffd4e38cbc0c2cc7923", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + ], + "EIP158" : [ + { + "hash" : "0x197c27f55074d15725bf77c4d8e87efdd1229bb3857541ee86009870d453d0e2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "shouldnotexist" : "1" - } + ], + "Frontier" : [ + { + "hash" : "0xa6e1a58acac8171e0e4afe14904ada48877349bb40aa35a05593563e957713cc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0xa6e1a58acac8171e0e4afe14904ada48877349bb40aa35a05593563e957713cc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x197c27f55074d15725bf77c4d8e87efdd1229bb3857541ee86009870d453d0e2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0", + "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "code" : "{ [[0]] (CALL 50000 0x7db299e0885c85039f56fa504a13dd8ce8a56aa7 0 0 32 0 32) [[1]]12 }", - "nonce" : "", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x01", + "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -97,14 +103,14 @@ "" ], "gasLimit" : [ - "94000" + "0x016f30" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG.json b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG.json index 5f63adcbe..fb379138a 100644 --- a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG.json +++ b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG.json @@ -6,53 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyCallOOGFiller.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" : [ - "ALL" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0xb14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xb14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xb14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xb14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0", + "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "code" : "{ [[0]] (CALL 50000 0x7db299e0885c85039f56fa504a13dd8ce8a56aa7 0 0 32 0 32) [[1]]12 [[2]]12 }", - "nonce" : "", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x01", + "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155600c600255", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -62,14 +103,14 @@ "" ], "gasLimit" : [ - "63000" + "0xf618" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG.json b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG.json index 02968019f..46f5a4c7d 100644 --- a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG.json +++ b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG.json @@ -6,53 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundEmptyOOGFiller.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" : [ - "ALL" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "0", + "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "code" : "{ [[0]] (CREATE 0 0 32) [[1]]12 }", - "nonce" : "", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x01", + "code" : "0x602060006000f0600055600c600155", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -62,14 +103,14 @@ "" ], "gasLimit" : [ - "93000" + "0x016b48" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundOOG.json b/GeneralStateTests/stRevertTest/RevertPrefoundOOG.json index 79e6dd766..0732af293 100644 --- a/GeneralStateTests/stRevertTest/RevertPrefoundOOG.json +++ b/GeneralStateTests/stRevertTest/RevertPrefoundOOG.json @@ -6,53 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertPrefoundOOGFiller.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" : [ - "ALL" - ], - "result" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "1", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0xd059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xd059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xd059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xd059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xd059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { - "balance" : "1", + "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : { + "balance" : "0x01", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "code" : "{ [[0]] (CREATE 0 0 32) [[1]]12 }", - "nonce" : "", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x01", + "code" : "0x602060006000f0600055600c600155", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -62,14 +103,14 @@ "" ], "gasLimit" : [ - "93000" + "0x016b48" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json index 621995984..4acbcc357 100644 --- a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json +++ b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json @@ -6,84 +6,187 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.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" : 0, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0x04068d2d81730e74a66ab864af1073c8b7ade7c47680d10d782638320f776c20", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "nonce" : "1", - "storage" : { - "0x01" : "0x0d" - } - } + { + "hash" : "0x0df4cf0474e559e763dd66ca1f543974ae6c675ddf2c7c1deb88274ce226819a", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 2, - "value" : -1 + ], + "EIP158" : [ + { + "hash" : "0x04068d2d81730e74a66ab864af1073c8b7ade7c47680d10d782638320f776c20", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "ALL" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "nonce" : "0", - "storage" : { - } - } + { + "hash" : "0x991a17af593912ef7be7d526b56e4605271135c8e3f9ab16260ecc53179727ab", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0xeb8017c3cc4624d2be7c5c746a416e1ba33c6cdaf57bac91e9a3c368e16e8fd1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1d76ca685425229b1bcc27120c269e0134b87b646ba36735ea9e15b8a604a438", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "ALL" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "nonce" : "1", - "storage" : { - "0x00" : "0x0c", - "0x01" : "0x0d" - } - } + { + "hash" : "0x55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0xeb8017c3cc4624d2be7c5c746a416e1ba33c6cdaf57bac91e9a3c368e16e8fd1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1d76ca685425229b1bcc27120c269e0134b87b646ba36735ea9e15b8a604a438", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x04068d2d81730e74a66ab864af1073c8b7ade7c47680d10d782638320f776c20", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x991a17af593912ef7be7d526b56e4605271135c8e3f9ab16260ecc53179727ab", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x01", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f80610163833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029a165627a7a72305820f8ff2f7feef24d01a1cc070e67db9e15ac34810c8e5d1c7f34f3c38148eeae900029", - "nonce" : "", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -93,16 +196,16 @@ "0xc0406226" ], "gasLimit" : [ - "148000", - "181000", - "145000" + "0x024220", + "0x02c308", + "0x023668" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json index ca7fb91f3..a91ccb5a2 100644 --- a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json +++ b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json @@ -6,85 +6,187 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.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" : 0, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0xd2c01284b0648a4b5dc0fda0cb1cf0278549930aef7a3d6f2f7060eb12fb13cf", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "nonce" : "1", - "storage" : { - "0x00" : "0x0d", - "0x01" : "0x0e" - } - } + { + "hash" : "0xd2c01284b0648a4b5dc0fda0cb1cf0278549930aef7a3d6f2f7060eb12fb13cf", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 2, - "value" : -1 + ], + "EIP158" : [ + { + "hash" : "0x74724ec28c6efcabe715b59397c0141bd023d845cefdeb7bd69e7967827c9e3e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "ALL" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "nonce" : "0", - "storage" : { - } - } + { + "hash" : "0x74724ec28c6efcabe715b59397c0141bd023d845cefdeb7bd69e7967827c9e3e", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0xb3567d3bcac54b002ffec737200094bbbb870b506fa1c2470f35aa40ab04d2ea", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb3567d3bcac54b002ffec737200094bbbb870b506fa1c2470f35aa40ab04d2ea", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "ALL" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "nonce" : "1", - "storage" : { - "0x00" : "0x0d", - "0x01" : "0x0e" - } - } + { + "hash" : "0xc06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0xb3567d3bcac54b002ffec737200094bbbb870b506fa1c2470f35aa40ab04d2ea", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb3567d3bcac54b002ffec737200094bbbb870b506fa1c2470f35aa40ab04d2ea", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x74724ec28c6efcabe715b59397c0141bd023d845cefdeb7bd69e7967827c9e3e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x74724ec28c6efcabe715b59397c0141bd023d845cefdeb7bd69e7967827c9e3e", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216", + "indexes" : { + "data" : 0, + "gas" : 2, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x01", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f8061016b833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600081905550600e600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029a165627a7a72305820b3260ed34e660b9533216c5881783a6cc70a072f3dc8d26e835c4d14c3c2a7890029", - "nonce" : "", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -94,16 +196,16 @@ "0xc0406226" ], "gasLimit" : [ - "170000", - "181000", - "145000" + "0x029810", + "0x02c308", + "0x023668" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json index 0ae384067..e7413d74f 100644 --- a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json +++ b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json @@ -6,66 +6,237 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.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" : 0, - "value" : 0 + "post" : { + "EIP150" : [ + { + "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "ALL" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "nonce" : "0", - "storage" : { - } - } + { + "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : 0 + ], + "EIP158" : [ + { + "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "ALL" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "nonce" : "0", - "storage" : { - "0x00" : "0x0c", - "0x01" : "0x0d", - "0x02" : "0x0e" - } - } + { + "hash" : "0xd32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x01", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029", - "nonce" : "", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -75,16 +246,16 @@ "0xc0406226" ], "gasLimit" : [ - "81000", - "181000" + "0x013c68", + "0x02c308" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0", - "1" + "0x00", + "0x01" ] } } diff --git a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json index 6a47de4b2..b33628708 100644 --- a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json +++ b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json @@ -6,65 +6,237 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.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" : 0, - "value" : 0 + "post" : { + "EIP150" : [ + { + "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "ALL" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "nonce" : "0", - "storage" : { - } - } + { + "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : 0 + ], + "EIP158" : [ + { + "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "ALL" - ], - "result" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", - "nonce" : "0", - "storage" : { - "0x00" : "0x0d", - "0x01" : "0x0e" - } - } + { + "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 1 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a000000000000000000000000000000000000000" : { - "balance" : "1", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x01", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029", - "nonce" : "", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -74,16 +246,16 @@ "0xc0406226" ], "gasLimit" : [ - "66500", - "181000" + "0x0103c4", + "0x02c308" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0", - "1" + "0x00", + "0x01" ] } } diff --git a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert.json b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert.json index b6219e7e9..e66ce8177 100644 --- a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert.json +++ b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert.json @@ -6,60 +6,101 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevertFiller.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" : [ - "ALL" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "1000000000000000000000000000000000000000" : { - "balance" : "", + "0x1000000000000000000000000000000000000000" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[0]](CALL 30000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 1 }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556001600255", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[1]](CALL 30000 0x1000000000000000000000000000000000000000 0 0 0 0 0) }", - "nonce" : "0", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f1600155", + "nonce" : "0x00", "storage" : { } } @@ -69,14 +110,14 @@ "" ], "gasLimit" : [ - "70000" + "0x011170" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2.json b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2.json index 0249aed49..4d6796bff 100644 --- a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2.json +++ b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2.json @@ -6,60 +6,101 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert2Filler.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" : [ - "ALL" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x271c21195e9e41c52003339d0957473d172f67c4bb780a308e2ac800a0a50b24", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x271c21195e9e41c52003339d0957473d172f67c4bb780a308e2ac800a0a50b24", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xab0c055cc7ace4fbd1d251cabdafa7bca86064b231087adec534c90d6185eab2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xab0c055cc7ace4fbd1d251cabdafa7bca86064b231087adec534c90d6185eab2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x271c21195e9e41c52003339d0957473d172f67c4bb780a308e2ac800a0a50b24", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "1000000000000000000000000000000000000000" : { - "balance" : "", + "0x1000000000000000000000000000000000000000" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[2]](CALL 30000 0x1000000000000000000000000000000000000000 0 0 0 0 0) [[3]] 1 }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f16002556001600355", + "nonce" : "0x00", "storage" : { } }, - "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[0]](CALL 30000 0x1000000000000000000000000000000000000000 0 0 0 0 0) [[1]](CALL 30000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) }", - "nonce" : "0", + "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155", + "nonce" : "0x00", "storage" : { } } @@ -69,14 +110,14 @@ "" ], "gasLimit" : [ - "77400" + "0x012e58" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json index 8d55eb90a..b7ff409e0 100644 --- a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json +++ b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json @@ -6,74 +6,115 @@ "source" : "/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.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" : [ - "ALL" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x408c421965df91a5ab9a8103c92e4497d11740e218ce569e47dd39b0ca924e2f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x408c421965df91a5ab9a8103c92e4497d11740e218ce569e47dd39b0ca924e2f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xd53b7d6e4469317d1c11a5e26fce847c3b7c6f1acd59778db3528aa7e80dabaa", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xd53b7d6e4469317d1c11a5e26fce847c3b7c6f1acd59778db3528aa7e80dabaa", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x408c421965df91a5ab9a8103c92e4497d11740e218ce569e47dd39b0ca924e2f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "1000000000000000000000000000000000000000" : { - "balance" : "", + "0x1000000000000000000000000000000000000000" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[2]](CALL 30000 0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[3]] 1 }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x6000600060006000600073e94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16002556001600355", + "nonce" : "0x00", "storage" : { } }, - "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[0]](CALL 30000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[1]](CALL 30000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) }", - "nonce" : "0", + "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155", + "nonce" : "0x00", "storage" : { } }, - "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", - "nonce" : "0", + "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x731000000000000000000000000000000000000000ff", + "nonce" : "0x00", "storage" : { } }, - "e94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", - "nonce" : "0", + "0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x731000000000000000000000000000000000000000ff", + "nonce" : "0x00", "storage" : { } } @@ -83,14 +124,14 @@ "" ], "gasLimit" : [ - "82400" + "0x0141e0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } |