From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- .../stEIP158Specific/CALL_OneVCallSuicide.json | 146 ++++++------ .../stEIP158Specific/CALL_ZeroVCallSuicide.json | 146 ++++++------ GeneralStateTests/stEIP158Specific/EXP_Empty.json | 184 +++++++-------- .../stEIP158Specific/EXTCODESIZE_toEpmty.json | 150 +++++++------ .../EXTCODESIZE_toNonExistent.json | 136 +++++++----- .../stEIP158Specific/vitalikTransactionTest.json | 247 ++++++--------------- 6 files changed, 457 insertions(+), 552 deletions(-) (limited to 'GeneralStateTests/stEIP158Specific') diff --git a/GeneralStateTests/stEIP158Specific/CALL_OneVCallSuicide.json b/GeneralStateTests/stEIP158Specific/CALL_OneVCallSuicide.json index c7603b3fe..760ad84e7 100644 --- a/GeneralStateTests/stEIP158Specific/CALL_OneVCallSuicide.json +++ b/GeneralStateTests/stEIP158Specific/CALL_OneVCallSuicide.json @@ -6,80 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158", - "EIP150" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x64" : "0x085707" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x9d6a0f433324877903fd7824e33158c62752deed863a8d2fdf3a1df012ba0f72", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x64", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x08d5b6", - "0x64" : "0x086d23" - } + ], + "EIP158" : [ + { + "hash" : "0x9d6a0f433324877903fd7824e33158c62752deed863a8d2fdf3a1df012ba0f72", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xba636cbfdf864eed36b7fd36ad42e8694bb1817a4b8e8e9942c1ce8e1a8b452f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xba636cbfdf864eed36b7fd36ad42e8694bb1817a4b8e8e9942c1ce8e1a8b452f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x9d6a0f433324877903fd7824e33158c62752deed863a8d2fdf3a1df012ba0f72", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100", - "code" : "{ [[0]](GAS) (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x64", + "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1505a606455", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", - "nonce" : "0", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x73b94f5374fce5edbc8e2a8697c15331677e6ebf0bff", + "nonce" : "0x00", "storage" : { } } @@ -89,14 +103,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stEIP158Specific/CALL_ZeroVCallSuicide.json b/GeneralStateTests/stEIP158Specific/CALL_ZeroVCallSuicide.json index 1abbd61a0..80c5ecde1 100644 --- a/GeneralStateTests/stEIP158Specific/CALL_ZeroVCallSuicide.json +++ b/GeneralStateTests/stEIP158Specific/CALL_ZeroVCallSuicide.json @@ -6,80 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158", - "EIP150" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x64" : "0x087133" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xe76553703206c2cc61d5ed4e89229b1ef08f4a2769fa7a9851eaacdc60cd1b14", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "nonce" : "0x00", - "storage" : { - "0x00" : "0x08d5b6", - "0x64" : "0x08874f" - } + ], + "EIP158" : [ + { + "hash" : "0xe76553703206c2cc61d5ed4e89229b1ef08f4a2769fa7a9851eaacdc60cd1b14", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x5ed0275864a115e3c3420d2e1729d25f6a59089abfb581fde385195a560af5a5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x5ed0275864a115e3c3420d2e1729d25f6a59089abfb581fde385195a560af5a5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xe76553703206c2cc61d5ed4e89229b1ef08f4a2769fa7a9851eaacdc60cd1b14", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[0]](GAS) (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1505a606455", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }", - "nonce" : "0", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x73b94f5374fce5edbc8e2a8697c15331677e6ebf0bff", + "nonce" : "0x00", "storage" : { } } @@ -89,14 +103,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stEIP158Specific/EXP_Empty.json b/GeneralStateTests/stEIP158Specific/EXP_Empty.json index 1ae2af67b..c7e0ca245 100644 --- a/GeneralStateTests/stEIP158Specific/EXP_Empty.json +++ b/GeneralStateTests/stEIP158Specific/EXP_Empty.json @@ -6,117 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "comment" : "https://etherpad.net/p/EIP158", - "storage" : { - "0x00" : "0x08d5b6", - "0x02" : "0x0873c4", - "0x03" : "0x01", - "0x04" : "0x07d76c", - "0x06" : "0x07741c", - "0x08" : "0x070f3c", - "0x0a" : "0x06a73c", - "0x0b" : "0x01", - "0x0c" : "0x060ae4", - "0x0d" : "0x01", - "0x0e" : "0x056e8c", - "0x0f" : "0x01", - "0x64" : "0x04d234" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x6d14764dbe4291fd612b847a7b378a6e42da87209063184263ffd06e25a0c446", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "comment" : "https://etherpad.net/p/EIP158", - "storage" : { - "0x00" : "0x08d5b6", - "0x02" : "0x0873ec", - "0x03" : "0x01", - "0x04" : "0x07d794", - "0x06" : "0x077584", - "0x08" : "0x071324", - "0x0a" : "0x06b024", - "0x0b" : "0x01", - "0x0c" : "0x0613cc", - "0x0d" : "0x01", - "0x0e" : "0x057774", - "0x0f" : "0x01", - "0x64" : "0x04db1c" - } - } + ], + "EIP158" : [ + { + "hash" : "0x41d83353455a43d5fffdc0ef1901a9861cb0cad2249da8883da516f1abb6b27b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x02" : "0x0873ec", - "0x03" : "0x01", - "0x04" : "0x07d794", - "0x06" : "0x077584", - "0x08" : "0x071324", - "0x0a" : "0x06b024", - "0x0b" : "0x01", - "0x0c" : "0x0613cc", - "0x0d" : "0x01", - "0x0e" : "0x057774", - "0x0f" : "0x01", - "0x64" : "0x04db1c" - } - } + ], + "Frontier" : [ + { + "hash" : "0x6d14764dbe4291fd612b847a7b378a6e42da87209063184263ffd06e25a0c446", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x6d14764dbe4291fd612b847a7b378a6e42da87209063184263ffd06e25a0c446", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x41d83353455a43d5fffdc0ef1901a9861cb0cad2249da8883da516f1abb6b27b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[0]](GAS) [[1]](EXP 0 12) [[2]](GAS) [[3]](EXP 12 0) [[4]](GAS) [[5]](EXP 0 0xffffffffffffffff) [[6]](GAS) [[7]](EXP 0 0xffffffffffffffffffffffffffffffff) [[8]](GAS) [[9]](EXP 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[10]](GAS) [[11]](EXP 0xffffffffffffffff 0) [[12]](GAS) [[13]](EXP 0xffffffffffffffffffffffffffffffff 0) [[14]](GAS) [[15]](EXP 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x5a600055600c60000a6001555a6002556000600c0a6003555a60045567ffffffffffffffff60000a6005555a6006556fffffffffffffffffffffffffffffffff60000a6007555a6008557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60000a6009555a600a55600067ffffffffffffffff0a600b555a600c5560006fffffffffffffffffffffffffffffffff0a600d555a600e5560007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0a600f555a606455", + "nonce" : "0x00", "storage" : { } } @@ -126,14 +96,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toEpmty.json b/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toEpmty.json index 1fd767728..4dcf2e4da 100644 --- a/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toEpmty.json +++ b/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toEpmty.json @@ -6,86 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toEpmtyFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158", - "EIP150" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x64" : "0x087147" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x34a02e6b097a84f37b8b8dfc7ec67212c22f90b0fd96739445110c91dc45280a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x64" : "0x0873ef" - } + ], + "EIP158" : [ + { + "hash" : "0x34a02e6b097a84f37b8b8dfc7ec67212c22f90b0fd96739445110c91dc45280a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "", - "nonce" : "0", - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x8da206824967bc73b6adf5714e337ce99d2e181201d6bb69920bba8ca8e17088", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x8da206824967bc73b6adf5714e337ce99d2e181201d6bb69920bba8ca8e17088", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x34a02e6b097a84f37b8b8dfc7ec67212c22f90b0fd96739445110c91dc45280a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[0]](GAS) [[1]] (EXTCODESIZE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x5a60005573c94f5374fce5edbc8e2a8697c15331677e6ebf0b3b6001555a606455", + "nonce" : "0x00", "storage" : { } }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", + "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -95,14 +103,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toNonExistent.json b/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toNonExistent.json index 5ef620b7a..beb54c63c 100644 --- a/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toNonExistent.json +++ b/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toNonExistent.json @@ -6,71 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158", - "EIP150" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x64" : "0x087147" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x61431c2ae5d71abbaeb163ac1ee1fe6ce0a27cf7a9eebcc9f250f696d30f5aa1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x08d5b6", - "0x64" : "0x0873ef" - } + ], + "EIP158" : [ + { + "hash" : "0x61431c2ae5d71abbaeb163ac1ee1fe6ce0a27cf7a9eebcc9f250f696d30f5aa1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x6f640e328965e45fb3b37ee5e99eae277153dee13ca21c942ffbfe9c11c0e01e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x6f640e328965e45fb3b37ee5e99eae277153dee13ca21c942ffbfe9c11c0e01e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x61431c2ae5d71abbaeb163ac1ee1fe6ce0a27cf7a9eebcc9f250f696d30f5aa1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ [[0]](GAS) [[1]] (EXTCODESIZE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) [[100]] (GAS) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x5a60005573c94f5374fce5edbc8e2a8697c15331677e6ebf0b3b6001555a606455", + "nonce" : "0x00", "storage" : { } } @@ -80,14 +96,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json b/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json index f19b1cd3a..6ca137db3 100644 --- a/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json +++ b/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json @@ -6,203 +6,86 @@ "source" : "/src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109" : { - "balance" : "0x00", - "code" : "0x", - "nonce" : "0x03", - "storage" : { - } + "post" : { + "EIP150" : [ + { + "hash" : "0x7a281a1ce18be77fa72d654767a410e2244f172c744ee2ac1154960f4981a3b4", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x044dec", - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } - }, - "51f9d7f98e997bdd6bebde4c2dd27be8c99303aa" : { - "balance" : "0x00", - "code" : "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe", - "nonce" : "0x01", - "storage" : { - } - }, - "cd2a3d9f938e13cd947ec05abc7fe734df8dd826" : { - "balance" : "0xfffffffffffffbb213", - "code" : "0x", - "nonce" : "0x0150", - "storage" : { - } - }, - "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : { - "balance" : "0x00", - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "13d3d0eedf83404aa5cc882d6756098cd21e3f56" : { - "balance" : "0x00", - "code" : "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe", - "nonce" : "0x00", - "storage" : { - } - }, - "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109" : { - "balance" : "0x00", - "code" : "0x", - "nonce" : "0x02", - "storage" : { - } - }, - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "307092", - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } - }, - "cd2a3d9f938e13cd947ec05abc7fe734df8dd826" : { - "balance" : "4722366482869644906603", - "code" : "0x", - "nonce" : "0x0150", - "storage" : { - } + ], + "EIP158" : [ + { + "hash" : "0xe3de92e8ec039e7b32fc50549194af8e16214e995915d1f66c4121d30ff88275", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : { - "balance" : "0x00", - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109" : { - "balance" : "0x00", - "code" : "0x", - "nonce" : "0x02", - "storage" : { - } - }, - "51f9d7f98e997bdd6bebde4c2dd27be8c99303aa" : { - "shouldnotexist" : "1" - }, - "cd2a3d9f938e13cd947ec05abc7fe734df8dd826" : { - "code" : "0x", - "nonce" : "0x0150", - "storage" : { - } + ], + "Frontier" : [ + { + "hash" : "0x6243be0d831b29c25ba9250267d6c78bc84e087c1d0d9b76f7fc40212ae857e2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : { - "balance" : "0x00", - "code" : "0x", - "nonce" : "0x00", - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "0x1bc78ae0e5ec5cb439f1d5355d6f90d38343e109" : { - "balance" : "0x00", - "code" : "", - "nonce" : "0x03", - "storage" : { - } - }, - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x044dec", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - }, - "0x51f9d7f98e997bdd6bebde4c2dd27be8c99303aa" : { - "balance" : "0x00", - "code" : "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe", - "nonce" : "0x01", - "storage" : { - } + ], + "Homestead" : [ + { + "hash" : "0x413833e5cb37a0c12c8e02c380e3c51587a102c5b02f1a65dc42a89b89224275", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0xcd2a3d9f938e13cd947ec05abc7fe734df8dd826" : { - "balance" : "0xfffffffffffffbb213", - "code" : "", - "nonce" : "0x0150", - "storage" : { - } + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xe3de92e8ec039e7b32fc50549194af8e16214e995915d1f66c4121d30ff88275", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : { - "balance" : "0x00", - "code" : "", - "nonce" : "0x00", - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "cd2a3d9f938e13cd947ec05abc7fe734df8dd826" : { + "0xcd2a3d9f938e13cd947ec05abc7fe734df8dd826" : { "balance" : "0xffffffffffffffffff", - "code" : "0x", + "code" : "", "nonce" : "0x014f", "storage" : { } }, - "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : { + "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : { "balance" : "0x00", - "code" : "0x", + "code" : "", "nonce" : "0x00", "storage" : { } @@ -215,12 +98,12 @@ "gasLimit" : [ "0x1fffff" ], - "gasPrice" : "1", + "gasPrice" : "0x01", "nonce" : "0x014f", - "secretKey" : "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", + "secretKey" : "0xc85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", "to" : "", "value" : [ - "0" + "0x00" ] } } -- cgit v1.2.3