diff options
| author | Dimitry <winsvega@mail.ru> | 2017-08-01 14:11:00 +0800 |
|---|---|---|
| committer | Dimitry <winsvega@mail.ru> | 2017-08-01 14:11:00 +0800 |
| commit | f71c2688e1a839f8429f7e94ec5e56bb182d82cf (patch) | |
| tree | e9ad8d0e49e5717880a5bef10c332711d047f5b3 /GeneralStateTests/stCallCreateCallCodeTest | |
| parent | 092c0560e8084a05516430b8ed3a735290c969e1 (diff) | |
| download | dexon-tests-f71c2688e1a839f8429f7e94ec5e56bb182d82cf.tar.gz dexon-tests-f71c2688e1a839f8429f7e94ec5e56bb182d82cf.tar.zst dexon-tests-f71c2688e1a839f8429f7e94ec5e56bb182d82cf.zip | |
regenerate hive tests
Diffstat (limited to 'GeneralStateTests/stCallCreateCallCodeTest')
39 files changed, 1845 insertions, 2767 deletions
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json index 229f0a23a..6d0a48e2c 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json @@ -2,88 +2,75 @@ "Call1024BalanceTooLow" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json" }, "env" : { - "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "currentDifficulty" : "0x020000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xdb8bd286972ed997657cf36e784526bf117a5bc29f3b19a6da137c2317fd4b5b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdb8bd286972ed997657cf36e784526bf117a5bc29f3b19a6da137c2317fd4b5b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xfda56525128873c6bda3621666fd65a32fb7bc99e56566a42f8a668196d172d6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xfda56525128873c6bda3621666fd65a32fb7bc99e56566a42f8a668196d172d6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdb8bd286972ed997657cf36e784526bf117a5bc29f3b19a6da137c2317fd4b5b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x401", + "0x01" : "0x01" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xffffffffffffffffffffffffffffffff", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x1b58", + "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "7000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0400", - "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155", - "nonce" : "0x00", + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1024", + "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b @@0 0 0 0 0) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +80,14 @@ "" ], "gasLimit" : [ - "0x10000000d788" + "17592186099592" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json b/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json index 1770a90da..d896bcc75 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json @@ -2,88 +2,78 @@ "Call1024OOG" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json" }, "env" : { - "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "currentDifficulty" : "0x020000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x7262a16f3f7d642357985ada81b318eaa5cef790b8ed41d89a0f5a48e271a574", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x" : "0x0401", + "0x01" : "0x01", + "0x02" : "0x0fa3e9" + } } } - ], - "EIP158" : [ - { - "hash" : "0x7262a16f3f7d642357985ada81b318eaa5cef790b8ed41d89a0f5a48e271a574", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x767787db28cc33cd1da3856af52b141063e8f3655991dd1d8a1db0d9fd12de66", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x767787db28cc33cd1da3856af52b141063e8f3655991dd1d8a1db0d9fd12de66", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x7262a16f3f7d642357985ada81b318eaa5cef790b8ed41d89a0f5a48e271a574", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x85", + "0x01" : "0x01", + "0x02" : "0x20789" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xffffffffffffffffffffffffffffffff", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x1b58", + "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "7000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0400", - "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f16001556103e860005402600101600255", - "nonce" : "0x00", + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1024", + "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL (MUL (SUB (GAS) 10000) (SUB 1 (DIV @@0 1025))) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +83,14 @@ "" ], "gasLimit" : [ - "0xefe17a" + "15720826" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json b/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json index e10a8ed07..8f5cf81ab 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json @@ -2,88 +2,79 @@ "Call1024PreCalls" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json" }, "env" : { - "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "currentDifficulty" : "0x020000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x9e669d3e957acb6c3fef146901512fdef074829b110e73df2c68ef16b63921b6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x01", + "0x02" : "0x01", + "0x03" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x9e669d3e957acb6c3fef146901512fdef074829b110e73df2c68ef16b63921b6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x0e28b14b17542dc03eb8e0397c1c658947420a9d95fc96ca2926a38620d593aa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x0e28b14b17542dc03eb8e0397c1c658947420a9d95fc96ca2926a38620d593aa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9e669d3e957acb6c3fef146901512fdef074829b110e73df2c68ef16b63921b6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x03e4", + "0x01" : "0x01", + "0x02" : "0x01", + "0x03" : "0x01" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0fffffffffffffffffffffffffffffffff", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xfffffffffffffffffffffffffffffffff", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x1b58", + "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "7000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x07e8", - "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155", - "nonce" : "0x00", + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "2024", + "code" : "{ [[ 2 ]] (CALL 0xffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[ 3 ]] (CALL 0xffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) }", + "nonce" : "0", "storage" : { } } @@ -95,12 +86,12 @@ "gasLimit" : [ "0x7ffffffffffffff0" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json index 16a21d501..024c852dd 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json @@ -2,88 +2,59 @@ "CallLoseGasOOG" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json" }, "env" : { - "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "currentDifficulty" : "0x020000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x83936b93f345c2eadf1fc9059dd84c6b369410bbbfc8a1fa11a7a3499fe6b158", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x" : "0x01", + "0x02" : "0x03e9" + } } } - ], - "EIP158" : [ - { - "hash" : "0x83936b93f345c2eadf1fc9059dd84c6b369410bbbfc8a1fa11a7a3499fe6b158", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x74be0756050e62737710a3520d833376ff4af5352afcb61012b8d69183062d45", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x74be0756050e62737710a3520d833376ff4af5352afcb61012b8d69183062d45", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x83936b93f345c2eadf1fc9059dd84c6b369410bbbfc8a1fa11a7a3499fe6b158", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xffffffffffffffffffffffffffffffff", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x1b58", + "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "7000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0400", - "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f16001556103e860005402600101600255", - "nonce" : "0x00", + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1024", + "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL (ADD 1(MUL @@0 100000)) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }", + "nonce" : "0", "storage" : { } } @@ -95,12 +66,12 @@ "gasLimit" : [ "0x7fffffffffffffff" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json b/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json index 3b515b69c..ef95d06a0 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json @@ -2,88 +2,62 @@ "CallRecursiveBombPreCall" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x7e6ec21bdd51c37e15a29e69628230064daf8a5caf804440103828982e105282", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "storage" : { + "0x00" : "0x0000000000000000000000000000000000000000000000000000000000000400", + "0x01" : "0x01" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0x7e6ec21bdd51c37e15a29e69628230064daf8a5caf804440103828982e105282", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa4efec395a4b6141d677b8e44da81c0faea446eec319bc1580ad2c8e10a3ebc1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa4efec395a4b6141d677b8e44da81c0faea446eec319bc1580ad2c8e10a3ebc1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x7e6ec21bdd51c37e15a29e69628230064daf8a5caf804440103828982e105282", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0fffffffffffffffffffffffffffffff", - "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1506000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff1", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0xfffffffffffffffffffffffffffffff", + "code" : "{ (CALL 100000 0xbad304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0) (CALL 0x7ffffffffffffff 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0) }", + "nonce" : "0", "storage" : { } }, - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x600160005401600055600060006000600060003062036b005a03f1600155", - "nonce" : "0x00", + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 224000) (ADDRESS) 0 0 0 0 0) } ", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0fffffffffffffffffffffffffffffff", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xfffffffffffffffffffffffffffffff", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -95,12 +69,12 @@ "gasLimit" : [ "0x7ffffffffffffff0" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json index 07640909f..13d4d2751 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json @@ -2,88 +2,75 @@ "Callcode1024BalanceTooLow" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json" }, "env" : { - "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "currentDifficulty" : "0x020000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xd80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xd80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xc89b206d6fc403d255aa797950b45e77ccf21ba50ff4842e23ad92b1380d21d5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xc89b206d6fc403d255aa797950b45e77ccf21ba50ff4842e23ad92b1380d21d5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x401", + "0x01" : "0x01" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xffffffffffffffffffffffffffffffff", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x1b58", + "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "7000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0400", - "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155", - "nonce" : "0x00", + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1024", + "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALLCODE 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b @@0 0 0 0 0) }", + "nonce" : "0", "storage" : { } } @@ -95,12 +82,12 @@ "gasLimit" : [ "0x7ffffffffffffff0" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json index 2d0dd4a6f..03fb594d9 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json @@ -2,88 +2,78 @@ "Callcode1024OOG" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json" }, "env" : { - "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "currentDifficulty" : "0x020000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xb099610b72ed48fb35ad2b49960c61666edfd5918813dc27614388d567ed72d0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x401", + "0x01" : "0x01", + "0x02" : "0x0fa3e9" + } } } - ], - "EIP158" : [ - { - "hash" : "0xb099610b72ed48fb35ad2b49960c61666edfd5918813dc27614388d567ed72d0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x990bcaa8a52576a0f881f83a8dc43af9c26e56f0965cabaa554b892a810d6c21", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x990bcaa8a52576a0f881f83a8dc43af9c26e56f0965cabaa554b892a810d6c21", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb099610b72ed48fb35ad2b49960c61666edfd5918813dc27614388d567ed72d0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x85", + "0x01" : "0x01", + "0x02" : "0x20789" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xffffffffffffffffffffffffffffffff", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x1b58", + "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "7000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0400", - "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f26001556103e860005402600101600255", - "nonce" : "0x00", + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1024", + "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALLCODE (MUL (SUB (GAS) 10000) (SUB 1 (DIV @@0 1025))) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +83,14 @@ "" ], "gasLimit" : [ - "0xefe17a" + "15720826" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json index 27d5434f4..64fea8ca0 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json @@ -2,88 +2,76 @@ "CallcodeLoseGasOOG" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json" }, "env" : { - "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "currentDifficulty" : "0x020000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x46a8f242088e78fb22bcfe144fa4c91f51774d11dc56810806d8a2005ff365da", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x" : "0x01", + "0x02" : "0x03e9" + } } } - ], - "EIP158" : [ - { - "hash" : "0x46a8f242088e78fb22bcfe144fa4c91f51774d11dc56810806d8a2005ff365da", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe4315b558952437f6f4d4dff77780e72dacdcc0a0cd443e9517e7347b3364060", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe4315b558952437f6f4d4dff77780e72dacdcc0a0cd443e9517e7347b3364060", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x46a8f242088e78fb22bcfe144fa4c91f51774d11dc56810806d8a2005ff365da", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x00", + "0x02" : "0x00" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0xffffffffffffffffffffffffffffffff", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x1b58", + "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "7000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0400", - "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f26001556103e860005402600101600255", - "nonce" : "0x00", + "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1024", + "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALLCODE (ADD 1(MUL @@0 100000)) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +81,14 @@ "" ], "gasLimit" : [ - "0x028976" + "166262" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json index 8f66d1ea8..68a7703ef 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json @@ -2,88 +2,58 @@ "callOutput1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput1Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x7b27c1a486cad63a429086b85416cb2d8cebb0c159a7f73be018c30de2ecdf28", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + } } } - ], - "EIP158" : [ - { - "hash" : "0x798d1e55defeabefb8e2625b6429f7ab0d47474b6624a013ec0b385cf031e772", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x7b27c1a486cad63a429086b85416cb2d8cebb0c159a7f73be018c30de2ecdf28", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x7b27c1a486cad63a429086b85416cb2d8cebb0c159a7f73be018c30de2ecdf28", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x798d1e55defeabefb8e2625b6429f7ab0d47474b6624a013ec0b385cf031e772", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 50000 0xaaae7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 0) [[ 0 ]] (MLOAD 0) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", "code" : "0x6001600101600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x0f4240" + "1000000" ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json index b50e95a27..3bed12ff8 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json @@ -2,88 +2,58 @@ "callOutput2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput2Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x5e362b5144a434345036ebbd58cfe65a597cdcff2fa24ec661c7a09ca608ec0f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + } } } - ], - "EIP158" : [ - { - "hash" : "0xc0c87377411f756fa0ba9a8e0024811e84e9cf31c5967f50a04d3834ab32b4e1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x5e362b5144a434345036ebbd58cfe65a597cdcff2fa24ec661c7a09ca608ec0f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5e362b5144a434345036ebbd58cfe65a597cdcff2fa24ec661c7a09ca608ec0f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xc0c87377411f756fa0ba9a8e0024811e84e9cf31c5967f50a04d3834ab32b4e1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 50000 0xaaae7baea6a6c7c4c2dfeb977efac326af552d87 0 0 32 0 0) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", "code" : "0x6001600101600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x0f4240" + "1000000" ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json index d22927c27..0cd0bcbc2 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json @@ -2,88 +2,58 @@ "callOutput3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x0152447aa19bc18ad06b4c1ca4fa9f163d9f8c258925d9e1a38936588847a5ea", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + } } } - ], - "EIP158" : [ - { - "hash" : "0x5c0033c83177273d0ac13a79006fee34e001d9acd58e9f56e7841751a20e1c43", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x0152447aa19bc18ad06b4c1ca4fa9f163d9f8c258925d9e1a38936588847a5ea", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x0152447aa19bc18ad06b4c1ca4fa9f163d9f8c258925d9e1a38936588847a5ea", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x5c0033c83177273d0ac13a79006fee34e001d9acd58e9f56e7841751a20e1c43", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 50000 0xaaae7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", "code" : "0x6001600101600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x0f4240" + "1000000" ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json index 9abdc5470..3b0d0619c 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json @@ -2,88 +2,58 @@ "callOutput3Fail" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3FailFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xb5f1a90133ac8a91c55acfe81e3c9fdda619081ae5251e160214090245bbebb9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + } } } - ], - "EIP158" : [ - { - "hash" : "0x4548d282d5e76a7944f0ca0c562eff40124678658f1cc3420ad04bf64a926717", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xb5f1a90133ac8a91c55acfe81e3c9fdda619081ae5251e160214090245bbebb9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xb5f1a90133ac8a91c55acfe81e3c9fdda619081ae5251e160214090245bbebb9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x4548d282d5e76a7944f0ca0c562eff40124678658f1cc3420ad04bf64a926717", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 50000 0xaaae7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", "code" : "0x016001600101600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x0f4240" + "1000000" ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json index 2439ce774..4caa2cb70 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json @@ -2,88 +2,58 @@ "callOutput3partial" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xa69a06073030c243674bff83b6b69e44cf1e5c3922a7bbb8e0f016b2bf16c67a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf1758b5f24c9a06ccf2d242198e3b8813aef83cfa386c933a45b861cac7c2e07", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa69a06073030c243674bff83b6b69e44cf1e5c3922a7bbb8e0f016b2bf16c67a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa69a06073030c243674bff83b6b69e44cf1e5c3922a7bbb8e0f016b2bf16c67a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf1758b5f24c9a06ccf2d242198e3b8813aef83cfa386c933a45b861cac7c2e07", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 50000 0xaaae7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 10) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", "code" : "0x6001600101600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x0f4240" + "1000000" ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json index 4d3a5fe5b..67a1c58db 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json @@ -2,88 +2,58 @@ "callOutput3partialFail" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFailFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x24d198fb3b2d5fc65c0f331a129e013dedc29a4af9df00b77b6011cad25ee975", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + } } } - ], - "EIP158" : [ - { - "hash" : "0xac14bbcd134a728e66846cf35c68f5c762ebb86519f152ba3172b4e8e3d0c88b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x24d198fb3b2d5fc65c0f331a129e013dedc29a4af9df00b77b6011cad25ee975", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x24d198fb3b2d5fc65c0f331a129e013dedc29a4af9df00b77b6011cad25ee975", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xac14bbcd134a728e66846cf35c68f5c762ebb86519f152ba3172b4e8e3d0c88b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 50000 0xaaae7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 10) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", "code" : "0x016001600101600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x0f4240" + "1000000" ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json index e68a26985..017f215a1 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json @@ -2,88 +2,57 @@ "callWithHighValue" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x01c9c380", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "30000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x7def6ae28e9950b938eb97188f9520684902f336edf00bd3083f19bf8a2d15b1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x7def6ae28e9950b938eb97188f9520684902f336edf00bd3083f19bf8a2d15b1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x1eb0027486ac4fc1b9d7a46ebecf09f931996982cc3d69c5a10c2706a8f02aa5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x1eb0027486ac4fc1b9d7a46ebecf09f931996982cc3d69c5a10c2706a8f02aa5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x7def6ae28e9950b938eb97188f9520684902f336edf00bd3083f19bf8a2d15b1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f1600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1000000000000000001 0 64 0 2 ) }", + "nonce" : "0", "storage" : { } }, - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x17", + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "23", "code" : "0x6001600155603760005360026000f3", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +62,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json index 1b6dac2f6..90b5ce667 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json @@ -2,88 +2,57 @@ "callWithHighValueAndGasOOG" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndGasOOGFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x01c9c380", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "30000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x3bfbfff0f54880e052e6b15b21cea6308d5f8980382efd244ec6a156e80a682c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x3bfbfff0f54880e052e6b15b21cea6308d5f8980382efd244ec6a156e80a682c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa3ad91041fae57a25112cdccd43a1f0c5dcdf3d34d3e2c0540ea9e2ad397415e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa3ad91041fae57a25112cdccd43a1f0c5dcdf3d34d3e2c0540ea9e2ad397415e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x3bfbfff0f54880e052e6b15b21cea6308d5f8980382efd244ec6a156e80a682c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff1600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 0xffffffffffffffffffffffff 0x945304eb96065b2a98b57a48a06ae28d285a71b5 100000000000000000000 0 64 0 2 ) }", + "nonce" : "0", "storage" : { } }, - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x17", + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "23", "code" : "0x6001600155603760005360026000f3", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +62,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json index 54d686a00..29b0cf6ea 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json @@ -2,88 +2,78 @@ "callWithHighValueAndOOGatTxLevel" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x01c9c380", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "30000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf67e329eb3010477fe9721de02eed7171187a534ee81ad47609a049ff9af61b5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "3000000" } } - ], - "EIP158" : [ - { - "hash" : "0xf67e329eb3010477fe9721de02eed7171187a534ee81ad47609a049ff9af61b5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xabcff5573348695b56596d30d93ec83f3adc2ec368a81e824dd60516ccb846e2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xabcff5573348695b56596d30d93ec83f3adc2ec368a81e824dd60516ccb846e2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf67e329eb3010477fe9721de02eed7171187a534ee81ad47609a049ff9af61b5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "33424" } } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0186a0", - "code" : "0x6000600060006000620186a173945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f1600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "100000", + "code" : "{ [[ 0 ]] (CALL 3000001 0x945304eb96065b2a98b57a48a06ae28d285a71b5 100001 0 0 0 0 ) }", + "nonce" : "0", "storage" : { } }, - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x17", + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "23", "code" : "0x6001600155603760005360026000f3", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +83,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json index f1e91a582..7d27f55d3 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json @@ -2,88 +2,86 @@ "callWithHighValueOOGinCall" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueOOGinCallFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x01c9c380", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "30000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x0867e91acfcccc804e1bf9a92ed3d40b97f87b630c1a992e3ff859de9fd0ebd5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x01" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "0x17" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a763155a" } } - ], - "EIP158" : [ - { - "hash" : "0x0867e91acfcccc804e1bf9a92ed3d40b97f87b630c1a992e3ff859de9fd0ebd5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x64a7fa9e0aa600695d031c61da404a5c2782ccc80a2392833a32cc62bd923cf1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x64a7fa9e0aa600695d031c61da404a5c2782ccc80a2392833a32cc62bd923cf1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x0867e91acfcccc804e1bf9a92ed3d40b97f87b630c1a992e3ff859de9fd0ebd5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x01" + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "0x17" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999999939270" } } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0186a0", - "code" : "0x60016000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b5612710f101600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "100000", + "code" : "{ [[ 0 ]] (ADD (CALL 10000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0 ) 1) }", + "nonce" : "0", "storage" : { } }, - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x17", + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "23", "code" : "0x6001600155603760005360026000f3", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json index 6478d2ec1..2598b01f9 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json @@ -2,88 +2,58 @@ "callcodeOutput1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput1Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x6803680f0aea1573dfdde914548a5e1d7661b182d676cdb73f4c2bc7d348aae8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + } } } - ], - "EIP158" : [ - { - "hash" : "0xc19c1d77d2fa6f03c16c3e0a2b21f32a6d6fd6e5c42d74a205ef3cacbcd20533", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x6803680f0aea1573dfdde914548a5e1d7661b182d676cdb73f4c2bc7d348aae8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x6803680f0aea1573dfdde914548a5e1d7661b182d676cdb73f4c2bc7d348aae8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xc19c1d77d2fa6f03c16c3e0a2b21f32a6d6fd6e5c42d74a205ef3cacbcd20533", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 50000 0xaaae7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 0) [[ 0 ]] (MLOAD 0) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", "code" : "0x6001600101600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x0f4240" + "1000000" ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json index 4a75d727c..213a8c470 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json @@ -2,88 +2,58 @@ "callcodeOutput2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput2Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x78fe48479cfd9f57c8ab5937a0805d4d04d40823c291fcc4adf0c9b61f6fc0d9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + } } } - ], - "EIP158" : [ - { - "hash" : "0xff93a7763fb845955fac90917658906a99591d1fed6839bf9990df1eeb6aa9e2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x78fe48479cfd9f57c8ab5937a0805d4d04d40823c291fcc4adf0c9b61f6fc0d9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x78fe48479cfd9f57c8ab5937a0805d4d04d40823c291fcc4adf0c9b61f6fc0d9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xff93a7763fb845955fac90917658906a99591d1fed6839bf9990df1eeb6aa9e2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 50000 0xaaae7baea6a6c7c4c2dfeb977efac326af552d87 0 0 32 0 0) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", "code" : "0x6001600101600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x0f4240" + "1000000" ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json index 8c98add23..8c5b81402 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json @@ -2,88 +2,58 @@ "callcodeOutput3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xb737505a15b9bfdb788595646aeec43d1827feb376cdc56aefc9081cb7f6e8a7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + } } } - ], - "EIP158" : [ - { - "hash" : "0xcef78b273dc327acbe1104b428ea54e20358c1787f712ca76c3116024b347a03", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xb737505a15b9bfdb788595646aeec43d1827feb376cdc56aefc9081cb7f6e8a7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xb737505a15b9bfdb788595646aeec43d1827feb376cdc56aefc9081cb7f6e8a7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xcef78b273dc327acbe1104b428ea54e20358c1787f712ca76c3116024b347a03", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 50000 0xaaae7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", "code" : "0x6001600101600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x0f4240" + "1000000" ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json index 480858f69..db0f7d49c 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json @@ -2,88 +2,58 @@ "callcodeOutput3Fail" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3FailFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xfd3a6c8827305178fad93c3268903e7e3a04fe1347e56c3a05a20616ca4acd3f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + } } } - ], - "EIP158" : [ - { - "hash" : "0x633b052741568a84cdda76bcdf140e188bfb89775935668c13c76769212520af", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xfd3a6c8827305178fad93c3268903e7e3a04fe1347e56c3a05a20616ca4acd3f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xfd3a6c8827305178fad93c3268903e7e3a04fe1347e56c3a05a20616ca4acd3f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x633b052741568a84cdda76bcdf140e188bfb89775935668c13c76769212520af", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 50000 0xaaae7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", "code" : "0x016001600101600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x0f4240" + "1000000" ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json index 3ba4c158d..f4e0ca656 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json @@ -2,88 +2,58 @@ "callcodeOutput3partial" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x5ea923fe41814229d0076dce8fe91703070eddef323b233e43901a9bd8cafcbc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + } } } - ], - "EIP158" : [ - { - "hash" : "0x62e67a9eefce8bc4256ade3264a52606e421505048397736cec05454afd65ace", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x5ea923fe41814229d0076dce8fe91703070eddef323b233e43901a9bd8cafcbc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5ea923fe41814229d0076dce8fe91703070eddef323b233e43901a9bd8cafcbc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x62e67a9eefce8bc4256ade3264a52606e421505048397736cec05454afd65ace", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 50000 0xaaae7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 10) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", "code" : "0x6001600101600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x0f4240" + "1000000" ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json index a99b6d837..d65351c85 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json @@ -2,88 +2,58 @@ "callcodeOutput3partialFail" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFailFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xdb077b8446cf6ccba2575d27f2656e89ed494a6fa5fa8302dba207ee16af8b56", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6dde5c3897639f0a36ccdba1addcee240c47c55fc04c90ffa0663ac4668dd2af", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xdb077b8446cf6ccba2575d27f2656e89ed494a6fa5fa8302dba207ee16af8b56", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xdb077b8446cf6ccba2575d27f2656e89ed494a6fa5fa8302dba207ee16af8b56", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6dde5c3897639f0a36ccdba1addcee240c47c55fc04c90ffa0663ac4668dd2af", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 50000 0xaaae7baea6a6c7c4c2dfeb977efac326af552d87 0 0 0 0 10) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", + "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", "code" : "0x016001600101600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x0f4240" + "1000000" ], - "gasPrice" : "0x00", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json index 4883a6ff6..ea00d7c73 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json @@ -2,88 +2,57 @@ "callcodeWithHighValue" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x01c9c380", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "30000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x86067cf8a4293319dbc8884e0497b77acc13910e87f5bdb436f6f7abc338de7d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x86067cf8a4293319dbc8884e0497b77acc13910e87f5bdb436f6f7abc338de7d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xb780598c57627c25b4378a47664f3c2719e68b60de2070d526ae3f90cc57b7c2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xb780598c57627c25b4378a47664f3c2719e68b60de2070d526ae3f90cc57b7c2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x86067cf8a4293319dbc8884e0497b77acc13910e87f5bdb436f6f7abc338de7d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1000000000000000001 0 64 0 2 ) }", + "nonce" : "0", "storage" : { } }, - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x17", + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "23", "code" : "0x6001600155603760005360026000f3", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +62,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json index 2350265df..dae8f6097 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json @@ -2,88 +2,57 @@ "callcodeWithHighValueAndGasOOG" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOGFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x01c9c380", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "30000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x6d4dadb84a3e8ca3c0cda40ae936ce991724c5399d72a1a8c930450e869c0a13", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x6d4dadb84a3e8ca3c0cda40ae936ce991724c5399d72a1a8c930450e869c0a13", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xc8f0273b761297b4f580d19488711d74e6b6900bcf55fd9c6fa9fd891809bc52", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xc8f0273b761297b4f580d19488711d74e6b6900bcf55fd9c6fa9fd891809bc52", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6d4dadb84a3e8ca3c0cda40ae936ce991724c5399d72a1a8c930450e869c0a13", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff2600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 0xffffffffffffffffffffffff 0x945304eb96065b2a98b57a48a06ae28d285a71b5 100000000000000000000 0 64 0 2 ) }", + "nonce" : "0", "storage" : { } }, - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x17", + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "23", "code" : "0x6001600155603760005360026000f3", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +62,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json index 1057ecbe0..a04914dad 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json @@ -2,81 +2,63 @@ "createFailBalanceTooLow" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x05f5e100", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "100000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x55c92327bbe8401de7efef3cd3f1fd2227224e415142bbc36f634920407d4ee5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "0000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a7640017" } } - ], - "EIP158" : [ - { - "hash" : "0x55c92327bbe8401de7efef3cd3f1fd2227224e415142bbc36f634920407d4ee5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x5833e19631ddedaf4e3c9a766f696c2e59e7524e388eb871be19dc8e0ce37b6e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5833e19631ddedaf4e3c9a766f696c2e59e7524e388eb871be19dc8e0ce37b6e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x55c92327bbe8401de7efef3cd3f1fd2227224e415142bbc36f634920407d4ee5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "0000000000000000000000000000000000000000" : { + "shouldnotexist" : "1" } } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x605a60005360016000670de0b6b3a7640018f0ff", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1000000000000000024 0 1)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +68,14 @@ "" ], "gasLimit" : [ - "0xcf1d" + "53021" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x17" + "23" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json index 68266c88a..6e123ae97 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json @@ -2,81 +2,49 @@ "createInitFailBadJumpDestination" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x05f5e100", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "100000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "0000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a76586a0" } } - ], - "EIP158" : [ - { - "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6056600053600160006001f0ff", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x05f5e100" + "100000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json index 8b2d6067e..b186d661b 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json @@ -2,81 +2,49 @@ "createInitFailStackSizeLargerThan1024" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x05f5e100", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "100000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "0000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a76586a0" } } - ], - "EIP158" : [ - { - "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f6103ff6000525b7f0102030405060708090a0102030405060708090a010203046000527f05060708090a0102600160005103600052600051600657000000000000000000602052604060006001f0ff", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x05f5e100" + "100000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json index aa85c83c3..d190bb556 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json @@ -2,81 +2,49 @@ "createInitFailStackUnderflow" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x05f5e100", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "100000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "0000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a76586a0" } } - ], - "EIP158" : [ - { - "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6001600053600160006001f0ff", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x05f5e100" + "100000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json index 9e2c6d234..8d83db8d1 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json @@ -2,81 +2,49 @@ "createInitFailUndefinedInstruction" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x05f5e100", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "100000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "0000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a76586a0" } } - ], - "EIP158" : [ - { - "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60f4600053600160006001f0ff", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x05f5e100" + "100000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json index 17c2c2bb5..9646960bc 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json @@ -2,81 +2,63 @@ "createInitFail_OOGduringInit" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x05f5e100", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "100000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "0000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a76586a0" } } - ], - "EIP158" : [ - { - "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "0000000000000000000000000000000000000000" : { + "shouldnotexist" : "1" } } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x605a600053600160006001f0ff", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +68,14 @@ "" ], "gasLimit" : [ - "0xcf1d" + "53021" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json index 254f5f86c..91049c42f 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json @@ -2,81 +2,49 @@ "createInitOOGforCREATE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x05f5e100", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "100000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xb61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "nonce" : "0" } } - ], - "EIP158" : [ - { - "hash" : "0xb61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xb61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xb61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x605a600053600160006001f0ff", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0xcf1c" + "53020" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json index 51794d651..4dc066036 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json @@ -2,96 +2,76 @@ "createJS_ExampleContract" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.e262eefd.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xfa6ad7de38ebb87bba885a011b42db857ef3dbcad0785fa227a64c278cf67aa6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : [ - ] + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "storage" : { + } + } } - ], - "EIP158" : [ - { - "hash" : "0x76778cf36d1b30637d2cfac4b7fe1101c6ba3c4e3485b2d7b0cf57e7da4e5f87", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : [ - ] - } - ], - "Frontier" : [ - { - "hash" : "0xaa4a4f33edbf9933dec6709b7c6295e17707fb5b8bf9fd231490cd36aef1d730", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : [ - ] - } - ], - "Homestead" : [ - { - "hash" : "0xfa6ad7de38ebb87bba885a011b42db857ef3dbcad0785fa227a64c278cf67aa6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : [ - ] - } - ], - "Metropolis" : [ - { - "hash" : "0x461c87413f1515b197cc0607decd0871b9905251670b18e100090c527db61f13", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - }, - "logs" : [ - ] + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "storage" : { + "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x42", + "0x02" : "0x23", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x05" : "0x54c98c81" + } + } } - ] - }, + } + ], "pre" : { - "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { - "balance" : "0x0186a0", + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "100000", "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056", - "nonce" : "0x00", + "nonce" : "0", "storage" : { - "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "0x01" : "0x42", "0x02" : "0x23", "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", "0x05" : "0x54c98c81" } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x09184e72a000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } } @@ -101,15 +81,15 @@ "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x0186a0" + "100000" ] } } -} +}
\ No newline at end of file diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json b/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json index 0545b76d4..fbc1d5b94 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json @@ -2,74 +2,69 @@ "createJS_NoCollision" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x2dcdc769bddc469d0eea04acebb4f082cd16bb90642264763c1f2efb4636f674", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "storage" : { + "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x42", + "0x02" : "0x23", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x05" : "0x03e8" + } } } - ], - "EIP158" : [ - { - "hash" : "0x8711293c80aa5a2ca90b9771b3ee453ec25a0c0799fa6aabcc09b427802880cc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe0974185f0c4317e900da502eddb5d6e5c5accbb8b98f7cb9e223cb054423b60", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2dcdc769bddc469d0eea04acebb4f082cd16bb90642264763c1f2efb4636f674", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "storage" : { + "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x42", + "0x02" : "0x23", + "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x05" : "0x03e8" + } } } - ], - "Metropolis" : [ - { - "hash" : "0x8711293c80aa5a2ca90b9771b3ee453ec25a0c0799fa6aabcc09b427802880cc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x09184e72a000", - "code" : "", - "nonce" : "0x00", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10000000000000", + "code" : "0x", + "nonce" : "0", "storage" : { } } @@ -79,14 +74,14 @@ "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json index bd4d54547..bb2e97b05 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json @@ -2,74 +2,105 @@ "createNameRegistratorPerTxs" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x02540be400", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x0186a0", + "code" : "0x396000f3006000355415600957005b60", + "nonce" : "0x00", + "storage" : { + "0x01" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x0186a0", + "code" : "0x396000f3006000355415600957005b60", + "nonce" : "0x01", + "storage" : { + "0x01" : "0x01" + } } } - ], - "Frontier" : [ - { - "hash" : "0xe0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x0186a0", + "code" : "0x396000f3006000355415600957005b60", + "nonce" : "0x00", + "storage" : { + "0x01" : "0x01" + } } } - ], - "Homestead" : [ - { - "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x0186a0", + "code" : "0x396000f3006000355415600957005b60", + "nonce" : "0x01", + "storage" : { + "0x01" : "0x01" + } } } - ], - "Metropolis" : [ - { - "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -81,12 +112,12 @@ "gasLimit" : [ "0x1314e" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json index 6c94d4d5c..02f33fbc2 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json @@ -2,114 +2,60 @@ "createNameRegistratorPerTxsNotEnoughGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x02540be400", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : [ + 0 + ], + "value" : -1 }, - { - "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 + "network" : [ + "Frontier" + ], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", + "nonce" : "0x00" } } - ], - "EIP158" : [ - { - "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 }, - { - "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 + "network" : [ + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", + "nonce" : "0x00" } } - ], - "Frontier" : [ - { - "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -122,12 +68,12 @@ "0x544d", "0xb44d" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json index 5fbffa558..162fccfcc 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json @@ -2,81 +2,52 @@ "createNameRegistratorPreStore1NotEnoughGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x05f5e100", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "100000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x223d9667daa515577a93dc04cdd41a803c9c2529628009ed68b8f73efb87872e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "nonce" : "0x01" + }, + "d2571607e241ecf590ed94b12d87c94babe36db6" : { + "shouldnotexist" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0x223d9667daa515577a93dc04cdd41a803c9c2529628009ed68b8f73efb87872e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3e4b203d9a716a8209c2af59c485f3c1e5bb7b97d482313676dcd64410ed6563", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x3e4b203d9a716a8209c2af59c485f3c1e5bb7b97d482313676dcd64410ed6563", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x223d9667daa515577a93dc04cdd41a803c9c2529628009ed68b8f73efb87872e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b602035600060005260356020536055602153602260006017f0", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{(MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 ) (MSTORE8 32 0x35) (MSTORE8 33 0x55) (CREATE 23 0 34) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +57,14 @@ "" ], "gasLimit" : [ - "0x011d6f" + "73071" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json index a017f406a..230e6ee1e 100644 --- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json +++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json @@ -2,81 +2,50 @@ "createNameRegistratorendowmentTooHigh" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHighFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xcf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xcf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xcf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xcf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xcf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d6003670de0b6b3a7640001f0600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 1000000000000000001 3 29) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x0493e0" + "300000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x00" + "0" ] } } |