diff options
Diffstat (limited to 'GeneralStateTests/stInitCodeTest')
18 files changed, 1335 insertions, 1080 deletions
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json index 87f0e096d..070b5f209 100644 --- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json +++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json @@ -6,113 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "100000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x05f5e100", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "nonce" : "1", - "storage" : { - "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xfcb25702c7c2186a58e9936af688f085395718f6ef1c8d29fea496b5f589f864", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "1", - "nonce" : "0", - "storage" : { - "0x" : "0x0c" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "nonce" : "1", - "storage" : { - "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6" - } + ], + "EIP158" : [ + { + "hash" : "0xf7f358c00a469057a8f00ad5ec59a8f0170605b89aa526948ec3be8e70b8e96d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x125bb759624d0f75e9a13d45208c3adf9b01bac040c37617e4f6fa82cc66880e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "1", - "nonce" : "1", - "storage" : { - "0x" : "0x0c" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "nonce" : "1", - "storage" : { - "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6" - } + ], + "Homestead" : [ + { + "hash" : "0x125bb759624d0f75e9a13d45208c3adf9b01bac040c37617e4f6fa82cc66880e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xf7f358c00a469057a8f00ad5ec59a8f0170605b89aa526948ec3be8e70b8e96d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "1", - "nonce" : "0", - "storage" : { - "0x" : "0x0c" - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "//" : "{[[0]] 12 (MSTORE 32 0x602060406000f0)(RETURN 57 7)}", - "balance" : "1000", - "code" : "{(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 1 11 21)(CALL 1000 (SLOAD 0) 0 0 0 0 0)}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x03e8", + "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546103e8f1", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x05f5e100", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -122,14 +96,14 @@ "0x00" ], "gasLimit" : [ - "203000" + "0x0318f8" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json index 9ee18c24f..11a6d50dc 100644 --- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json +++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json @@ -6,49 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "100000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x05f5e100", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "nonce" : "0" + "post" : { + "EIP150" : [ + { + "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "//" : "{[[0]] 12 (MSTORE 32 0x602060406000f0)(RETURN 57 7)}", - "balance" : "10000", - "code" : "{(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 100000 11 21)}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x2710", + "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x05f5e100", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -58,14 +96,14 @@ "0x00" ], "gasLimit" : [ - "20000000" + "0x01312d00" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json index c41e593cd..13eb7a6fd 100644 --- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json +++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json @@ -6,49 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "100000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x05f5e100", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "nonce" : "0" + "post" : { + "EIP150" : [ + { + "hash" : "0xf59872f076aae7b433a18fca69d4c2de1dcb5efe4a33f602ddcd9f076692f923", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xe7db137cc3df6d785a0820d8354296bd7bced99f719af76cfc28cf097569aa43", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xbefdd7b9114f546b0b7ce58f5e46b24f24003acff6af79cac0c32ee17029a2cd", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xbefdd7b9114f546b0b7ce58f5e46b24f24003acff6af79cac0c32ee17029a2cd", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xe7db137cc3df6d785a0820d8354296bd7bced99f719af76cfc28cf097569aa43", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "//" : "{[[0]] 12 (MSTORE 32 0x602060406000f0)(RETURN 57 7)}", - "balance" : "0", - "code" : "{(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 1 11 21)(CALL 0 (SLOAD 0) 0 0 0 0 0)}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x00", + "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x05f5e100", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -58,14 +96,14 @@ "0x00" ], "gasLimit" : [ - "20000000" + "0x01312d00" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json index d993a7aa4..36ea9924c 100644 --- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json +++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json @@ -6,113 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "100000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x05f5e100", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "nonce" : "1", - "storage" : { - "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x5cc580fa6536cadacd23d6d5f7afb50076a5f7889832cfca9dc0a10473900898", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "1", - "nonce" : "0", - "storage" : { - "0x" : "0x0c" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "nonce" : "1", - "storage" : { - "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6" - } + ], + "EIP158" : [ + { + "hash" : "0x1df975ab2132724cb9ce03e9cacef9e4d40a57a284c0cc20414debc014ddd9b6", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x63bf90b1298600ad4eead4b7c518cba014b52bafdd3ffa7f6ae19e6f22530651", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "1", - "nonce" : "1", - "storage" : { - "0x" : "0x0c" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "nonce" : "1", - "storage" : { - "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6" - } + ], + "Homestead" : [ + { + "hash" : "0x63bf90b1298600ad4eead4b7c518cba014b52bafdd3ffa7f6ae19e6f22530651", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x1df975ab2132724cb9ce03e9cacef9e4d40a57a284c0cc20414debc014ddd9b6", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "1", - "nonce" : "0", - "storage" : { - "0x" : "0x0c" - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "//" : "{[[0]] 12 (MSTORE 32 0x602060406000f0)(RETURN 57 7)}", - "balance" : "112", - "code" : "{(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 1 11 21)(CALL 0 (SLOAD 0) 12 0 0 0 0)}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x70", + "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x05f5e100", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -122,14 +96,14 @@ "0x00" ], "gasLimit" : [ - "20000000" + "0x01312d00" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json index 6c1c3301f..28b9b8693 100644 --- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json +++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json @@ -6,122 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "100000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x05f5e100", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "nonce" : "1", - "storage" : { - "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xccb3e0f5b2e7a9eeb364611ad58c4d5d29c4b9ba85883b6eede820376e3d5727", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "62c01474f089b07dae603491675dc5b5748f7049" : { - "nonce" : "0" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "2", - "nonce" : "1", - "storage" : { - "0x" : "0x0c" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "nonce" : "1", - "storage" : { - "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6" - } - }, - "62c01474f089b07dae603491675dc5b5748f7049" : { - "shouldnotexist" : "1" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" + ], + "EIP158" : [ + { + "hash" : "0x47086403782efc54f929a3b9b6691265db6f4e8081f9c360f7048b7712f6f114", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "2", - "nonce" : "2", - "storage" : { - "0x" : "0x0c" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "nonce" : "1", - "storage" : { - "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6" - } + ], + "Frontier" : [ + { + "hash" : "0x82391f2ce4d0391379a80ca1bfd7baadd5a296652bec4ce809191af461298810", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "62c01474f089b07dae603491675dc5b5748f7049" : { - "nonce" : "0" + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x82391f2ce4d0391379a80ca1bfd7baadd5a296652bec4ce809191af461298810", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x47086403782efc54f929a3b9b6691265db6f4e8081f9c360f7048b7712f6f114", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "2", - "nonce" : "1", - "storage" : { - "0x" : "0x0c" - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "//" : "{[[0]] 12 (MSTORE 32 0x602060406000f0)(RETURN 57 7)}", - "balance" : "1000", - "code" : "{(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 1 11 21)(CALL 50000 (SLOAD 0) 1 0 0 0 0)}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x03e8", + "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x05f5e100", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -131,14 +96,14 @@ "0x00" ], "gasLimit" : [ - "20000000" + "0x01312d00" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json index 6a4222408..5f808ea6a 100644 --- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json +++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json @@ -6,113 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "100000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x05f5e100", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1", - "nonce" : "1" + "post" : { + "EIP150" : [ + { + "hash" : "0xa281799aefc2823b2740b1368b39068de101c2c3eb8863becac0f3252b00dbb6", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "62c01474f089b07dae603491675dc5b5748f7049" : { - "nonce" : "0" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "nonce" : "1", - "storage" : { - "0x" : "0x0c" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1", - "nonce" : "1" - }, - "62c01474f089b07dae603491675dc5b5748f7049" : { - "shouldnotexist" : "1" - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" + ], + "EIP158" : [ + { + "hash" : "0x58fb374685d5b632a101fbb327141ac46688bad3ddc0329b44761bf72e7b1475", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "nonce" : "2", - "storage" : { - "0x" : "0x0c" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1", - "nonce" : "1" + ], + "Frontier" : [ + { + "hash" : "0xa281799aefc2823b2740b1368b39068de101c2c3eb8863becac0f3252b00dbb6", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "62c01474f089b07dae603491675dc5b5748f7049" : { - "nonce" : "0" + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xa281799aefc2823b2740b1368b39068de101c2c3eb8863becac0f3252b00dbb6", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x58fb374685d5b632a101fbb327141ac46688bad3ddc0329b44761bf72e7b1475", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "nonce" : "1", - "storage" : { - "0x" : "0x0c" - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "//" : "{[[0]] 12 (CREATE 0 64 32)}", - "balance" : "1", - "code" : "{(MSTORE 0 0x600c600055602060406000f0)(CREATE 0 20 12)}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x01", + "code" : "0x6b600c600055602060406000f0600052600c60146000f0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x05f5e100", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -122,14 +96,14 @@ "0x00" ], "gasLimit" : [ - "20000000" + "0x01312d00" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json b/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json index 567bab0e2..28bfd213f 100644 --- a/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json +++ b/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json @@ -6,109 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "100000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x05f5e100", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1", - "nonce" : "41", - "storage" : { - "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xf2b33499b0bdf4a78f3f6d54c7f3ede696df72fceba07519f1327de7181184b5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : { - "nonce" : "1", - "storage" : { - "0x02" : "0x1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" - } - }, - "8e3411c91d5dd4081b4846fa2f93808f5ad19686" : { - "nonce" : "1", - "storage" : { - "0x02" : "0x8e3411c91d5dd4081b4846fa2f93808f5ad19686" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1", - "nonce" : "41", - "storage" : { - "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" - } + ], + "EIP158" : [ + { + "hash" : "0x624e603c08a6f3ec965ecbadc51c73e26a6f8d77c65aca8fe08a21d9082b258f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : { - "shouldnotexist" : "1" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x4fee218443f0d352ef33dfe5dd9bdf120528b38ef3be46630b865bea6b1e6b28", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "8e3411c91d5dd4081b4846fa2f93808f5ad19686" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1", - "nonce" : "41", - "storage" : { - "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" - } + ], + "Homestead" : [ + { + "hash" : "0x4fee218443f0d352ef33dfe5dd9bdf120528b38ef3be46630b865bea6b1e6b28", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : { - "nonce" : "1" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x624e603c08a6f3ec965ecbadc51c73e26a6f8d77c65aca8fe08a21d9082b258f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "8e3411c91d5dd4081b4846fa2f93808f5ad19686" : { - "shouldnotexist" : "1" - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0", - "code" : "{[[ 2 ]](ADDRESS)(CODECOPY 0 0 32)(CREATE 0 0 32)}", - "nonce" : "40", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x00", + "code" : "0x3060025560206000600039602060006000f0", + "nonce" : "0x28", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0f4240", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -118,14 +96,14 @@ "0x00" ], "gasLimit" : [ - "400000" + "0x061a80" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json b/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json index 4bc6fba1a..3b2b5b3b1 100644 --- a/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json +++ b/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json @@ -6,106 +6,87 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "100000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x05f5e100", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1", - "nonce" : "1" + "post" : { + "EIP150" : [ + { + "hash" : "0x00cfff7e10d762e286e00843be08f353174b8adfffd4c4494f60cb9b4ef8a86e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "0", - "code" : "0x", - "nonce" : "0", - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1", - "nonce" : "1" + ], + "EIP158" : [ + { + "hash" : "0x83d9a35ebebdf653931fabd255b98059e0e83fa0b0001665e7a6e428f905e13b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x00cfff7e10d762e286e00843be08f353174b8adfffd4c4494f60cb9b4ef8a86e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "0", - "code" : "0x", - "nonce" : "1", - "storage" : { - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP150" - ], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1", - "nonce" : "1" + ], + "Homestead" : [ + { + "hash" : "0x00cfff7e10d762e286e00843be08f353174b8adfffd4c4494f60cb9b4ef8a86e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x83d9a35ebebdf653931fabd255b98059e0e83fa0b0001665e7a6e428f905e13b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "0", - "code" : "0x", - "nonce" : "0", - "storage" : { - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0", - "code" : "{(CREATE 0 0 32)}", - "nonce" : "0", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "0x00", + "code" : "0x602060006000f0", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0f4240", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -115,14 +96,14 @@ "0x00" ], "gasLimit" : [ - "100000" + "0x0186a0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json b/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json index f3b54373f..31c074705 100644 --- a/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json +++ b/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json @@ -6,38 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "22177" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "22177", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x56a1", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -47,14 +89,14 @@ "0x600a80600c6000396000f200600160008035811a8100" ], "gasLimit" : [ - "54176" + "0xd3a0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "100" + "0x64" ] } } diff --git a/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json b/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json index 31ee945c3..9814757bc 100644 --- a/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json +++ b/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json @@ -6,50 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "100000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x05f5e100", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : "Frontier", - "result" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "838000" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000" - } + ], + "EIP158" : [ + { + "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x4dc8fd3642ac4025c835f5d567dfac89679c66da501e5b9657115366467a1b42", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0f4240", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -59,14 +89,14 @@ "0x600a80600c6000396000f200600160008035811a8100" ], "gasLimit" : [ - "54000" + "0xd2f0" ], - "gasPrice" : "3", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "0x03", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json b/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json index 55ced6ad3..5e9d74a9f 100644 --- a/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json +++ b/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json @@ -6,68 +6,86 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "100000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x05f5e100", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier" - ], - "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x0278d0" + "post" : { + "EIP150" : [ + { + "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { - "balance" : "0x01" + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0cc970", - "nonce" : "0x01" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "shouldnotexist" : "1" + ], + "Frontier" : [ + { + "hash" : "0xcbc258a15bcc22ec1c8d9e63b82159dd1caf8f3527d8215bdd9168e39d0c89e2", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "0x00" - } + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x01", - "code" : "0x", + "code" : "", "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0f4240", - "code" : "0x", + "code" : "", "nonce" : "0x00", "storage" : { } @@ -78,14 +96,14 @@ "0x600a80600c6000396000f200600160008035811a8100" ], "gasLimit" : [ - "54000" + "0xd2f0" ], - "gasPrice" : "3", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "0x03", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stInitCodeTest/ReturnTest.json b/GeneralStateTests/stInitCodeTest/ReturnTest.json index 3d71269ce..095915b68 100644 --- a/GeneralStateTests/stInitCodeTest/ReturnTest.json +++ b/GeneralStateTests/stInitCodeTest/ReturnTest.json @@ -6,54 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.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" : [ - "Frontier", - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x" : "0x15" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x8dc79f7b0515a4242d5e46f4aef2e9648a0743cf4278786cb5cfa399630ae3cf", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x8dc79f7b0515a4242d5e46f4aef2e9648a0743cf4278786cb5cfa399630ae3cf", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x2b31035b94d9371fc05da98a08a0d51b69b99accf06645f69d25a8c2addb4108", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x2b31035b94d9371fc05da98a08a0d51b69b99accf06645f69d25a8c2addb4108", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x8dc79f7b0515a4242d5e46f4aef2e9648a0743cf4278786cb5cfa399630ae3cf", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{(CALL 2000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 30 1 31 1) [[0]](MLOAD 0) (RETURN 30 2)}", - "nonce" : "0", + "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506000516000556002601ef3", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0f4240", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000", - "code" : "{(MSTORE 0 0x15) (RETURN 31 1)}", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0186a0", + "code" : "0x60156000526001601ff3", + "nonce" : "0x00", "storage" : { } } @@ -63,14 +103,14 @@ "" ], "gasLimit" : [ - "300000" + "0x0493e0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "194f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stInitCodeTest/ReturnTest2.json b/GeneralStateTests/stInitCodeTest/ReturnTest2.json index 224850889..419d3d072 100644 --- a/GeneralStateTests/stInitCodeTest/ReturnTest2.json +++ b/GeneralStateTests/stInitCodeTest/ReturnTest2.json @@ -6,55 +6,94 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "1000000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x3b9aca00", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x" : "0x15", - "0x01" : "0x3f" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x4826e07577b6c45b7e3164c54be942f6a30a57014deb830eb065db8c9ecff2e1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x4826e07577b6c45b7e3164c54be942f6a30a57014deb830eb065db8c9ecff2e1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x9330976c9b157c848242ece05257c5c056efeb55310c91406ebe0ed40ff3f578", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x9330976c9b157c848242ece05257c5c056efeb55310c91406ebe0ed40ff3f578", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x4826e07577b6c45b7e3164c54be942f6a30a57014deb830eb065db8c9ecff2e1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{(MSTORE 0 0x15)(CALL 7000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 32 32 32) [[0]](MLOAD 0) [[1]](MLOAD 32) (RETURN 0 64)}", - "nonce" : "0", + "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060005160005560205160015560406000f3", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0f4240", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000", - "code" : "{(MSTORE 0 (MUL 3 (CALLDATALOAD 0)))(RETURN 0 32)}", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0186a0", + "code" : "0x60003560030260005260206000f3", + "nonce" : "0x00", "storage" : { } } @@ -64,14 +103,14 @@ "" ], "gasLimit" : [ - "250000" + "0x03d090" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "194f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json b/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json index 8324b0d9d..9f66e7ce8 100644 --- a/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json +++ b/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json @@ -6,42 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "72000" + "post" : { + "EIP150" : [ + { + "hash" : "0x961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "3000", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "75000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0124f8", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -51,14 +89,14 @@ "0x6000f1" ], "gasLimit" : [ - "72000" + "0x011940" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0" + "0x00" ] } } diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json b/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json index 9117244f2..562fc9a52 100644 --- a/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json +++ b/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json @@ -6,52 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "0000000000000000000000000000000000000000" : { - "balance" : "15" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158", - "EIP150" - ], - "result" : { - "0000000000000000000000000000000000000000" : { - "shouldnotexist" : "1" - } + ], + "EIP158" : [ + { + "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x5e2d18e12d28a412e04a57800ba998a10739ee10aa35127cfcb8e675c2bbd290", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xe0b65a3a37e8268cf5b5a41ef02bba89826e1a436636f182645214e5235c9c79", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0186a0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -61,14 +89,14 @@ "0x600a80600c6000396000fff2ffff600160008035811a81" ], "gasLimit" : [ - "55000" + "0xd6d8" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "15" + "0x0f" ] } } diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json index d51b66b74..3cdfd8533 100644 --- a/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json +++ b/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json @@ -6,42 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "64599" + "post" : { + "EIP150" : [ + { + "hash" : "0x9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "35401", - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0186a0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -51,14 +89,14 @@ "0x600a80600c6000396000f200600160008035811a8100" ], "gasLimit" : [ - "64599" + "0xfc57" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json index 74bf5a8f6..387fb8966 100644 --- a/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json +++ b/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json @@ -6,59 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { - "balance" : "1" + "post" : { + "EIP150" : [ + { + "hash" : "0x99f11d9bf8862c426bc510d7c6d2ed4c6f353411b782f8a3a268268319b9b689", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { - "balance" : "1" + ], + "EIP158" : [ + { + "hash" : "0x3c443f320c10ef9b6ecc4db0ac9e6bc184ef4d924d03bc9be54e8c0850ef9138", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xb2de012ac480412426664a68a009920fb4ce8c9651543900c440070e8e286644", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x99f11d9bf8862c426bc510d7c6d2ed4c6f353411b782f8a3a268268319b9b689", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x3c443f320c10ef9b6ecc4db0ac9e6bc184ef4d924d03bc9be54e8c0850ef9138", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0186a0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -68,14 +89,14 @@ "0x600a80600c600039600000f20000600160008035811a81" ], "gasLimit" : [ - "55000" + "0xd6d8" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "1" + "0x01" ] } } diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json index 8be1b854c..41c458cfc 100644 --- a/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json +++ b/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json @@ -6,41 +6,80 @@ "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "1000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x0f4240", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "55000" + "post" : { + "EIP150" : [ + { + "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "nonce" : "1" - } + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "100000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0186a0", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -50,14 +89,14 @@ "0x600a80600c6000396000f200ff600160008035811a81" ], "gasLimit" : [ - "55000" + "0xd6d8" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "1" + "0x01" ] } } |