diff options
Diffstat (limited to 'GeneralStateTests/stEIP150singleCodeGasPrices')
30 files changed, 2035 insertions, 2093 deletions
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json index 75bd87e15..a1e87b59d 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json @@ -2,81 +2,69 @@ "RawBalanceGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0x088791" + } } } - ], - "EIP158" : [ - { - "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0x088791" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000555a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (BALANCE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -86,14 +74,14 @@ "" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json index 1f3aeaf62..da6c41e80 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json @@ -2,88 +2,108 @@ "RawCallCodeGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xa9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06aff9", + "0x02" : "0x752e" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x436e92e96d0098ec2950e7e748d41b646f6156a57c140a001ca5ad0e0fb344c4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x436e92e96d0098ec2950e7e748d41b646f6156a57c140a001ca5ad0e0fb344c4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06b28d", + "0x02" : "0x0752e" + } } } - ], - "Metropolis" : [ - { - "hash" : "0xa9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06b28d", + "0x02" : "0x752e" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALLCODE 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +113,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json index 4eff7eb33..888e2c918 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json @@ -2,88 +2,86 @@ "RawCallCodeGasAsk" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasAskFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06aff9", + "0x02" : "0x06e228" + } } } - ], - "EIP158" : [ - { - "hash" : "0x1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa3955a3f904c97066bd8999d4f24870bc4570c6a4be430bc1facc169f00cfe65", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa3955a3f904c97066bd8999d4f24870bc4570c6a4be430bc1facc169f00cfe65", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0", + "0x01" : "0", + "0x02" : "0" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALLCODE 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json index 2821bf20a..21ed73f7f 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json @@ -2,88 +2,86 @@ "RawCallCodeGasMemory" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06ac91", + "0x02" : "0x752e" + } } } - ], - "EIP158" : [ - { - "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x25a1d6dffd60c9ff124f52b4d208e4977c55ff7b0556c92c3bc1aec273966268", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x25a1d6dffd60c9ff124f52b4d208e4977c55ff7b0556c92c3bc1aec273966268", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06af25", + "0x02" : "0x752e" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALLCODE 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 8000 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json index b05ea8052..9ba28d682 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json @@ -2,88 +2,86 @@ "RawCallCodeGasMemoryAsk" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAskFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06ac91", + "0x02" : "0x06dece" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x266e3b403ae2a5f7158a91249c08b3e6fd267085ba4aab04bcac6eae2c34925b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x266e3b403ae2a5f7158a91249c08b3e6fd267085ba4aab04bcac6eae2c34925b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0", + "0x01" : "0", + "0x02" : "0" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALLCODE 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 8000 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json index 5758b5706..cc833544d 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json @@ -2,88 +2,86 @@ "RawCallCodeGasValueTransfer" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x0695cd", + "0x02" : "0x7e2a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x026291c5288f263f79d5df5ff4cf7f76493758a6e5af0e2adbcdc3417a65a88d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x026291c5288f263f79d5df5ff4cf7f76493758a6e5af0e2adbcdc3417a65a88d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x069861", + "0x02" : "0x7e2a" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALLCODE 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 0 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json index 6021e9ba1..6c7338e78 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json @@ -2,88 +2,86 @@ "RawCallCodeGasValueTransferAsk" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAskFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x0695cd", + "0x02" : "0x06c889" + } } } - ], - "EIP158" : [ - { - "hash" : "0x77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xae6d57a264af762cf603b673d22bb14697901f3f99f79af0528afca7ed41c650", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xae6d57a264af762cf603b673d22bb14697901f3f99f79af0528afca7ed41c650", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0", + "0x01" : "0", + "0x02" : "0" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALLCODE 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 0 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json index f5ad5156f..aa95dcd2f 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json @@ -2,88 +2,86 @@ "RawCallCodeGasValueTransferMemory" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x069265", + "0x02" : "0x7e2a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xed8dc1a5d3a2a2a298b8e6906b8e3daa16b9e4c0cebc22b48ce4699739cf07be", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xed8dc1a5d3a2a2a298b8e6906b8e3daa16b9e4c0cebc22b48ce4699739cf07be", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x0694f9", + "0x02" : "0x7e2a" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALLCODE 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 8000 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json index b32d0ca3c..c6c0aec60 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json @@ -2,88 +2,86 @@ "RawCallCodeGasValueTransferMemoryAsk" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAskFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x069265", + "0x02" : "0x06c52e" + } } } - ], - "EIP158" : [ - { - "hash" : "0x42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x55ce044177361ed520bee5fcf11c37416ab57bd929f02760f3d3e715d1b72729", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x55ce044177361ed520bee5fcf11c37416ab57bd929f02760f3d3e715d1b72729", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0", + "0x01" : "0", + "0x02" : "0" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALLCODE 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 8000 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json index 321cd8fb5..e630f99ba 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json @@ -2,88 +2,86 @@ "RawCallGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x752e" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06aff9" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x2f373b8f988e05aca842b2731a5c229cbf67485ef92f564c51a793ed93ce6a86", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2f373b8f988e05aca842b2731a5c229cbf67485ef92f564c51a793ed93ce6a86", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x752e" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06b28d" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALL 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json index 1e20ec531..f751e783c 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json @@ -2,88 +2,86 @@ "RawCallGasAsk" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasAskFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x06e228" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06aff9" + } } } - ], - "EIP158" : [ - { - "hash" : "0x9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x84bb30ba0337cdb822deb5dae3195e4e33e7f075ef2bb4e7c369f730ba563b6f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x84bb30ba0337cdb822deb5dae3195e4e33e7f075ef2bb4e7c369f730ba563b6f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0", + "0x01" : "0" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json index 8eb1dd404..ec11e4bd9 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json @@ -2,88 +2,86 @@ "RawCallGasValueTransfer" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x7e2a" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x0695cd" + } } } - ], - "EIP158" : [ - { - "hash" : "0x53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x319c877894cd436e6eaeee70679efa83272bdd1b9841b02715b512b53cbff3b2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x319c877894cd436e6eaeee70679efa83272bdd1b9841b02715b512b53cbff3b2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x7e2a" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x069861" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALL 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 0 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json index affafa0d9..711db6241 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json @@ -2,88 +2,86 @@ "RawCallGasValueTransferAsk" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferAskFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x06c889" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x0695cd" + } } } - ], - "EIP158" : [ - { - "hash" : "0x7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe0076a602530d15c8ccceafb9cd46357c713c7872fd4634f1aefecf9c9356ea7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe0076a602530d15c8ccceafb9cd46357c713c7872fd4634f1aefecf9c9356ea7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0", + "0x01" : "0" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 0 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json index 2a3055af3..b6d74f112 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json @@ -2,88 +2,86 @@ "RawCallGasValueTransferMemory" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x7e2a" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x069265" + } } } - ], - "EIP158" : [ - { - "hash" : "0x75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x04a0baee683517e8d6a1a481f0606787c654e3ad3a44b4b4455df96e0f75bc17", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x04a0baee683517e8d6a1a481f0606787c654e3ad3a44b4b4455df96e0f75bc17", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x7e2a" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x0694f9" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALL 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 8000 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json index 414eb72a7..5db663a0c 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json @@ -2,88 +2,86 @@ "RawCallGasValueTransferMemoryAsk" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAskFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x06c52e" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x069265" + } } } - ], - "EIP158" : [ - { - "hash" : "0x38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xeaadd3be7f372407630197e81a9f04f8a84c9ccee0e8d9ee8ed76c9a2a2a1938", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xeaadd3be7f372407630197e81a9f04f8a84c9ccee0e8d9ee8ed76c9a2a2a1938", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0", + "0x01" : "0" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 8000 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json index 807732ad9..2b34e1763 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json @@ -2,88 +2,86 @@ "RawCallMemoryGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallMemoryGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x752e" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06ac91" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x576930e1e057042952521306058dc35a8cee5a53919d72da54ccdda095925ee4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x576930e1e057042952521306058dc35a8cee5a53919d72da54ccdda095925ee4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x752e" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06af25" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALL 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 8000 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json index 262372de9..ef2c4806d 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json @@ -2,88 +2,86 @@ "RawCallMemoryGasAsk" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallMemoryGasAskFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0x06dece" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06ac91" + } } } - ], - "EIP158" : [ - { - "hash" : "0x77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xfa67f8254413de74863bdebf6a653f34032bbdb1bfde6e7263803182f06a2920", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xfa67f8254413de74863bdebf6a653f34032bbdb1bfde6e7263803182f06a2920", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x02" : "0" + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0", + "0x01" : "0" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 8000 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json index 78aa3732e..0158fd352 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json @@ -2,81 +2,75 @@ "RawCreateFailGasValueTransfer" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransferFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x0683e6" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "shouldnotexist" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x0683e6" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "shouldnotexist" : "1" } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a60005560006000600bf0505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CREATE 11 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -86,14 +80,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json index 358a1a34a..d0139b29c 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json @@ -2,81 +2,75 @@ "RawCreateFailGasValueTransfer2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06807e" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "shouldnotexist" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06807e" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "shouldnotexist" : "1" } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f406000600bf0505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CREATE 11 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -86,14 +80,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json index 3453c2ef4..bf4dd33b3 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json @@ -2,81 +2,75 @@ "RawCreateGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x0683e6" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "0" } } - ], - "EIP158" : [ - { - "hash" : "0xb916802637eb51608d6ef5f2aefc37152cd59cb98b238b06a7276ffe8926879f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb916802637eb51608d6ef5f2aefc37152cd59cb98b238b06a7276ffe8926879f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x0683e6" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "0" } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055600060006000f0505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CREATE 0 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -86,14 +80,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json index 17de68766..8da234d76 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json @@ -2,81 +2,75 @@ "RawCreateGasMemory" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasMemoryFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xd5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06807e" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "0" } } - ], - "EIP158" : [ - { - "hash" : "0xe6701e817eca8c6146df517e058530c3ab277f3af8cea26f6643e94e7ad5f113", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xd5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xd5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe6701e817eca8c6146df517e058530c3ab277f3af8cea26f6643e94e7ad5f113", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06807e" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "0" } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f4060006000f0505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CREATE 0 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -86,14 +80,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json index 2dc890363..3d54affd1 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json @@ -2,81 +2,75 @@ "RawCreateGasValueTransfer" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasValueTransferFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x0683e6" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "10" } } - ], - "EIP158" : [ - { - "hash" : "0xeb81439d01333840ec0930c4ddf3f5c175d272cde817b40b1163fdcd2a013e84", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xeb81439d01333840ec0930c4ddf3f5c175d272cde817b40b1163fdcd2a013e84", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x0683e6" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "10" } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a60005560006000600af0505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CREATE 10 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -86,14 +80,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json index 045ca7cc3..16e3497f5 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json @@ -2,81 +2,75 @@ "RawCreateGasValueTransferMemory" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemoryFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06807e" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "10" } } - ], - "EIP158" : [ - { - "hash" : "0xd7f24038790cb5ae4392128d48ca82f08bbebe7275f23dde610323ce0ddb9874", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd7f24038790cb5ae4392128d48ca82f08bbebe7275f23dde610323ce0ddb9874", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06807e" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "10" } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f406000600af0505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (CREATE 10 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -86,14 +80,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json index c477913e1..2ec86f387 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json @@ -2,88 +2,108 @@ "RawDelegateCallGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06affc", + "0x02" : "0x752e" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4ef295967b34e8f6cec6931840bc0947960383d969a9e0f2236183f0faa7575d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x45015e5fa68594215fb6943b7e7212278fb25b5d2b13f844163c306e14c65838", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0", + "0x01" : "0", + "0x02" : "0" + } } } - ], - "Metropolis" : [ - { - "hash" : "0xf3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06b290", + "0x02" : "0x752e" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f4505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (DELEGATECALL 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +113,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json index 88eed8329..548b011ce 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json @@ -2,88 +2,86 @@ "RawDelegateCallGasAsk" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasAskFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xe201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06affc", + "0x02" : "0x06e22b" + } } } - ], - "EIP158" : [ - { - "hash" : "0xe201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x426f5e836aae47940b3ed939db21cc9e335d12eda8949a1d5169f3d6d0e3ccb3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x426f5e836aae47940b3ed939db21cc9e335d12eda8949a1d5169f3d6d0e3ccb3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0", + "0x01" : "0", + "0x02" : "0" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f4505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (DELEGATECALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json index f1b3616a8..70018fc60 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json @@ -2,88 +2,108 @@ "RawDelegateCallGasMemory" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06ac94", + "0x02" : "0x752e" + } } } - ], - "EIP158" : [ - { - "hash" : "0x41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x65b7569621f6fe011a10e6f0e6bae950ee444caabd07c4536e6a5141678b25de", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xceac93c2f55b3827be027e884c9e774d233e5109dd8fd35cf25c9fb804a47ec4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0", + "0x01" : "0", + "0x02" : "0" + } } } - ], - "Metropolis" : [ - { - "hash" : "0x41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06af28", + "0x02" : "0x752e" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f406000611f40600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f4505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (DELEGATECALL 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 8000 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +113,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json index de84e3ff0..5ed7b61fd 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json @@ -2,88 +2,86 @@ "RawDelegateCallGasMemoryAsk" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAskFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x074f16", + "0x01" : "0x06ac94", + "0x02" : "0x06ded1" + } } } - ], - "EIP158" : [ - { - "hash" : "0x25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf555a574c2f7fd08089b3a4a03595daa66e980fc2bd4cdb4615edfb07d19caf2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf555a574c2f7fd08089b3a4a03595daa66e980fc2bd4cdb4615edfb07d19caf2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0", + "0x01" : "0", + "0x02" : "0" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600255", - "nonce" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", + "code" : "{ [[2]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055611f406000611f40600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f4505a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (DELEGATECALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 8000 0 8000) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +91,14 @@ "" ], "gasLimit" : [ - "0x07a120" + "500000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json index e19710bac..efec06304 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json @@ -2,88 +2,76 @@ "RawExtCodeCopyGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0x0884c3" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x299139e4ca9042a2dc9be3402cb96ef69ebbdb16d4485eb12ea5a230fd3b7c13", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x299139e4ca9042a2dc9be3402cb96ef69ebbdb16d4485eb12ea5a230fd3b7c13", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0x08876b" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", "code" : "0x0112233445566778899101112131415161718191202122232425", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a60005560146000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b3c5a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (EXTCODECOPY 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 20) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +81,14 @@ "" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json index 5f578bd0b..f156ff9bd 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json @@ -2,88 +2,76 @@ "RawExtCodeCopyMemoryGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0x087bb5" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x60b8a1372e768661d0c83723a862df03ba35138aac9478a00199511fa5e446f7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x60b8a1372e768661d0c83723a862df03ba35138aac9478a00199511fa5e446f7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0x087e5d" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", "code" : "0x0112233445566778899101112131415161718191202122232425", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055612b706000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b3c5a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (EXTCODECOPY 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 11120) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +81,14 @@ "" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json index 2705007db..88643d423 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json @@ -2,88 +2,76 @@ "RawExtCodeSizeGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0x088791" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0x088791" + } } } - ] - }, + } + ], "pre" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", + "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "", "code" : "0x0112233445566778899101112131415161718191202122232425", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000555a600155", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]] (GAS) (EXTCODESIZE 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b) [[1]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -93,14 +81,14 @@ "" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } |