diff options
Diffstat (limited to 'GeneralStateTests/stCallCodes')
79 files changed, 5346 insertions, 6222 deletions
diff --git a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json index 35142280c..1841c6875 100644 --- a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json +++ b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json @@ -2,81 +2,75 @@ "call_OOG_additionalGasCosts1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts1Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0xb2d05e00", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "3000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "shouldnotexist" : "1" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "30000" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999999970000" } } - ], - "EIP158" : [ - { - "hash" : "0x8e5bd1989eadfd5129c7f0ae2ba9be8c347a8d109a000c333443a582eafcc58d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x8e5bd1989eadfd5129c7f0ae2ba9be8c347a8d109a000c333443a582eafcc58d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "shouldnotexist" : "1" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "21727" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999999978273" } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ (CALL 6000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +80,14 @@ "" ], "gasLimit" : [ - "0x7530" + "30000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json index 0ddf693d6..4250bbb76 100644 --- a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json +++ b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json @@ -2,88 +2,62 @@ "call_OOG_additionalGasCosts2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts2Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0xb2d05e00", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "3000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150", + "EIP158" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "balance" : "0" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x7530" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7638ad0" } } - ], - "EIP158" : [ - { - "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ (CALL 6000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +67,14 @@ "" ], "gasLimit" : [ - "0x7530" + "30000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcall_00.json b/GeneralStateTests/stCallCodes/callcall_00.json index 941f55aa1..36e04a6ca 100644 --- a/GeneralStateTests/stCallCodes/callcall_00.json +++ b/GeneralStateTests/stCallCodes/callcall_00.json @@ -2,95 +2,72 @@ "callcall_00" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcall_00Filler.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" : "0x7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150", + "EIP158" + ], + "result" : { + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x01", + "0x04" : "0x1000000000000000000000000000000000000001", + "0x07" : "0x02", + "0xe6" : "0x1000000000000000000000000000000000000002", + "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0xec" : "0x40", + "0xee" : "0x21", + "0xf0" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8f8ed2aed2973e159fa5486f47c6ebf15c5058f8e2350286b84b569bc6ce2d25", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8f8ed2aed2973e159fa5486f47c6ebf15c5058f8e2350286b84b569bc6ce2d25", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] (CALL 250000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE))}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +77,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcall_00_OOGE.json b/GeneralStateTests/stCallCodes/callcall_00_OOGE.json index dcc1f8bb9..60e7bc98e 100644 --- a/GeneralStateTests/stCallCodes/callcall_00_OOGE.json +++ b/GeneralStateTests/stCallCodes/callcall_00_OOGE.json @@ -2,95 +2,75 @@ "callcall_00_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGEFiller.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" : "0x9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa66f080864c72c593d874a42aa8c17eff838bf1e45ecb0bbe2bb041a3c235f94", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa66f080864c72c593d874a42aa8c17eff838bf1e45ecb0bbe2bb041a3c235f94", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 20020 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60016002556001600252", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) (MSTORE 2 1)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +80,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json b/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json index 17c1c9922..d22765fb6 100644 --- a/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json +++ b/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json @@ -2,135 +2,107 @@ "callcall_00_OOGE_valueTransfer" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGE_valueTransferFiller.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" : "0xa0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x18f49ad2f2527eabe4cf24910a048341c7875650f34679a96db8fd6147af702b", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "EIP158" : [ - { - "hash" : "0xa0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x18f49ad2f2527eabe4cf24910a048341c7875650f34679a96db8fd6147af702b", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 }, - { - "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00" + } } } - ], - "Homestead" : [ - { - "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 }, - { - "hash" : "0x18f49ad2f2527eabe4cf24910a048341c7875650f34679a96db8fd6147af702b", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 20 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL (CALLDATALOAD 0) 0x1000000000000000000000000000000000000002 10 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60016002556001600252", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) (MSTORE 2 1)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -141,14 +113,14 @@ "0x0000000000000000000000000000000000000000000000000000000000001388" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json index 6d237aca5..aef2c4559 100644 --- a/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json +++ b/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json @@ -2,95 +2,66 @@ "callcall_00_SuicideEnd" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.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" : "0x24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1000000010000000000" + }, + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "storage" : { + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x6edf980c4ea12c7909b073b2fd8902d00bb24a0b9df2142eb415aa31e4c7edda", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x6edf980c4ea12c7909b073b2fd8902d00bb24a0b9df2142eb415aa31e4c7edda", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x6001600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 2 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +71,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcall_000.json b/GeneralStateTests/stCallCodes/callcallcall_000.json index 0099e7db6..2cb6dfb32 100644 --- a/GeneralStateTests/stCallCodes/callcallcall_000.json +++ b/GeneralStateTests/stCallCodes/callcallcall_000.json @@ -2,102 +2,76 @@ "callcallcall_000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000Filler.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" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x014a" : "0x1000000000000000000000000000000000000003", + "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x0150" : "0x40", + "0x0152" : "0x26", + "0x0154" : "0x01", + "0x03" : "0x01", + "0x04" : "0x1000000000000000000000000000000000000002", + "0x07" : "0x03" + } } } - ], - "EIP158" : [ - { - "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x1ed24a8068d61509a3b7b1c30d1311735bba0587f6f6877efd5e74aa2364d382", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x1ed24a8068d61509a3b7b1c30d1311735bba0587f6f6877efd5e74aa2364d382", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] (CALL 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 2 ]] (CALL 250000 0x1000000000000000000000000000000000000003 3 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +81,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json b/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json index db43336a3..9a91d7365 100644 --- a/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json +++ b/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json @@ -2,102 +2,90 @@ "callcallcall_000_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGEFiller.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" : "0x05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x7d58669ba6ac24ea5bb8aae0dd7a7143b069e37b06e31fad81976a51f35a47f4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x7d58669ba6ac24ea5bb8aae0dd7a7143b069e37b06e31fad81976a51f35a47f4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x60016003556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (MSTORE 3 1)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +95,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json index 17fcdd1c3..45c1a300c 100644 --- a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json +++ b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json @@ -2,102 +2,130 @@ "callcallcall_000_OOGMAfter" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMAfterFiller.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" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1)}", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +135,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json index 0df480581..ea312d3b0 100644 --- a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json +++ b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json @@ -2,102 +2,90 @@ "callcallcall_000_OOGMBefore" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMBeforeFiller.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" : "0xd2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xd2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf46f37e7238438a444d89b8156b5cb11c331f0dafe29aa0c9d1396894b6ddf89", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf46f37e7238438a444d89b8156b5cb11c331f0dafe29aa0c9d1396894b6ddf89", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (MSTORE 3 1) [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +95,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json index c7568d739..e89a02a6a 100644 --- a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json +++ b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json @@ -2,102 +2,73 @@ "callcallcall_000_SuicideEnd" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.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" : "0x5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "balance" : "20000000000" + }, + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "storage" : { + "0x03" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xb2cc70b5c91805a7ba65d849ab2f2977354a5ed97458fa5481daaa78dd01783f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xb2cc70b5c91805a7ba65d849ab2f2977354a5ed97458fa5481daaa78dd01783f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +78,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json index d78a6da78..ef91e4d17 100644 --- a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json +++ b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json @@ -2,102 +2,76 @@ "callcallcall_000_SuicideMiddle" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.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" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1000000010000000000", + "storage" : { + "0x00" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "storage" : { + "0x01" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x731000000000000000000000000000000000000000ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +81,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json index 9352b762d..004282bd5 100644 --- a/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json +++ b/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json @@ -2,95 +2,113 @@ "callcallcall_ABCB_RECURSIVE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0xb2d05e00", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "3000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xb416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "566210" } } - ], - "EIP158" : [ - { - "hash" : "0xb416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf9904c46ff09c63f9864b18ef1acc3fa7ddda90e80b87f197500e40be0f61e54", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf9904c46ff09c63f9864b18ef1acc3fa7ddda90e80b87f197500e40be0f61e54", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "568190" } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 1000000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALL 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +118,14 @@ "" ], "gasLimit" : [ - "0x01c9c380" + "30000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001.json b/GeneralStateTests/stCallCodes/callcallcallcode_001.json index 098cc4460..cd17a8754 100644 --- a/GeneralStateTests/stCallCodes/callcallcallcode_001.json +++ b/GeneralStateTests/stCallCodes/callcallcallcode_001.json @@ -2,102 +2,77 @@ "callcallcallcode_001" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001Filler.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" : "0x12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x014a" : "0x1000000000000000000000000000000000000002", + "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x0150" : "0x40", + "0x0152" : "0x26", + "0x0154" : "0x01", + "0x02" : "0x01", + "0x03" : "0x01", + "0x04" : "0x1000000000000000000000000000000000000002", + "0x07" : "0x03" + } } } - ], - "EIP158" : [ - { - "hash" : "0x12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x2b22357b48c2d396726a13e3eed3e61a6ee67351051154572f734c4090796124", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2b22357b48c2d396726a13e3eed3e61a6ee67351051154572f734c4090796124", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] (CALL 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 2 ]] (CALLCODE 250000 0x1000000000000000000000000000000000000003 3 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +82,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json index e701cbefe..813a8facd 100644 --- a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json +++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json @@ -2,102 +2,93 @@ "callcallcallcode_001_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGEFiller.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" : "0x7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x01", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x606981436db0f6678cdf2891f26f52bd2659a6649d3c709acda4bf161b59c7c2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x606981436db0f6678cdf2891f26f52bd2659a6649d3c709acda4bf161b59c7c2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x60016003556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (MSTORE 3 1)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +98,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json index a9dc2a5ed..c4d7ebcb2 100644 --- a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json +++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json @@ -2,102 +2,130 @@ "callcallcallcode_001_OOGMAfter" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMAfterFiller.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" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1)}", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +135,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json index 78ebaf65f..37246aa95 100644 --- a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json +++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json @@ -2,102 +2,90 @@ "callcallcallcode_001_OOGMBefore" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.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" : "0x9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x6e70eb4863af52fd076d45371513ff49043c76b06c11ef2bba4d4ab8edf33aba", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x6e70eb4863af52fd076d45371513ff49043c76b06c11ef2bba4d4ab8edf33aba", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (MSTORE 3 1) [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +95,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json index b14b8eab1..f1092f90a 100644 --- a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json +++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json @@ -2,102 +2,73 @@ "callcallcallcode_001_SuicideEnd" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.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" : "0x690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "balance" : "20000000000" + }, + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x5ee6eeb669c1d7a7e71592eb8cb5a34c0375a8996d698e02f565fbf18da69705", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5ee6eeb669c1d7a7e71592eb8cb5a34c0375a8996d698e02f565fbf18da69705", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +78,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json index 5c77f5b51..d5938fc94 100644 --- a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json +++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json @@ -2,102 +2,77 @@ "callcallcallcode_001_SuicideMiddle" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.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" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1000000010000000000", + "storage" : { + "0x00" : "0x01" + } + }, + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x731000000000000000000000000000000000000000ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +82,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json index 0feca28c2..1e8a7a786 100644 --- a/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json +++ b/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json @@ -2,95 +2,113 @@ "callcallcallcode_ABCB_RECURSIVE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0xb2d05e00", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "3000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xd60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "566210" } } - ], - "EIP158" : [ - { - "hash" : "0xd60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x5cfc164fa79f7a1ed6e4c96e479a96efdb50a7c14eb59af4016b1f0de169504e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5cfc164fa79f7a1ed6e4c96e479a96efdb50a7c14eb59af4016b1f0de169504e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "568190" } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 1000000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALLCODE 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +118,14 @@ "" ], "gasLimit" : [ - "0x01c9c380" + "30000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcode_01.json b/GeneralStateTests/stCallCodes/callcallcode_01.json index 61aa25a3d..9ee413046 100644 --- a/GeneralStateTests/stCallCodes/callcallcode_01.json +++ b/GeneralStateTests/stCallCodes/callcallcode_01.json @@ -2,95 +2,70 @@ "callcallcode_01" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01Filler.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" : "0x9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x01", + "0x04" : "0x1000000000000000000000000000000000000001", + "0x07" : "0x02", + "0xe6" : "0x1000000000000000000000000000000000000001", + "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0xec" : "0x40", + "0xee" : "0x21", + "0xf0" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x54475c6c67f504eace680150ef531ece0daf0181a5b469f8c369a5c74c1ce53c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x54475c6c67f504eace680150ef531ece0daf0181a5b469f8c369a5c74c1ce53c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] (CALLCODE 250000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +75,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json b/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json index 57ede26b3..ddc978dfe 100644 --- a/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json +++ b/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json @@ -2,95 +2,75 @@ "callcallcode_01_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_OOGEFiller.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" : "0xa4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe4209a1b867017e6b14927afeeed7d1129d53ecf7d18a29c7ee4b0ffa2a313a1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe4209a1b867017e6b14927afeeed7d1129d53ecf7d18a29c7ee4b0ffa2a313a1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60016002556001600252", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) (MSTORE 2 1)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +80,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json index a125eb48d..de1630b92 100644 --- a/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json +++ b/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json @@ -2,95 +2,66 @@ "callcallcode_01_SuicideEnd" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.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" : "0xd56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1000000010000000000" + }, + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "storage" : { + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xd56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3618f0634e258733a71ad69de3d642b67e8eb7d30ed210514e7fd231c80e7370", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x3618f0634e258733a71ad69de3d642b67e8eb7d30ed210514e7fd231c80e7370", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x6001600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 2 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +71,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010.json b/GeneralStateTests/stCallCodes/callcallcodecall_010.json index f49851ba2..1fc1809be 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecall_010.json +++ b/GeneralStateTests/stCallCodes/callcallcodecall_010.json @@ -2,102 +2,82 @@ "callcallcodecall_010" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010Filler.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" : "0xbc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x014a" : "0x1000000000000000000000000000000000000003", + "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x0150" : "0x40", + "0x0152" : "0x26", + "0x0154" : "0x01", + "0x03" : "0x01", + "0x04" : "0x1000000000000000000000000000000000000001", + "0x07" : "0x03" + } } } - ], - "EIP158" : [ - { - "hash" : "0xbc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa71dce458a63645998a19a4c2f2c3bf68fb56b070835a91ae29d8ff94eb83d4d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa71dce458a63645998a19a4c2f2c3bf68fb56b070835a91ae29d8ff94eb83d4d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xbc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] (CALLCODE 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 2 ]] (CALL 250000 0x1000000000000000000000000000000000000003 3 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +87,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json index a95c7d625..bb3de54e4 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json +++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json @@ -2,102 +2,93 @@ "callcallcodecall_010_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGEFiller.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" : "0x0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x01", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4df6a657dc1699015b3105c69f85f344c8f02a0a67c7ea525d04382f4193a24e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x4df6a657dc1699015b3105c69f85f344c8f02a0a67c7ea525d04382f4193a24e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x60016003556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (MSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +98,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json index 114f9e7cb..78aeca667 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json +++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json @@ -2,102 +2,136 @@ "callcallcodecall_010_OOGMAfter" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMAfterFiller.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" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +141,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json index ea0fc1ade..1c23c7b57 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json +++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json @@ -2,102 +2,93 @@ "callcallcodecall_010_OOGMBefore" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.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" : "0x50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x88eb1770368d56d4c62fdef02d85cbe710724cef84e492c5360fe635ff3eedda", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x88eb1770368d56d4c62fdef02d85cbe710724cef84e492c5360fe635ff3eedda", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (MSTORE 3 1) [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +98,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json index 69625c0ee..371487067 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json +++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json @@ -2,102 +2,77 @@ "callcallcodecall_010_SuicideEnd" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.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" : "0xb6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "storage" : { + "0x03" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xb6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x308b378d2e435c0692646066af5f00b554ff5b3a2c9ebfee622d34231ded98fc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x308b378d2e435c0692646066af5f00b554ff5b3a2c9ebfee622d34231ded98fc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +82,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json index 5e82b9805..e371fd71a 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json +++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json @@ -2,102 +2,83 @@ "callcallcodecall_010_SuicideMiddle" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.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" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1000000010000000000", + "storage" : { + "0x00" : "0x01" + } + }, + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x731000000000000000000000000000000000000000ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +88,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json index 10b0208ef..fcc0c32d7 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json +++ b/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json @@ -2,95 +2,113 @@ "callcallcodecall_ABCB_RECURSIVE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0xb2d05e00", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "3000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xc6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "566210" } } - ], - "EIP158" : [ - { - "hash" : "0xc6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x28b46965732d9fed6925f56bd10ae0df42205d903c9c0b51f8c6b6295f6ead44", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x28b46965732d9fed6925f56bd10ae0df42205d903c9c0b51f8c6b6295f6ead44", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xc6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "568190" } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 1000000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALL 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +118,14 @@ "" ], "gasLimit" : [ - "0x01c9c380" + "30000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json index cad443ff9..419cc3e70 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json +++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json @@ -2,102 +2,78 @@ "callcallcodecallcode_011" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011Filler.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" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x014a" : "0x1000000000000000000000000000000000000001", + "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x0150" : "0x40", + "0x0152" : "0x26", + "0x0154" : "0x01", + "0x02" : "0x01", + "0x03" : "0x01", + "0x04" : "0x1000000000000000000000000000000000000001", + "0x07" : "0x03" + } } } - ], - "EIP158" : [ - { - "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4257fafde1d6f617828d567841b0331101f8240fa2a7f4518318c7ee5439e487", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x4257fafde1d6f617828d567841b0331101f8240fa2a7f4518318c7ee5439e487", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] (CALLCODE 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 2 ]] (CALLCODE 250000 0x1000000000000000000000000000000000000003 3 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +83,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json index bb80ebc4b..186ed57d0 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json +++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json @@ -2,102 +2,91 @@ "callcallcodecallcode_011_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGEFiller.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" : "0x666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x80287ae33d156b8057b1c5242a8de40c31d2c1a2e79a2939594359ece6055df5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x80287ae33d156b8057b1c5242a8de40c31d2c1a2e79a2939594359ece6055df5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x60016003556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (MSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +96,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json index da155a101..8a93c0dfb 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json +++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json @@ -2,102 +2,130 @@ "callcallcodecallcode_011_OOGMAfter" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.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" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +135,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json index d83a55f75..18d48562a 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json +++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json @@ -2,102 +2,90 @@ "callcallcodecallcode_011_OOGMBefore" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.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" : "0x29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x9584516d9633bace4678666471e26662982dcd9c842c62e00c9c9ff2ada13b15", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x9584516d9633bace4678666471e26662982dcd9c842c62e00c9c9ff2ada13b15", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (MSTORE 3 1) [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +95,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json index 547d576d5..e625d53fb 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json +++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json @@ -2,102 +2,72 @@ "callcallcodecallcode_011_SuicideEnd" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.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" : "0x6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf43c5e45844f6bbb7b0a55cef021b13121fecab88793bdf5dea426825d17f9e5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf43c5e45844f6bbb7b0a55cef021b13121fecab88793bdf5dea426825d17f9e5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +77,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json index d4c25adb9..80bf96928 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json +++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json @@ -2,102 +2,86 @@ "callcallcodecallcode_011_SuicideMiddle" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.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" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1000000010000000000", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x731000000000000000000000000000000000000000ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +91,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json index 187b050cc..220e9b92e 100644 --- a/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json +++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json @@ -2,95 +2,113 @@ "callcallcodecallcode_ABCB_RECURSIVE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0xb2d05e00", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "3000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xd2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "566210" } } - ], - "EIP158" : [ - { - "hash" : "0xd2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe3ad647f45f66170708956d7148b3e3b7a092def6a2399d27be7fbfbdea4230f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe3ad647f45f66170708956d7148b3e3b7a092def6a2399d27be7fbfbdea4230f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "568190" } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALL 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 1000000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALLCODE 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +118,14 @@ "" ], "gasLimit" : [ - "0x01c9c380" + "30000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodeDynamicCode.json b/GeneralStateTests/stCallCodes/callcodeDynamicCode.json index 5ed9090b5..cfaa20e13 100644 --- a/GeneralStateTests/stCallCodes/callcodeDynamicCode.json +++ b/GeneralStateTests/stCallCodes/callcodeDynamicCode.json @@ -2,88 +2,87 @@ "callcodeDynamicCode" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x70c391c82965c0b9b701f5175b9f417a873e923e8742b5e9bff4413541ccde63", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150", + "EIP150" + ], + "result" : { + "13136008b64ff592819b2fa6d43f2835c452020e" : { + "balance" : "0x00", + "storage" : { + "0x00" : "0x01", + "0x0a" : "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6", + "0x0b" : "0x01", + "0x14" : "0x13136008b64ff592819b2fa6d43f2835c452020e" + } + }, + "ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : { + "balance" : "0x01" } } - ], - "EIP158" : [ - { - "hash" : "0x41e3f2ade5c27789716737d703559dd8a53f868baf7a876c408fcdb48d0df9b7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x17388b6d68e240d2ac5841e36517ca05e9c61adc44787471fc40e5683f8279c3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x17388b6d68e240d2ac5841e36517ca05e9c61adc44787471fc40e5683f8279c3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x41e3f2ade5c27789716737d703559dd8a53f868baf7a876c408fcdb48d0df9b7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : "EIP158", + "result" : { + "13136008b64ff592819b2fa6d43f2835c452020e" : { + "balance" : "0x00", + "storage" : { + "0x00" : "0", + "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585", + "0x0b" : "0x01", + "0x14" : "0" + } + }, + "568a95f77b047bece6aa68843d2019332c46a585" : { + "balance" : "0x01" } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x2710", - "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "10000", + "code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b662) \t\t\t\t (MSTORE 64 0x0186a0f2600b5500000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x03e8", - "code" : "0x6460016000556000526005601b6001f0", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000", + "code" : "{ (MSTORE 0 0x6001600055) (CREATE 1 27 5) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x2386f26fc10000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +92,14 @@ "" ], "gasLimit" : [ - "0x06e9d9" + "453081" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json b/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json index 525031387..f54b532a8 100644 --- a/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json +++ b/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json @@ -2,81 +2,50 @@ "callcodeDynamicCode2SelfCall" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCode2SelfCallFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x80cee8031b01b19740fac1888ec0628fd5b24b70f0eebfb44dfcbda5f4d5aea4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "13136008b64ff592819b2fa6d43f2835c452020e" : { + "balance" : "0x01", + "storage" : { + "0x0b" : "0x01", + "0x0c" : "0x1000000000000000000000000000000000000000" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdf2b5e393c8e61ef04550e38a3c53b87016b34d93a995b6b1709c0a19d1addad", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x53b3500d29c4ac1cc8db0f5403c0c35c256e9bff7ada5a8a35c99f805dc0e72f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x53b3500d29c4ac1cc8db0f5403c0c35c256e9bff7ada5a8a35c99f805dc0e72f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdf2b5e393c8e61ef04550e38a3c53b87016b34d93a995b6b1709c0a19d1addad", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x2710", - "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "10000", + "code" : "{ (MSTORE 0 0x604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e62) (MSTORE 32 0x0186a0f2600b5533600c55000000000000000000000000000000000000000000) \t\t\t\t (CREATE 1 0 64) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x2386f26fc10000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x06e9d9" + "453081" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodeEmptycontract.json b/GeneralStateTests/stCallCodes/callcodeEmptycontract.json index 911656c56..6448bf481 100644 --- a/GeneralStateTests/stCallCodes/callcodeEmptycontract.json +++ b/GeneralStateTests/stCallCodes/callcodeEmptycontract.json @@ -2,81 +2,46 @@ "callcodeEmptycontract" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeEmptycontractFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : "ALL", + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x95716e7d0b244da6a57bacc2a981d4777c44a208820153c67224112315fbc985", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x95716e7d0b244da6a57bacc2a981d4777c44a208820153c67224112315fbc985", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x03e8", - "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000", + "code" : "{ [[ 0 ]] (CALLCODE 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1000 0 64 0 64 )}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0f4240", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +51,14 @@ "" ], "gasLimit" : [ - "0x019a54" + "105044" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json index cd442a992..336e5ac03 100644 --- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json +++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json @@ -2,81 +2,47 @@ "callcodeInInitcodeToEmptyContract" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToEmptyContractFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf210d64ccb8593d338544f76f6f758a1bcb01c82acf4177e18648a086a32a008", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : "ALL", + "result" : { + "13136008b64ff592819b2fa6d43f2835c452020e" : { + "balance" : "0x01", + "storage" : { + "0x00" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xbe3b36e7cf22ba2ac86dcac37b66b60ef96e0d28616df36251cb7de9aa2500aa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x157885c99eb23c5285e43296833a84e14e978aaa0f4a550b3bd6dde8a0ee734f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x157885c99eb23c5285e43296833a84e14e978aaa0f4a550b3bd6dde8a0ee734f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xbe3b36e7cf22ba2ac86dcac37b66b60ef96e0d28616df36251cb7de9aa2500aa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x2710", - "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "10000", + "code" : "{ (MSTORE 0 0x6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b562) (MSTORE 32 0x0186a0f260005500000000000000000000000000000000000000000000000000) (CREATE 1 0 64) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x2386f26fc10000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +52,14 @@ "" ], "gasLimit" : [ - "0x06e9d9" + "453081" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json index 2c0792c44..4c6e971b6 100644 --- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json +++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json @@ -2,88 +2,55 @@ "callcodeInInitcodeToExisContractWithVTransferNEMoney" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoneyFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xbe6656bd52c7659c81827a5c684c5b08426e3027dbc6575d22aa16b974e04ec5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : "ALL", + "result" : { + "13136008b64ff592819b2fa6d43f2835c452020e" : { + "balance" : "0x01", + "storage" : { + "0x00" : "0x00", + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x5d8fbaea35718275758ade9e78b2d8c64469cff78bd85a8a11a8c4691208b534", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa94d8401ace9ce65aa88b52d16096f872a7b3b21b1a3302324ec51de1bb314f7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa94d8401ace9ce65aa88b52d16096f872a7b3b21b1a3302324ec51de1bb314f7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x5d8fbaea35718275758ade9e78b2d8c64469cff78bd85a8a11a8c4691208b534", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x2710", - "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "10000", + "code" : "{ (MSTORE 0 0x6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b562) (MSTORE 32 0x0186a0f260005500000000000000000000000000000000000000000000000000) (CREATE 1 0 64) }", + "nonce" : "0", "storage" : { } }, - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x00", - "code" : "0x6001600255", - "nonce" : "0x00", + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x2386f26fc10000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +60,14 @@ "" ], "gasLimit" : [ - "0x06e9d9" + "453081" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json index b7052c5ba..ac54f1aa4 100644 --- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json +++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json @@ -2,95 +2,63 @@ "callcodeInInitcodeToExistingContract" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x84551be7bbc2416c4482dae32daacb4447c5aaedd36da87713f4fe49781f61e0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : "ALL", + "result" : { + "13136008b64ff592819b2fa6d43f2835c452020e" : { + "balance" : "0x01", + "storage" : { + "0x00" : "0x01", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x0e9e704dc511c55b64b545eb97670caee07ad2c2b01d6c85b07748893ccf097f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x7e27ab28a19de7010592bfeb0b95bdc06e207a0ce56388dcf1fc92ade2abeb3c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x7e27ab28a19de7010592bfeb0b95bdc06e207a0ce56388dcf1fc92ade2abeb3c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x0e9e704dc511c55b64b545eb97670caee07ad2c2b01d6c85b07748893ccf097f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x2710", - "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "10000", + "code" : "{ (MSTORE 0 0x6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b562) (MSTORE 32 0x0186a0f260005500000000000000000000000000000000000000000000000000) (CREATE 1 0 64) }", + "code2" : "{ (MSTORE 0 0x6001600155600260025560036003556004600455600560055560066006556007) (MSTORE 32 0x60075560086008556009600955600a600a550000000000000000000000000000) (CREATE 1 0 64) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x03e8", - "code" : "0x6460016000556000526005601b6001f0", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000", + "code" : "{ (MSTORE 0 0x6001600055) (CREATE 1 27 5) }", + "nonce" : "0", "storage" : { } }, - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x00", - "code" : "0x6001600255", - "nonce" : "0x00", + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x2386f26fc10000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +68,14 @@ "" ], "gasLimit" : [ - "0x06e9d9" + "453081" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json index 494d3f826..f91ad3997 100644 --- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json +++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json @@ -2,88 +2,55 @@ "callcodeInInitcodeToExistingContractWithValueTransfer" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransferFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf12e898bcf64ff2fbc15cdd1455b9eed5b57d45b2e9daf5b5ce4446c5f02fc0e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : "ALL", + "result" : { + "13136008b64ff592819b2fa6d43f2835c452020e" : { + "balance" : "0x05", + "storage" : { + "0x00" : "0x01", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf98edc3fae7714d4f245414565d74b69a221627c7fdf7783a4cfc2f83951d5fa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x51937cc2ddfdd89ecd073f53256f00a7e0497e5a9494d2dac6a63dd6b5bb0548", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x51937cc2ddfdd89ecd073f53256f00a7e0497e5a9494d2dac6a63dd6b5bb0548", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf98edc3fae7714d4f245414565d74b69a221627c7fdf7783a4cfc2f83951d5fa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x2710", - "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "10000", + "code" : "{ (MSTORE 0 0x6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b562) (MSTORE 32 0x0186a0f260005500000000000000000000000000000000000000000000000000) (CREATE 5 0 64) }", + "nonce" : "0", "storage" : { } }, - "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "0x00", - "code" : "0x6001600255", - "nonce" : "0x00", + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x2386f26fc10000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +60,14 @@ "" ], "gasLimit" : [ - "0x06e9d9" + "453081" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "" ] } } diff --git a/GeneralStateTests/stCallCodes/callcode_checkPC.json b/GeneralStateTests/stCallCodes/callcode_checkPC.json index aa1f33b44..839752d09 100644 --- a/GeneralStateTests/stCallCodes/callcode_checkPC.json +++ b/GeneralStateTests/stCallCodes/callcode_checkPC.json @@ -2,88 +2,58 @@ "callcode_checkPC" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcode_checkPCFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0xb2d05e00", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "3000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150", + "EIP158" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x03" : "0x25" + } } } - ], - "EIP158" : [ - { - "hash" : "0x62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4d8ba7f5982eec7fb7309a002e047fdf47d5e54f6e75077d3b7ad2c4601c1212", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x4d8ba7f5982eec7fb7309a002e047fdf47d5e54f6e75077d3b7ad2c4601c1212", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ (CALL 1000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) [[3]] (PC)}", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +63,14 @@ "" ], "gasLimit" : [ - "0x01c9c380" + "30000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecall_10.json b/GeneralStateTests/stCallCodes/callcodecall_10.json index acabb9f1d..f060ec9ce 100644 --- a/GeneralStateTests/stCallCodes/callcodecall_10.json +++ b/GeneralStateTests/stCallCodes/callcodecall_10.json @@ -2,95 +2,75 @@ "callcodecall_10" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10Filler.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" : "0x472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x01", + "0x04" : "0x1000000000000000000000000000000000000000", + "0x07" : "0x02", + "0xe6" : "0x1000000000000000000000000000000000000002", + "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0xec" : "0x40", + "0xee" : "0x21", + "0xf0" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x266f3efb4679756e79477cfa28d932bc5118d5e95ec131b92ceef8c5e2a54dd5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x266f3efb4679756e79477cfa28d932bc5118d5e95ec131b92ceef8c5e2a54dd5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] (CALL 250000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +80,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json b/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json index 89221ddd0..f43a3bea2 100644 --- a/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json +++ b/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json @@ -2,95 +2,76 @@ "callcodecall_10_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_OOGEFiller.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" : "0x721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa8759b2e9bc8080233d0170205eae59883131a8d420bc15d4aa04af39d3ad190", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa8759b2e9bc8080233d0170205eae59883131a8d420bc15d4aa04af39d3ad190", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 20020 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60016002556001600252", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) (MSTORE 2 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +81,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json index e2112c724..56cc49531 100644 --- a/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json +++ b/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json @@ -2,95 +2,70 @@ "callcodecall_10_SuicideEnd" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.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" : "0xa69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "storage" : { + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x6232a655eb075819b41b8c54e2c83c8730b5f42ff7f3820a58c13cf9ce1aa981", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x6232a655eb075819b41b8c54e2c83c8730b5f42ff7f3820a58c13cf9ce1aa981", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x6001600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 2 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +75,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100.json b/GeneralStateTests/stCallCodes/callcodecallcall_100.json index 1bcb322a4..e1eeefdbc 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcall_100.json +++ b/GeneralStateTests/stCallCodes/callcodecallcall_100.json @@ -2,102 +2,87 @@ "callcodecallcall_100" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100Filler.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" : "0x6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x014a" : "0x1000000000000000000000000000000000000003", + "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x0150" : "0x40", + "0x0152" : "0x26", + "0x0154" : "0x01", + "0x03" : "0x01", + "0x04" : "0x1000000000000000000000000000000000000002", + "0x07" : "0x03" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe9985e3c4b096bca71be68fe77a32bcb50eb2e96aaa63108daebefe1145c214f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe9985e3c4b096bca71be68fe77a32bcb50eb2e96aaa63108daebefe1145c214f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] (CALL 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 2 ]] (CALL 250000 0x1000000000000000000000000000000000000003 3 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +92,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json index 6446d634a..9281faee6 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json +++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json @@ -2,102 +2,91 @@ "callcodecallcall_100_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGEFiller.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" : "0x62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa97379ff11a8f6bd9d3ae4f08d89c39768ce1c9ddd45df89e2c292a7d07d7c7d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa97379ff11a8f6bd9d3ae4f08d89c39768ce1c9ddd45df89e2c292a7d07d7c7d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x60016003556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (MSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +96,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json index 8aefa3867..465db93cc 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json +++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json @@ -2,102 +2,132 @@ "callcodecallcall_100_OOGMAfter" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMAfterFiller.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" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +137,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json index 00b27b40a..47edf76e1 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json +++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json @@ -2,102 +2,96 @@ "callcodecallcall_100_OOGMBefore" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.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" : "0x2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8902ce31717fb761ac67ebbe8ac240ca6f886a65b2ccbf57e00d9afe10b4d6c8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8902ce31717fb761ac67ebbe8ac240ca6f886a65b2ccbf57e00d9afe10b4d6c8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (MSTORE 3 1) [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +101,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json index e96ec3ec4..1592e8200 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json +++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json @@ -2,102 +2,83 @@ "callcodecallcall_100_SuicideEnd" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.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" : "0x6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "balance" : "20000000000", + "storage" : { + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "storage" : { + "0x03" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8de9ffdf6b2b0f4048d30b61853c0ef89c4499a1d6a1846251d8d6d7cbddbd88", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8de9ffdf6b2b0f4048d30b61853c0ef89c4499a1d6a1846251d8d6d7cbddbd88", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +88,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json index 7102d208e..e22cdc443 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json +++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json @@ -2,102 +2,77 @@ "callcodecallcall_100_SuicideMiddle" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.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" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1000000010000000000", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x731000000000000000000000000000000000000000ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +82,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json index fa4cc8578..d34dc5bb3 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json +++ b/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json @@ -2,95 +2,113 @@ "callcodecallcall_ABCB_RECURSIVE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0xb2d05e00", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "3000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xb45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "566210" } } - ], - "EIP158" : [ - { - "hash" : "0xb45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa8670ec8bd38fd68db357ce1257b4ba7e9892058ace8f14b056bec60429c24cc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa8670ec8bd38fd68db357ce1257b4ba7e9892058ace8f14b056bec60429c24cc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "568190" } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 1000000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALL 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +118,14 @@ "" ], "gasLimit" : [ - "0x01c9c380" + "30000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json index ae5c214e2..c03f86f9d 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json +++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json @@ -2,102 +2,83 @@ "callcodecallcallcode_101" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101Filler.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" : "0xfcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x014a" : "0x1000000000000000000000000000000000000002", + "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x0150" : "0x40", + "0x0152" : "0x26", + "0x0154" : "0x01", + "0x02" : "0x01", + "0x03" : "0x01", + "0x04" : "0x1000000000000000000000000000000000000002", + "0x07" : "0x03" + } } } - ], - "EIP158" : [ - { - "hash" : "0xfcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x47f86a353d296fe9530a92d8d937ba8051749ad0093cc65b9909c5bd260ddbef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x47f86a353d296fe9530a92d8d937ba8051749ad0093cc65b9909c5bd260ddbef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xfcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] (CALL 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 2 ]] (CALLCODE 250000 0x1000000000000000000000000000000000000003 3 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +88,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json index 86e7bfc4f..1a2c30abe 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json +++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json @@ -2,102 +2,91 @@ "callcodecallcallcode_101_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGEFiller.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" : "0x22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x76e969488ba038d1f803ac5bdc231914f22868a7791c19759cef1f98eb616036", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x76e969488ba038d1f803ac5bdc231914f22868a7791c19759cef1f98eb616036", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x60016003556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (MSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +96,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json index 83db2eaf7..fd8dea0b6 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json +++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json @@ -2,102 +2,136 @@ "callcodecallcallcode_101_OOGMAfter" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.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" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +141,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json index 94525731c..c0ab2af65 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json +++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json @@ -2,102 +2,93 @@ "callcodecallcallcode_101_OOGMBefore" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.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" : "0xf116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x0b2d2acfc533d00543a6357fc5c7719c9ed811cb06c83f14d89479b64f338e3e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x0b2d2acfc533d00543a6357fc5c7719c9ed811cb06c83f14d89479b64f338e3e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (MSTORE 3 1) [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +98,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json index 604ef040a..5c676130c 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json +++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json @@ -2,102 +2,76 @@ "callcodecallcallcode_101_SuicideEnd" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.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" : "0x561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "balance" : "20000000000", + "storage" : { + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x36322aecd24ccc418a4542b24ef71f7a067927b59f62e71835e62f984f8a28e9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x36322aecd24ccc418a4542b24ef71f7a067927b59f62e71835e62f984f8a28e9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +81,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json index 0a024802a..c7ef22edc 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json +++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json @@ -2,102 +2,85 @@ "callcodecallcallcode_101_SuicideMiddle" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.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" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "balance" : "1000000010000000000", + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "storage" : { + "0x02" : "0x00", + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x731000000000000000000000000000000000000000ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +90,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json index 3b738f5ed..0451d7914 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json +++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json @@ -2,95 +2,113 @@ "callcodecallcallcode_ABCB_RECURSIVE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0xb2d05e00", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "3000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "566210" } } - ], - "EIP158" : [ - { - "hash" : "0x759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x843fc7bc4ac97ee198931f09665467525e5846bf6674622420f0e0173b89bba4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x843fc7bc4ac97ee198931f09665467525e5846bf6674622420f0e0173b89bba4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "568190" } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALL 1000000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALLCODE 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +118,14 @@ "" ], "gasLimit" : [ - "0x01c9c380" + "30000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcode_11.json b/GeneralStateTests/stCallCodes/callcodecallcode_11.json index 61ed0ffa7..113af973b 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcode_11.json +++ b/GeneralStateTests/stCallCodes/callcodecallcode_11.json @@ -2,95 +2,71 @@ "callcodecallcode_11" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11Filler.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" : "0xe4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01", + "0x04" : "0x1000000000000000000000000000000000000000", + "0x07" : "0x02", + "0xe6" : "0x1000000000000000000000000000000000000000", + "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0xec" : "0x40", + "0xee" : "0x21", + "0xf0" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xe4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x1e91f9f6bd10a082c5f0479183a3d41204222a29742643fc84dfa9a2de54aba0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x1e91f9f6bd10a082c5f0479183a3d41204222a29742643fc84dfa9a2de54aba0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] (CALLCODE 250000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +76,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json index 04a8aa2e5..e518cfac7 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json +++ b/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json @@ -2,95 +2,81 @@ "callcodecallcode_11_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_OOGEFiller.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" : "0xdd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150", + "EIP158" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xdb627612dc00ed5e1bebb241a2b7afd3673ced5f63aa54f857dd0019e678be46", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xdb627612dc00ed5e1bebb241a2b7afd3673ced5f63aa54f857dd0019e678be46", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60016002556001600252", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) (MSTORE 2 1)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +86,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json index 44463af12..efd291512 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json +++ b/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json @@ -2,95 +2,70 @@ "callcodecallcode_11_SuicideEnd" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.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" : "0x2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "storage" : { + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x77a4a1939bcb8b911d5b69a23096e346391cca0cefd06ef641b170fe26b76a15", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x77a4a1939bcb8b911d5b69a23096e346391cca0cefd06ef641b170fe26b76a15", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x6001600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 2 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +75,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json index 48f51e572..45e7b2f01 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json @@ -2,102 +2,83 @@ "callcodecallcodecall_110" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110Filler.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" : "0x4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x01" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x014a" : "0x1000000000000000000000000000000000000003", + "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x0150" : "0x40", + "0x0152" : "0x26", + "0x0154" : "0x01", + "0x03" : "0x01", + "0x04" : "0x1000000000000000000000000000000000000000", + "0x07" : "0x03" + } } } - ], - "EIP158" : [ - { - "hash" : "0x4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8c09b408926871f45ed297bfcd62b07c7533028974f674f4339db37bd9bb377d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8c09b408926871f45ed297bfcd62b07c7533028974f674f4339db37bd9bb377d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] (CALLCODE 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 2 ]] (CALL 250000 0x1000000000000000000000000000000000000003 3 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +88,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json index b2370cc31..e092e8d35 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json @@ -2,102 +2,92 @@ "callcodecallcodecall_110_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGEFiller.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" : "0xea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xb52e03c0be692b82645ba31689fa02476182151b640932e8f1f1542e2effc2df", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xb52e03c0be692b82645ba31689fa02476182151b640932e8f1f1542e2effc2df", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x60016003556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (MSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +97,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json index b887c896c..a673c3874 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json @@ -2,102 +2,136 @@ "callcodecallcodecall_110_OOGMAfter" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.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" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +141,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json index 05a422c0f..2119b5f7c 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json @@ -2,102 +2,94 @@ "callcodecallcodecall_110_OOGMBefore" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.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" : "0xc29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xc29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x0e376cf2634acda351764523c146b31455f32a40abe4ec2218b24b48c730f573", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x0e376cf2634acda351764523c146b31455f32a40abe4ec2218b24b48c730f573", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xc29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (MSTORE 3 1) [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +99,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json index 6feb41347..dd5501bd9 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json @@ -2,102 +2,73 @@ "callcodecallcodecall_110_SuicideEnd" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.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" : "0xd9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "balance" : "1000000010000000000" + }, + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "storage" : { + "0x03" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xd9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x58797699a95dcbbc5692efe394ff177bb2bff2ac3a6846cb9480eeb49a4efaec", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x58797699a95dcbbc5692efe394ff177bb2bff2ac3a6846cb9480eeb49a4efaec", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +78,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json index 1032c5556..fe2f11d88 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json @@ -2,102 +2,84 @@ "callcodecallcodecall_110_SuicideMiddle" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.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" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "storage" : { + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x731000000000000000000000000000000000000000ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +89,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json index 35f0a4f4a..a47e349b9 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json @@ -2,95 +2,113 @@ "callcodecallcodecall_ABCB_RECURSIVE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0xb2d05e00", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "3000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xcfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "566210" } } - ], - "EIP158" : [ - { - "hash" : "0xcfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x2bba4d9c82761de3e6014ee9ed7d1f97fd6e4c6819034126d611e8a273509a1b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2bba4d9c82761de3e6014ee9ed7d1f97fd6e4c6819034126d611e8a273509a1b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xcfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "568190" } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 1000000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALL 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +118,14 @@ "" ], "gasLimit" : [ - "0x01c9c380" + "30000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json index 5e3c383b8..f0a019479 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json @@ -2,102 +2,79 @@ "callcodecallcodecallcode_111" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111Filler.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" : "0xf4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x014a" : "0x1000000000000000000000000000000000000000", + "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x0150" : "0x40", + "0x0152" : "0x26", + "0x0154" : "0x01", + "0x02" : "0x01", + "0x03" : "0x01", + "0x04" : "0x1000000000000000000000000000000000000000", + "0x07" : "0x03" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x30318df71268d521be11e6603e58f1895ee8a08ff83fbcffdf7b516bbf603f9a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x30318df71268d521be11e6603e58f1895ee8a08ff83fbcffdf7b516bbf603f9a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 1 ]] (CALLCODE 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 2 ]] (CALLCODE 250000 0x1000000000000000000000000000000000000003 3 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +84,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json index 6bab061a9..2fa4a96b4 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json @@ -2,102 +2,91 @@ "callcodecallcodecallcode_111_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.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" : "0xdf1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdf1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3299b2945c527e8915e7cddf86273d80c4fd08b40e6961036d5eb102f5370f1d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x3299b2945c527e8915e7cddf86273d80c4fd08b40e6961036d5eb102f5370f1d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdf1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x60016003556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) (MSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +96,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json index ed48b6672..a5fd293ed 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json @@ -2,102 +2,136 @@ "callcodecallcodecallcode_111_OOGMAfter" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.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" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +141,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json index 65bbb5c8c..af52f55d9 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json @@ -2,102 +2,92 @@ "callcodecallcodecallcode_111_OOGMBefore" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.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" : "0xd8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00", + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xd8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x719bf7118658117cc1ef6d2fc778e3a1257c0c5ce8a260dae629440cf839ad78", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x719bf7118658117cc1ef6d2fc778e3a1257c0c5ce8a260dae629440cf839ad78", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (MSTORE 3 1) [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x00", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "0", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +97,14 @@ "" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json index 4ee3a75da..d6a871bdf 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json @@ -2,102 +2,75 @@ "callcodecallcodecallcode_111_SuicideEnd" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.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" : "0x792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000001" : { + "balance" : "1000000010000000000" + }, + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x403b618a588daef088c707e25def251aa42c083092904234db5cccfff1689a7e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x403b618a588daef088c707e25def251aa42c083092904234db5cccfff1689a7e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +80,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json index 5d8461e0f..9770ce8de 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json @@ -2,102 +2,87 @@ "callcodecallcodecallcode_111_SuicideMiddle" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.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" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "shouldnotexist" : "1" + }, + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "storage" : { + "0x03" : "0x00" + } + }, + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "storage" : { + "0x03" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x731000000000000000000000000000000000000000ff", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000003" : { - "balance" : "0x02540be400", - "code" : "0x6001600355", - "nonce" : "0x00", + "1000000000000000000000000000000000000003" : { + "balance" : "10000000000", + "code" : "{ (SSTORE 3 1) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -107,14 +92,14 @@ "" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json index 8a8d9fd39..bb7c89b50 100644 --- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json +++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json @@ -2,95 +2,113 @@ "callcodecallcodecallcode_ABCB_RECURSIVE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0xb2d05e00", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "3000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xd7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "566210" } } - ], - "EIP158" : [ - { - "hash" : "0xd7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa62ec476ec7b2c034e5ddb7d512640e509e8f000c306f596881163fb6ac48ad0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa62ec476ec7b2c034e5ddb7d512640e509e8f000c306f596881163fb6ac48ad0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x01" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "568190" } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE 25000000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x02540be400", - "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "10000000000", + "code" : "{ [[ 1 ]] (CALLCODE 1000000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x02540be400", - "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "10000000000", + "code" : "{ [[ 2 ]] (CALLCODE 500000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -100,14 +118,14 @@ "" ], "gasLimit" : [ - "0x01c9c380" + "30000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } |