diff options
Diffstat (limited to 'GeneralStateTests/stRefundTest')
19 files changed, 1681 insertions, 1175 deletions
diff --git a/GeneralStateTests/stRefundTest/refund50_1.json b/GeneralStateTests/stRefundTest/refund50_1.json index ef880b24a..9d57a59d8 100644 --- a/GeneralStateTests/stRefundTest/refund50_1.json +++ b/GeneralStateTests/stRefundTest/refund50_1.json @@ -6,43 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund50_1Filler.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - } + "post" : { + "EIP150" : [ + { + "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "23015" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "76985", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 }", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x60006001556000600255600060035560006004556000600555", + "nonce" : "0x00", "storage" : { "0x01" : "0x01", "0x02" : "0x01", @@ -51,10 +88,10 @@ "0x05" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0186a0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -64,14 +101,14 @@ "" ], "gasLimit" : [ - "100000" + "0x0186a0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRefundTest/refund50_2.json b/GeneralStateTests/stRefundTest/refund50_2.json index f54e672e1..ca4868898 100644 --- a/GeneralStateTests/stRefundTest/refund50_2.json +++ b/GeneralStateTests/stRefundTest/refund50_2.json @@ -6,45 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund50_2Filler.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x0a" : "0x01", - "0x0b" : "0x01" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "43021" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "56979", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 10 ]] 1 [[ 11 ]] 1 [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 }", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6001600a556001600b5560006001556000600255600060035560006004556000600555", + "nonce" : "0x00", "storage" : { "0x01" : "0x01", "0x02" : "0x01", @@ -53,10 +88,10 @@ "0x05" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0186a0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -66,14 +101,14 @@ "" ], "gasLimit" : [ - "100000" + "0x0186a0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRefundTest/refund50percentCap.json b/GeneralStateTests/stRefundTest/refund50percentCap.json index 0a871e2ad..5d44f8c1b 100644 --- a/GeneralStateTests/stRefundTest/refund50percentCap.json +++ b/GeneralStateTests/stRefundTest/refund50percentCap.json @@ -6,93 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000", - "0x0b" : "0x0de0b6b3a7640000" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x6991ae521e7e1d6d7750429e0883daf7fbb898d06a7a0bf70e95193ba314e33d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "45545" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "54455" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000", - "0x0b" : "0x0de0b6b3a7640000" - } + ], + "EIP158" : [ + { + "hash" : "0x5dc1d4933650bbb07cb3850b8ab6a47ed69d60d3e220cfe14bcd3cf3fdbe2fe9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "45735" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x6b8cb17a93315e8736d19126421e6d902877b80c26442a22b99dbf4ce1c063f4", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "54265" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000", - "0x0b" : "0x0de0b6b3a7640000" - } + ], + "Homestead" : [ + { + "hash" : "0x6b8cb17a93315e8736d19126421e6d902877b80c26442a22b99dbf4ce1c063f4", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "45755" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x5dc1d4933650bbb07cb3850b8ab6a47ed69d60d3e220cfe14bcd3cf3fdbe2fe9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "54245" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ @@1 @@2 [[ 10 ]] (EXP 2 0xff) [[ 11 ]] (BALANCE (ADDRESS)) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 }", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655", + "nonce" : "0x00", "storage" : { "0x01" : "0x01", "0x02" : "0x01", @@ -102,10 +89,10 @@ "0x06" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0186a0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -115,14 +102,14 @@ "" ], "gasLimit" : [ - "100000" + "0x0186a0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRefundTest/refund600.json b/GeneralStateTests/stRefundTest/refund600.json index b89cf7cf2..c1776977b 100644 --- a/GeneralStateTests/stRefundTest/refund600.json +++ b/GeneralStateTests/stRefundTest/refund600.json @@ -6,90 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x0b" : "0x0de0b6b3a7640000" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x370547e05d6e27ff92e21369072a418842438071d30790d09bea87c17e69828a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "38050" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "61950" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x0b" : "0x0de0b6b3a7640000" - } + ], + "EIP158" : [ + { + "hash" : "0xb17757d3d6ac1ae9cd042db317fec1ed386ff43fede64a631be9628977c3a76b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "38240" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x97a63e88dde1aba3e542f3f9fb3170fc071631900e422b2316bd585ce4ef591b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "61760" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x0b" : "0x0de0b6b3a7640000" - } + ], + "Homestead" : [ + { + "hash" : "0x97a63e88dde1aba3e542f3f9fb3170fc071631900e422b2316bd585ce4ef591b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "38280" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb17757d3d6ac1ae9cd042db317fec1ed386ff43fede64a631be9628977c3a76b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "61720" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ @@1 @@2 [[ 10 ]] (EXP 2 0xffff) [[ 11 ]] (BALANCE (ADDRESS)) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 }", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655", + "nonce" : "0x00", "storage" : { "0x01" : "0x01", "0x02" : "0x01", @@ -99,10 +89,10 @@ "0x06" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0186a0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -112,14 +102,14 @@ "" ], "gasLimit" : [ - "100000" + "0x0186a0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json b/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json index 1f3dd42a9..31cb14b6a 100644 --- a/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json +++ b/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json @@ -6,76 +6,130 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : 0, - "gas" : -1, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x0a" : "0x01", - "0x0b" : "0x01", - "0x16" : "0x984376", - "0x17" : "0x96bc55" - } + { + "hash" : "0x1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "70695" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "9929305", - "nonce" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 1, - "gas" : -1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0x8c91c8617b0a81c6e83299b207ab29fed428ef8196382620506086d051b440cd", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x9d832422b810e981abf1a62ccf61ff5a030f763e9fdb97dc7a0044c9e4246473", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x8c91c8617b0a81c6e83299b207ab29fed428ef8196382620506086d051b440cd", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x0a" : "0x01", - "0x0b" : "0x01", - "0x16" : "0x9843b6", - "0x17" : "0x96a679" - } + { + "hash" : "0x9d832422b810e981abf1a62ccf61ff5a030f763e9fdb97dc7a0044c9e4246473", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "73493" + "logs" : [ + ] + }, + { + "hash" : "0x1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "9926507", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 22 ]] (GAS) [[ 10 ]] 1 [[ 11 ]] (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 ) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 [[ 7 ]] 0 [[ 8 ]] 0 [[ 23 ]] (GAS) }", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755", + "nonce" : "0x00", "storage" : { "0x01" : "0x01", "0x02" : "0x01", @@ -87,17 +141,17 @@ "0x08" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "10000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x989680", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "balance" : "1000000000000000000", - "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", - "nonce" : "0", + "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff", + "nonce" : "0x00", "storage" : { } } @@ -108,14 +162,14 @@ "0x0000000000000000000000000000000000000000000000000000000000010000" ], "gasLimit" : [ - "10000000" + "0x989680" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_CallA.json b/GeneralStateTests/stRefundTest/refund_CallA.json index 829c7dc91..ab6964583 100644 --- a/GeneralStateTests/stRefundTest/refund_CallA.json +++ b/GeneralStateTests/stRefundTest/refund_CallA.json @@ -6,97 +6,95 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_CallAFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000010", - "storage" : { - "0x" : "0x01", - "0x01" : "0x01" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xc27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "31070" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1968920", - "nonce" : "1" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xc27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000010", - "storage" : { - "0x" : "0x01", - "0x01" : "0x01" - } + ], + "Frontier" : [ + { + "hash" : "0x2a379a44a3742aa7fa1abc25a43678a54e1dd0f03ac34a40715314cd09855773", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "31730" + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x2a379a44a3742aa7fa1abc25a43678a54e1dd0f03ac34a40715314cd09855773", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1968260", - "nonce" : "1" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xc27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (CALL 5500 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61157cf1600055", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "2000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x1e8480", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 1 ]] 0 }", - "nonce" : "0", + "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000600155", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } @@ -107,14 +105,14 @@ "" ], "gasLimit" : [ - "200000" + "0x030d40" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "10" + "0x0a" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_CallA_OOG.json b/GeneralStateTests/stRefundTest/refund_CallA_OOG.json index 7794e5255..4909a091a 100644 --- a/GeneralStateTests/stRefundTest/refund_CallA_OOG.json +++ b/GeneralStateTests/stRefundTest/refund_CallA_OOG.json @@ -6,65 +6,95 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_OOGFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "storage" : { - "0x01" : "0x01" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "31069" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "268931", - "nonce" : "1" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "storage" : { - "0x01" : "0x01" - } - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (CALL 6000 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa611770f1600055", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "300000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0493e0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 1 ]] 0 }", - "nonce" : "0", + "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000600155", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } @@ -75,14 +105,14 @@ "" ], "gasLimit" : [ - "31069" + "0x795d" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "10" + "0x0a" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json b/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json index 8fc314775..6bee0e21d 100644 --- a/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json +++ b/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json @@ -6,97 +6,95 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000010", - "storage" : { - "0x01" : "0x01" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "31069" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "68921", - "nonce" : "1" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "storage" : { - "0x01" : "0x01" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000010", - "storage" : { - "0x01" : "0x01" - } + ], + "Frontier" : [ + { + "hash" : "0xaffeb3f7f719c9679a6295f2600b29777de1836809d86f405d7db2b67d2c2d63", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "31729" + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xaffeb3f7f719c9679a6295f2600b29777de1836809d86f405d7db2b67d2c2d63", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "68261", - "nonce" : "1" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "storage" : { - "0x01" : "0x01" - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (CALL 5005 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61138df1600055", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0186a0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 1 ]] 0 }", - "nonce" : "0", + "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000600155", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } @@ -107,14 +105,14 @@ "" ], "gasLimit" : [ - "85000" + "0x014c08" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "10" + "0x0a" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json b/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json index 37ee32b46..944384ead 100644 --- a/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json +++ b/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json @@ -6,89 +6,145 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : 0, - "gas" : -1, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0x23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "2000000000000000010", - "storage" : { - "0x" : "0x01", - "0x01" : "0x01" - } + { + "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "20663" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "99979327", - "nonce" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 1, - "gas" : -1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xb7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "2000000000000000010", - "storage" : { - "0x" : "0x01", - "0x01" : "0x01" - } + { + "hash" : "0xb7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "23461" + "logs" : [ + ] + }, + { + "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "99976529", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x05f5e100", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "balance" : "1000000000000000000", - "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", - "nonce" : "0", + "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff", + "nonce" : "0x00", "storage" : { } } @@ -99,14 +155,14 @@ "0x0000000000000000000000000000000000000000000000000000000000010000" ], "gasLimit" : [ - "10000000" + "0x989680" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "10" + "0x0a" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json b/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json index 6e315f712..3ecaa6c77 100644 --- a/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json +++ b/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json @@ -6,92 +6,145 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : 0, - "gas" : -1, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0xa587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "2000000000000000010", - "storage" : { - "0x" : "0x01", - "0x01" : "0x01" - } + { + "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "20663" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xa587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "99979327", - "nonce" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 1, - "gas" : -1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "2000000000000000010", - "storage" : { - "0x" : "0x01", - "0x01" : "0x01" - } + { + "hash" : "0xb7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "23461" + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "99976529", - "nonce" : "1" + "logs" : [ + ] + }, + { + "hash" : "0xb7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Metropolis" : [ + { + "hash" : "0xa587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x05f5e100", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "balance" : "1000000000000000000", - "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", - "nonce" : "0", + "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } @@ -103,14 +156,14 @@ "0x0000000000000000000000000000000000000000000000000000000000010000" ], "gasLimit" : [ - "10000000" + "0x989680" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "10" + "0x0a" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json b/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json index 0e90c81e2..a60abb97f 100644 --- a/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json +++ b/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json @@ -6,95 +6,145 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : 0, - "gas" : -1, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0x3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "2000000000000000010", - "storage" : { - "0x" : "0x01", - "0x01" : "0x01" - } + { + "hash" : "0xc3f51c7a52752e0bd11b975c85a7da9f8cb61b2a1169aed57c2448468d8d7876", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "20697" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "99979293", - "nonce" : "1" + "logs" : [ + ] + }, + { + "hash" : "0xc3f51c7a52752e0bd11b975c85a7da9f8cb61b2a1169aed57c2448468d8d7876", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 1, - "gas" : -1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0x760cadb9d8b99f6f9ddd673d76bb3aad04ac4f4c87ed21ceab6a859320aee2ee", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x8fc808b98eebf12445af1aad861dd1294f909f06648588191ff698f78373e5bd", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x760cadb9d8b99f6f9ddd673d76bb3aad04ac4f4c87ed21ceab6a859320aee2ee", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "2000000000000000010", - "storage" : { - "0x" : "0x01", - "0x01" : "0x01" - } + { + "hash" : "0x8fc808b98eebf12445af1aad861dd1294f909f06648588191ff698f78373e5bd", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "28649" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "99971341", - "nonce" : "1" + "logs" : [ + ] + }, + { + "hash" : "0xc3f51c7a52752e0bd11b975c85a7da9f8cb61b2a1169aed57c2448468d8d7876", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 ) (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x05f5e100", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "balance" : "1000000000000000000", - "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", - "nonce" : "0", + "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } @@ -106,14 +156,14 @@ "0x0000000000000000000000000000000000000000000000000000000000010000" ], "gasLimit" : [ - "10000000" + "0x989680" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "10" + "0x0a" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_NoOOG_1.json b/GeneralStateTests/stRefundTest/refund_NoOOG_1.json index a70a7c28f..a98f91c63 100644 --- a/GeneralStateTests/stRefundTest/refund_NoOOG_1.json +++ b/GeneralStateTests/stRefundTest/refund_NoOOG_1.json @@ -6,51 +6,88 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_NoOOG_1Filler.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - } + "post" : { + "EIP150" : [ + { + "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "13003" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "37197", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 1 ]] 0 }", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000600155", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "50200", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xc418", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -60,14 +97,14 @@ "" ], "gasLimit" : [ - "26006" + "0x6596" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_OOG.json b/GeneralStateTests/stRefundTest/refund_OOG.json index 344dbed56..4da8f82cd 100644 --- a/GeneralStateTests/stRefundTest/refund_OOG.json +++ b/GeneralStateTests/stRefundTest/refund_OOG.json @@ -6,53 +6,88 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_OOGFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "storage" : { - "0x01" : "0x01" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "26005" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "473995", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 1 ]] 0 }", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000600155", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "500000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x07a120", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -62,14 +97,14 @@ "" ], "gasLimit" : [ - "26005" + "0x6595" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "10" + "0x0a" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_TxToSuicide.json b/GeneralStateTests/stRefundTest/refund_TxToSuicide.json index af4eaf6b2..94eb4d71e 100644 --- a/GeneralStateTests/stRefundTest/refund_TxToSuicide.json +++ b/GeneralStateTests/stRefundTest/refund_TxToSuicide.json @@ -6,83 +6,137 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : 0, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0x97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000010", - "storage" : { - } + { + "hash" : "0x88fb9e0f28bdde3b8d5d2a9c029c0be25e03e3c66c0f2d694f2923df35ef5e6f", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "10502" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "99989488", - "nonce" : "1" + "logs" : [ + ] + }, + { + "hash" : "0x88fb9e0f28bdde3b8d5d2a9c029c0be25e03e3c66c0f2d694f2923df35ef5e6f", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : 1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000010", - "storage" : { - } + { + "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "27003" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "99972987", - "nonce" : "1" + "logs" : [ + ] + }, + { + "hash" : "0x88fb9e0f28bdde3b8d5d2a9c029c0be25e03e3c66c0f2d694f2923df35ef5e6f", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x05f5e100", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "balance" : "1000000000000000000", - "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", - "nonce" : "0", + "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } @@ -93,15 +147,15 @@ "" ], "gasLimit" : [ - "21003", - "61003" + "0x520b", + "0xee4b" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "aaae7baea6a6c7c4c2dfeb977efac326af552aaa", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa", "value" : [ - "10" + "0x0a" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json b/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json index 826803653..57a3fda1c 100644 --- a/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json +++ b/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json @@ -6,52 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "21002" + "post" : { + "EIP150" : [ + { + "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "99978998", - "nonce" : "1" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "balance" : "1000000000000000000", - "storage" : { - "0x01" : "0x01" - } - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x05f5e100", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { - "balance" : "1000000000000000000", - "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }", - "nonce" : "0", + "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } @@ -62,14 +97,14 @@ "" ], "gasLimit" : [ - "21002" + "0x520a" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "aaae7baea6a6c7c4c2dfeb977efac326af552aaa", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa", "value" : [ - "10" + "0x0a" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json b/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json index a1a45c471..04ca83145 100644 --- a/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json +++ b/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json @@ -6,53 +6,88 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_changeNonZeroStorageFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000010", - "storage" : { - "0x01" : "0x17" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "26006" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "973984", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 1 ]] 23 }", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6017600155", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0f4240", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -62,14 +97,14 @@ "" ], "gasLimit" : [ - "228500" + "0x037c94" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "10" + "0x0a" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_getEtherBack.json b/GeneralStateTests/stRefundTest/refund_getEtherBack.json index 2c22d3128..686d33eac 100644 --- a/GeneralStateTests/stRefundTest/refund_getEtherBack.json +++ b/GeneralStateTests/stRefundTest/refund_getEtherBack.json @@ -6,52 +6,88 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_getEtherBackFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "228500", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x037c94", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "ALL" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000010", - "storage" : { - } + "post" : { + "EIP150" : [ + { + "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "13003" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "2271987", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 1 ]] 0 }", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000600155", + "nonce" : "0x00", "storage" : { "0x01" : "0x01" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "2285000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x22ddc8", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -61,14 +97,14 @@ "" ], "gasLimit" : [ - "228500" + "0x037c94" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "10" + "0x0a" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json b/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json index 8f2d75435..e01c1c436 100644 --- a/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json +++ b/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json @@ -6,94 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "1000000000000000000000000000000000000001" : { - "shouldnotexist" : "1" + "post" : { + "EIP150" : [ + { + "hash" : "0xf86cd78f87f71a92c8db138f99e6ce104e81b30bbafac118127ec5057148aa99", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "10984" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "289016", - "nonce" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "1000000000000000000000000000000000000001" : { - "shouldnotexist" : "1" + ], + "EIP158" : [ + { + "hash" : "0x6d682e26dc5364fc47db5306aea09899760ac2bd4b89229bfbf62b784ab1866d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "16644" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x4565006352de0399e17ac6cc3671ca2fa94e553df037f6df5fed7f966a04ba84", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "283356", - "nonce" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "1000000000000000000000000000000000000001" : { - "shouldnotexist" : "1" + ], + "Homestead" : [ + { + "hash" : "0x4565006352de0399e17ac6cc3671ca2fa94e553df037f6df5fed7f966a04ba84", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "16724" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x6d682e26dc5364fc47db5306aea09899760ac2bd4b89229bfbf62b784ab1866d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "283276", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "1000000000000000000000000000000000000001" : { - "balance" : "1000000000000000000", + "0x1000000000000000000000000000000000000001" : { + "balance" : "0x0de0b6b3a7640000", "code" : "0x606060405260e060020a600035046309e587a58114610031578063c04062261461004d578063dd4f1f2a1461005a575b005b61002f3373ffffffffffffffffffffffffffffffffffffffff16ff5b6100f5600061010961005e565b61002f5b60003090508073ffffffffffffffffffffffffffffffffffffffff166309e587a56040518160e060020a0281526004018090506000604051808303816000876161da5a03f1156100025750604080517f09e587a500000000000000000000000000000000000000000000000000000000815290516004828101926000929190829003018183876161da5a03f1156100025750505050565b604080519115158252519081900360200190f35b5060019056", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "300000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0493e0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -103,14 +96,14 @@ "0xc0406226" ], "gasLimit" : [ - "300000" + "0x0493e0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "1000000000000000000000000000000000000001", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x1000000000000000000000000000000000000001", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stRefundTest/refund_singleSuicide.json b/GeneralStateTests/stRefundTest/refund_singleSuicide.json index 97de45d6f..5bdf21797 100644 --- a/GeneralStateTests/stRefundTest/refund_singleSuicide.json +++ b/GeneralStateTests/stRefundTest/refund_singleSuicide.json @@ -6,94 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "1000000000000000000000000000000000000001" : { - "shouldnotexist" : "1" + "post" : { + "EIP150" : [ + { + "hash" : "0x6f5cbf09a8693d41dec28d7b4ada05d6cb4cc00029ee9311721903060039fd50", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "10881" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "289119", - "nonce" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "1000000000000000000000000000000000000001" : { - "shouldnotexist" : "1" + ], + "EIP158" : [ + { + "hash" : "0x470504afdd4f770328e7e01c552f262cc55996fc83cc5fe05c825fda6b50312c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "13711" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xba2fd14cc4799bf049ebc512a6e27a5c4678bf5ae0834659f9179ed3049ff4ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "286289", - "nonce" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "1000000000000000000000000000000000000001" : { - "shouldnotexist" : "1" + ], + "Homestead" : [ + { + "hash" : "0xba2fd14cc4799bf049ebc512a6e27a5c4678bf5ae0834659f9179ed3049ff4ff", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "13771" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x470504afdd4f770328e7e01c552f262cc55996fc83cc5fe05c825fda6b50312c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "286229", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "1000000000000000000000000000000000000001" : { - "balance" : "1000000000000000000", + "0x1000000000000000000000000000000000000001" : { + "balance" : "0x0de0b6b3a7640000", "code" : "0x606060405260e060020a600035046309e587a58114602e5780632e4699ed146049578063c040622614609b575b005b602c3373ffffffffffffffffffffffffffffffffffffffff16ff5b602c5b60003090508073ffffffffffffffffffffffffffffffffffffffff166309e587a56040518160e060020a0281526004018090506000604051808303816000876161da5a03f11560025750505050565b60a5600060b9604c565b604080519115158252519081900360200190f35b5060019056", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "300000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0493e0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -103,14 +96,14 @@ "0xc0406226" ], "gasLimit" : [ - "300000" + "0x0493e0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "1000000000000000000000000000000000000001", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x1000000000000000000000000000000000000001", "value" : [ - "0" + "0x00" ] } } |