diff options
9 files changed, 21 insertions, 513 deletions
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json index a82043002..4b70bac00 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json @@ -16,31 +16,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xee52", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a421ae", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000555a600155", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x088791" - } - } } } ], @@ -51,31 +26,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xee52", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a421ae", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000555a600155", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x088791" - } - } } } ], @@ -86,31 +36,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xee52", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a421ae", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000555a600155", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x088791" - } - } } } ], @@ -121,31 +46,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xee52", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a421ae", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000555a600155", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x088791" - } - } } } ], diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json index a15e97d0a..075c9ff61 100644 --- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json +++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json @@ -16,38 +16,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x0112233445566778899101112131415161718191202122232425", - "nonce" : "0x00", - "storage" : { - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xee52", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a421ae", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000555a600155", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x088791" - } - } } } ], @@ -58,38 +26,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x0112233445566778899101112131415161718191202122232425", - "nonce" : "0x00", - "storage" : { - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xee52", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a421ae", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000555a600155", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x088791" - } - } } } ], @@ -100,38 +36,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x0112233445566778899101112131415161718191202122232425", - "nonce" : "0x00", - "storage" : { - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xee52", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a421ae", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000555a600155", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x088791" - } - } } } ], @@ -142,38 +46,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x0112233445566778899101112131415161718191202122232425", - "nonce" : "0x00", - "storage" : { - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xee52", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a421ae", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000555a600155", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x08d5b6", - "0x01" : "0x088791" - } - } } } ], diff --git a/GeneralStateTests/stRefundTest/refund50percentCap.json b/GeneralStateTests/stRefundTest/refund50percentCap.json index 1828946b8..122ccd82d 100644 --- a/GeneralStateTests/stRefundTest/refund50percentCap.json +++ b/GeneralStateTests/stRefundTest/refund50percentCap.json @@ -16,31 +16,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655", - "nonce" : "0x00", - "storage" : { - "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000", - "0x0b" : "0x0de0b6b3a7640000" - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xb2a7", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xd3f9", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - } } } ], @@ -51,31 +26,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655", - "nonce" : "0x00", - "storage" : { - "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000", - "0x0b" : "0x0de0b6b3a7640000" - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xb2bb", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xd3e5", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - } } } ], @@ -86,31 +36,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655", - "nonce" : "0x00", - "storage" : { - "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000", - "0x0b" : "0x0de0b6b3a7640000" - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xb1e9", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xd4b7", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - } } } ], @@ -121,31 +46,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655", - "nonce" : "0x00", - "storage" : { - "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000", - "0x0b" : "0x0de0b6b3a7640000" - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xb1e9", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xd4b7", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - } } } ], diff --git a/GeneralStateTests/stRefundTest/refund600.json b/GeneralStateTests/stRefundTest/refund600.json index 2648fa754..07b33b02d 100644 --- a/GeneralStateTests/stRefundTest/refund600.json +++ b/GeneralStateTests/stRefundTest/refund600.json @@ -16,30 +16,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655", - "nonce" : "0x00", - "storage" : { - "0x0b" : "0x0de0b6b3a7640000" - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x9560", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xf140", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - } } } ], @@ -50,30 +26,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655", - "nonce" : "0x00", - "storage" : { - "0x0b" : "0x0de0b6b3a7640000" - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x9588", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xf118", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - } } } ], @@ -84,30 +36,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655", - "nonce" : "0x00", - "storage" : { - "0x0b" : "0x0de0b6b3a7640000" - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x94a2", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xf1fe", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - } } } ], @@ -118,30 +46,6 @@ "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655", - "nonce" : "0x00", - "storage" : { - "0x0b" : "0x0de0b6b3a7640000" - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x94a2", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xf1fe", - "code" : "", - "nonce" : "0x01", - "storage" : { - } - } } } ], diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionOOG.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionOOG.json index 1ae35c2f9..0691c7b64 100644 --- a/GeneralStateTests/stTransactionTest/zeroSigTransactionOOG.json +++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionOOG.json @@ -531,28 +531,11 @@ ], "Metropolis" : [ { - "hash" : "0xae5f6090817aeb40d7d5cf104f738261f67c510ad973e06e8982124f9d1da856", + "hash" : "0x7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 - }, - "postState" : { - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x6001600055", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x01" - } - }, - "0xffffffffffffffffffffffffffffffffffffffff" : { - "balance" : "0x00", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - } } }, { @@ -580,7 +563,7 @@ } }, { - "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed", + "hash" : "0xd506140af993cf273f1e9984a13cd06c1d469640180a5b5a78907e75ae230098", "indexes" : { "data" : 0, "gas" : 2, @@ -596,28 +579,11 @@ } }, { - "hash" : "0xae5f6090817aeb40d7d5cf104f738261f67c510ad973e06e8982124f9d1da856", + "hash" : "0x7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526", "indexes" : { "data" : 0, "gas" : 3, "value" : 0 - }, - "postState" : { - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x6001600055", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x01" - } - }, - "0xffffffffffffffffffffffffffffffffffffffff" : { - "balance" : "0x00", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - } } }, { @@ -629,28 +595,11 @@ } }, { - "hash" : "0xae5f6090817aeb40d7d5cf104f738261f67c510ad973e06e8982124f9d1da856", + "hash" : "0x7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526", "indexes" : { "data" : 1, "gas" : 0, "value" : 0 - }, - "postState" : { - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x6001600055", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x01" - } - }, - "0xffffffffffffffffffffffffffffffffffffffff" : { - "balance" : "0x00", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - } } }, { @@ -694,28 +643,11 @@ } }, { - "hash" : "0xae5f6090817aeb40d7d5cf104f738261f67c510ad973e06e8982124f9d1da856", + "hash" : "0x7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526", "indexes" : { "data" : 1, "gas" : 3, "value" : 0 - }, - "postState" : { - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x6001600055", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x01" - } - }, - "0xffffffffffffffffffffffffffffffffffffffff" : { - "balance" : "0x00", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - } } }, { diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json index 6467b23f6..1fa0ece1e 100644 --- a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json @@ -20,7 +20,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { "0x00" : "0x08d5b6", - "0x01" : "0x0885fc" + "0x01" : "0x088791" } } } @@ -36,7 +36,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { "0x00" : "0x08d5b6", - "0x01" : "0x088778" + "0x01" : "0x088791" } } } diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json index e44dcd372..9c4d2257e 100644 --- a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json @@ -20,7 +20,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { "0x00" : "0x08d5b6", - "0x01" : "0x0884d0" + "0x01" : "0x088791" } } } @@ -36,7 +36,7 @@ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { "0x00" : "0x08d5b6", - "0x01" : "0x088778" + "0x01" : "0x088791" } } } diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json index f955af209..6b8ab1cfa 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json @@ -24,10 +24,10 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "45600" + "balance" : "45545" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "54400" + "balance" : "54455" } } }, @@ -46,10 +46,10 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "45940" + "balance" : "45735" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "54060" + "balance" : "54265" } } }, @@ -68,10 +68,10 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "45960" + "balance" : "45755" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "54040" + "balance" : "54245" } } } diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json b/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json index 41760a95d..d94c1f372 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json @@ -23,10 +23,10 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "38105" + "balance" : "38050" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "61895" + "balance" : "61950" } } }, @@ -44,10 +44,10 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "38445" + "balance" : "38240" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "61555" + "balance" : "61760" } } }, @@ -65,10 +65,10 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "38485" + "balance" : "38280" }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "61515" + "balance" : "61720" } } } |