From f71c2688e1a839f8429f7e94ec5e56bb182d82cf Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 09:11:00 +0300 Subject: regenerate hive tests --- .../CREATE_AcreateB_BSuicide_BStore.json | 126 ++++++------- .../CREATE_ContractSuicideDuringInit.json | 126 ++++++------- ...tractSuicideDuringInit_ThenStoreThenReturn.json | 146 ++++++++------- ...CREATE_ContractSuicideDuringInit_WithValue.json | 126 ++++++------- ...ontractSuicideDuringInit_WithValueToItself.json | 208 +++++++++++++++------ .../CREATE_EContractCreateEContractInInit_Tr.json | 140 +++++++------- ...EATE_EContractCreateNEContractInInitOOG_Tr.json | 206 ++++++++++---------- .../CREATE_EContractCreateNEContractInInit_Tr.json | 149 ++++++++------- .../CREATE_EContract_ThenCALLToNonExistentAcc.json | 162 +++++++++------- .../stCreateTest/CREATE_EmptyContract.json | 134 ++++++------- .../CREATE_EmptyContractAndCallIt_0wei.json | 153 ++++++++------- .../CREATE_EmptyContractAndCallIt_1wei.json | 156 +++++++++------- .../CREATE_EmptyContractWithBalance.json | 110 ++++------- .../CREATE_EmptyContractWithStorage.json | 170 ++++++++++------- ...ATE_EmptyContractWithStorageAndCallIt_0wei.json | 176 ++++++++++------- ...ATE_EmptyContractWithStorageAndCallIt_1wei.json | 158 +++++++++------- ...REATE_empty000CreateinInitCode_Transaction.json | 153 ++++++++------- 17 files changed, 1437 insertions(+), 1162 deletions(-) (limited to 'GeneralStateTests/stCreateTest') diff --git a/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json b/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json index dd2fb2c14..b238d55c3 100644 --- a/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json +++ b/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json @@ -2,88 +2,76 @@ "CREATE_AcreateB_BSuicide_BStore" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xd4753925482b62ec7ad7fc3bddff66de44a3a7cd83e3cdba0cd8b6fa73f814b9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x0c" + } } } - ], - "EIP158" : [ - { - "hash" : "0xe2cd6426cb1f1056e3499789297ae9c15323adaac4bf86a28929eb3ebe26fe67", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xcb20c3bae000723d5ebaf98ff88ff867c7a017644c44c647533ecdb13a40baec", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xcb20c3bae000723d5ebaf98ff88ff867c7a017644c44c647533ecdb13a40baec", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe2cd6426cb1f1056e3499789297ae9c15323adaac4bf86a28929eb3ebe26fe67", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x0c" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x01", + "1000000000000000000000000000000000000000" : { + "balance" : "1", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003c57610037565b610002565b346100025761004e6004805050610050565b005b600060405160c9806101d3833901809050604051809103906000f080156100025790508073ffffffffffffffffffffffffffffffffffffffff166369bda7aa604051817c0100000000000000000000000000000000000000000000000000000000028152600401809050600060405180830381600087803b156100025760325a03f115610002575050508073ffffffffffffffffffffffffffffffffffffffff16633ac6dff3604051817c0100000000000000000000000000000000000000000000000000000000028152600401809050600060405180830381600087803b156100025760325a03f115610002575050508073ffffffffffffffffffffffffffffffffffffffff16636f118b2b600060405160200152604051817c0100000000000000000000000000000000000000000000000000000000028152600401809050602060405180830381600087803b156100025760325a03f115610002575050506040518051906020015060016000508190555060016000600050819055505b5056606060405260b98060106000396000f360606040526000357c0100000000000000000000000000000000000000000000000000000000900480633ac6dff314604d57806369bda7aa14605e5780636f118b2b14606f576049565b6002565b34600257605c60048050506094565b005b34600257606d600480505060a2565b005b34600257607e600480505060a8565b6040518082815260200191505060405180910390f35b600c6000600050819055505b565b6011ff5b565b6000600060005054905060b6565b9056", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -93,14 +81,14 @@ "0xc0406226" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json index 7c841ef2d..05cff31a0 100644 --- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json +++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json @@ -2,81 +2,75 @@ "CREATE_ContractSuicideDuringInit" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "storage" : { + "0x01" : "12" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf333a603e17f77ee796862f7866bba49c697f704dcd4b42c12f496849d18c466", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x7663f589c5be87be629223cdc3dba8feebabdd3d3a66978cc994481d9ab8185d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "storage" : { + "0x01" : "12" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x600c600155", - "nonce" : "0x00", + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{[[1]]12}", + "nonce" : "0", "storage" : { } } @@ -86,14 +80,14 @@ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff" ], "gasLimit" : [ - "0x0249f0" + "150000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json index bd0278c3e..33281e148 100644 --- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json +++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json @@ -2,88 +2,94 @@ "CREATE_ContractSuicideDuringInit_ThenStoreThenReturn" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xb595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "storage" : { + "0x01" : "12" + } + }, + "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10", + "storage" : { + "0x01" : "0" + } } } - ], - "EIP158" : [ - { - "hash" : "0xb595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x78fa6f579e8822277b1d808d4fd1aba99be3a9e6ebbe9d850fa5956f996c54f5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xcd847e15911f01978a16197eea0c4a9610bacdd08ea1d9d3cf17eb2f2f6b2440", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "storage" : { + "0x01" : "12" + } + }, + "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10", + "storage" : { + "0x01" : "0" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x600c600155", - "nonce" : "0x00", + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{[[1]]12}", + "nonce" : "0", "storage" : { } }, - "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x600c600155", - "nonce" : "0x00", + "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{[[1]]12}", + "nonce" : "0", "storage" : { } } @@ -93,14 +99,14 @@ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600b600055600e6012f3" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json index 1403a8957..af4e5b138 100644 --- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json +++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json @@ -2,81 +2,75 @@ "CREATE_ContractSuicideDuringInit_WithValue" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10", + "storage" : { + "0x01" : "12" + } } } - ], - "EIP158" : [ - { - "hash" : "0x01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x96315472f25e8d8de55427dbff149b38266f4bd3089be65f9535ebf3a173a930", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x53b23926c5e12f4869f749070ff00caa71b17ea05153e6223673689c7d15cb5b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "10", + "storage" : { + "0x01" : "12" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x600c600155", - "nonce" : "0x00", + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{[[1]]12}", + "nonce" : "0", "storage" : { } } @@ -86,14 +80,14 @@ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff" ], "gasLimit" : [ - "0x0249f0" + "150000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json index eb5a471ad..c17d74491 100644 --- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json +++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json @@ -2,81 +2,169 @@ "CREATE_ContractSuicideDuringInit_WithValueToItself" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x7cd0af0907df25d710cfcfe805b74940f69be3945f08318cce347245199fe023", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "58039" + }, + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999941951" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "storage" : { + "0x01" : "12" + } } } - ], - "EIP158" : [ - { - "hash" : "0x7cd0af0907df25d710cfcfe805b74940f69be3945f08318cce347245199fe023", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier" + ], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "22190" + }, + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999977800" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "storage" : { + "0x01" : "12" + } } } - ], - "Frontier" : [ - { - "hash" : "0xcb312cfb389099b2c1f2de560878a9c6a1a4d4a97c31b4424f60bfb32f11410b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Homestead" + ], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "52379" + }, + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999947611" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "storage" : { + "0x01" : "12" + } } } - ], - "Homestead" : [ - { - "hash" : "0x2002743e54dee8add3d37611f23eecbfcfb9fe9f520ed9071d5a2a7dbc0fc0be", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150" + ], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "58039" + }, + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999941951" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "storage" : { + "0x01" : "12" + } } } - ], - "Metropolis" : [ - { - "hash" : "0x7cd0af0907df25d710cfcfe805b74940f69be3945f08318cce347245199fe023", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "1a3e089e89a1d995552b4005c40cd5c8832b929b" : { + "shouldnotexist" : "1" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "58039" + }, + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999941951" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "storage" : { + "0x01" : "12" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x600c600155", - "nonce" : "0x00", + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{[[1]]12}", + "nonce" : "0", "storage" : { } } @@ -86,14 +174,14 @@ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005230ff" ], "gasLimit" : [ - "0x0249f0" + "150000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x0a" + "10" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json index 4cf9a4b69..3e9f7a0de 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json +++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json @@ -2,81 +2,93 @@ "CREATE_EContractCreateEContractInInit_Tr" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xa53c16ef764e59942826a272cb0c2a22cf857019299de8ba689ea99622b96e96", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "nonce" : "0x02" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } } } - ], - "EIP158" : [ - { - "hash" : "0x008b89d8adaea6f4f0fb50436a903b21ceecff1cc4cd96e77e87a73641815c7f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x6a3caa9a78c30fa01e1b6dd5c0fe614d05a3c783655d83a0d4d24242c77e4c7d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x83a8d130edbb4e577e083be49413b90f513f2a9da710706bbd6f99f35874e366", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "nonce" : "0x02" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } } } - ], - "Metropolis" : [ - { - "hash" : "0x008b89d8adaea6f4f0fb50436a903b21ceecff1cc4cd96e77e87a73641815c7f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "nonce" : "0x01" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", - "code" : "0x600c600155", - "nonce" : "0x00", + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", + "code" : "{[[1]]12}", + "nonce" : "0", "storage" : { } } @@ -86,14 +98,14 @@ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150602060006000f0" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json index 6376425c5..53fadb62a 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json +++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json @@ -2,121 +2,129 @@ "CREATE_EContractCreateNEContractInInitOOG_Tr" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x79636e75640ef283fed3222de13e8771ed5c47b474630aa9a120a9b2b45d86d4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 }, - { - "hash" : "0xde57d3e6c712a43c036e67e52f47b97db2526acb3a7f86ef47342b9cdb567ae8", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 + "network" : [ + "EIP158" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "nonce" : "0x02" + }, + "a42676447b7cedfa5fde894d1d3df24aab362701" : { + "shouldnotexist" : "1" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x0c" + } } } - ], - "EIP158" : [ - { - "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xde57d3e6c712a43c036e67e52f47b97db2526acb3a7f86ef47342b9cdb567ae8", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x31615cdaada9cfc5f00dcbfaee0844dc2faf4bbd8fafe6de377de1a5beccffd7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 }, - { - "hash" : "0xde57d3e6c712a43c036e67e52f47b97db2526acb3a7f86ef47342b9cdb567ae8", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 + "network" : [ + "Metropolis" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "nonce" : "0x02" + }, + "a42676447b7cedfa5fde894d1d3df24aab362701" : { + "shouldnotexist" : "1" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x0c" + } } } - ], - "Homestead" : [ - { - "hash" : "0x614c26d1539f1de71127ba0184bae3aac2ab10d3ace6fbb3c7b2eec3466314b4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 }, - { - "hash" : "0xde57d3e6c712a43c036e67e52f47b97db2526acb3a7f86ef47342b9cdb567ae8", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 + "network" : [ + "EIP158" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" + }, + "a42676447b7cedfa5fde894d1d3df24aab362701" : { + "shouldnotexist" : "1" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x00" + } } } - ], - "Metropolis" : [ - { - "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + }, + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 }, - { - "hash" : "0xde57d3e6c712a43c036e67e52f47b97db2526acb3a7f86ef47342b9cdb567ae8", - "indexes" : { - "data" : 0, - "gas" : 1, - "value" : 0 + "network" : [ + "Frontier", + "Homestead", + "EIP150" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "nonce" : "0x01" + }, + "a42676447b7cedfa5fde894d1d3df24aab362701" : { + "balance" : "0", + "code" : "0x600c600055", + "nonce" : "0", + "storage" : { + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "0x0c" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", - "code" : "0x600c600155", - "nonce" : "0x00", + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", + "code" : "{[[1]]12}", + "nonce" : "0", "storage" : { } } @@ -126,15 +134,15 @@ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052600e60126000f0" ], "gasLimit" : [ - "0x027100", - "0xea60" + "160000", + "60000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json index 0df40f170..db9af6afe 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json +++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json @@ -2,81 +2,102 @@ "CREATE_EContractCreateNEContractInInit_Tr" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x79636e75640ef283fed3222de13e8771ed5c47b474630aa9a120a9b2b45d86d4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "nonce" : "0x02" + }, + "64e2ebd6405af8cb348aec519084d3fff42ebba6" : { + "code" : "0x600c600055" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } } } - ], - "EIP158" : [ - { - "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x31615cdaada9cfc5f00dcbfaee0844dc2faf4bbd8fafe6de377de1a5beccffd7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x614c26d1539f1de71127ba0184bae3aac2ab10d3ace6fbb3c7b2eec3466314b4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "nonce" : "0x02" + }, + "64e2ebd6405af8cb348aec519084d3fff42ebba6" : { + "code" : "0x600c600055" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } } } - ], - "Metropolis" : [ - { - "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "nonce" : "0x01" + }, + "a42676447b7cedfa5fde894d1d3df24aab362701" : { + "code" : "0x600c600055" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", - "code" : "0x600c600155", - "nonce" : "0x00", + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", + "code" : "{[[1]]12}", + "nonce" : "0", "storage" : { } } @@ -86,14 +107,14 @@ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052600e60126000f0" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json b/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json index 858cdffd5..ef92b6a4f 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json +++ b/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json @@ -2,81 +2,113 @@ "CREATE_EContract_ThenCALLToNonExistentAcc" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAccFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x96e22cad6add90b24312de855deb754fdd95e9a703b37db2dfe50bfb4c24a6db", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x07bc62", + "0x03" : "0x01", + "0x64" : "0x071d49" + } + }, + "e1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "shouldnotexist" : "1" + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0x3fe65b80e475f6dd5cbba1dc5ab1c48192190b5152dec14d585a2dda3b8cb09c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x414473e2b5ccbb95bfc9d02ca0e01da229de28551c4f95979c3f37d46ba075a6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x414473e2b5ccbb95bfc9d02ca0e01da229de28551c4f95979c3f37d46ba075a6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x07bc62", + "0x03" : "0x01", + "0x64" : "0x06be35" + } + }, + "e1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "0" + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "0" } } - ], - "Metropolis" : [ - { - "hash" : "0x3fe65b80e475f6dd5cbba1dc5ab1c48192190b5152dec14d585a2dda3b8cb09c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x07bc62", + "0x03" : "0x01", + "0x64" : "0x06bba1" + } + }, + "e1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "0" + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "0" } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055602060006000f06001555a6002556000600060006000600073e1ecf98489fa9ed60a664fc4998db699cfa39d4061ea60f16003555a606455", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]](GAS) [[1]] (CREATE 0 0 32) [[2]](GAS) [[3]] (CALL 60000 0xe1ecf98489fa9ed60a664fc4998db699cfa39d40 0 0 0 0 0) [[100]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -86,14 +118,14 @@ "" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json index dd3ea5082..879fba043 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json +++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json @@ -2,81 +2,81 @@ "CREATE_EmptyContract" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x64" : "0x07bc62" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0x308525f16a2448ccfd5e19ad719a7da2791e36860391b6400e1a9550abdfd281", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x308525f16a2448ccfd5e19ad719a7da2791e36860391b6400e1a9550abdfd281", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x64" : "0x07bc62" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "0x00", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055602060006000f06001555a606455", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]](GAS) [[1]] (CREATE 0 0 32) [[100]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -86,14 +86,14 @@ "" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json index dc8d9f61f..5f0b5386d 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json +++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json @@ -2,81 +2,104 @@ "CREATE_EmptyContractAndCallIt_0wei" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractAndCallIt_0weiFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x9d9b0f4d83b4cc9d694f684b3c5e02ce331296f6de2ca235676789b1fe08efae", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x07bc62", + "0x03" : "0x01", + "0x64" : "0x071c81" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0x19d6310e52c8d20f7f4fc424c5b48de170aaf5687712d75530d68ee079457234", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xc2f8f38782b85d584ac54b4bcd1f3fb47abdcdb89d866651d89c0f92e4cf7734", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xc2f8f38782b85d584ac54b4bcd1f3fb47abdcdb89d866651d89c0f92e4cf7734", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x07bc62", + "0x03" : "0x01", + "0x64" : "0x071fab" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "0" } } - ], - "Metropolis" : [ - { - "hash" : "0x19d6310e52c8d20f7f4fc424c5b48de170aaf5687712d75530d68ee079457234", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x07bc62", + "0x03" : "0x01", + "0x64" : "0x071c81" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "0" } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a600055602060006000f06001555a6002556000600060006000600060015461ea60f16003555a606455", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]](GAS) [[1]] (CREATE 0 0 32) [[2]](GAS) [[3]] (CALL 60000 (SLOAD 1) 0 0 0 0 0) [[100]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -86,14 +109,14 @@ "" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json index 79877c5eb..294e258a2 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json +++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json @@ -2,81 +2,107 @@ "CREATE_EmptyContractAndCallIt_1wei" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractAndCallIt_1weiFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x5f819235613ee824d9931511c4f3fcc6b9e6380f531fd55e5d0b194e946f407c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x07bc62", + "0x03" : "0x01", + "0x64" : "0x070255" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "0x01", + "nonce" : "0x01" } } - ], - "EIP158" : [ - { - "hash" : "0x1335ca3b57b2762b2b943682205ae7e792e2b3a2ec8a123a98a96eb53186f5dd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x53a30101b6f54133217dd206b739841e0472d29e176290d6e3464b94837be861", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x53a30101b6f54133217dd206b739841e0472d29e176290d6e3464b94837be861", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x07bc62", + "0x03" : "0x01", + "0x64" : "0x07057f" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "0x01", + "nonce" : "0x00" } } - ], - "Metropolis" : [ - { - "hash" : "0x1335ca3b57b2762b2b943682205ae7e792e2b3a2ec8a123a98a96eb53186f5dd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x07bc62", + "0x03" : "0x01", + "0x64" : "0x070255" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "0x01", + "nonce" : "0x00" } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "code" : "0x5a600055602060006000f06001555a6002556000600060006000600160015461ea60f16003555a606455", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1", + "code" : "{ [[0]](GAS) [[1]] (CREATE 0 0 32) [[2]](GAS) [[3]](CALL 60000 (SLOAD 1) 1 0 0 0 0) [[100]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -86,14 +112,14 @@ "" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json index 24b937c46..ad39f95d2 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json +++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json @@ -2,81 +2,53 @@ "CREATE_EmptyContractWithBalance" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithBalanceFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x64" : "0x07bc62" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "0x01" } } - ], - "EIP158" : [ - { - "hash" : "0x87dcd926369bb5229d8aa73a4dc5295ce32a9bd9b6448336678f000d3420be18", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x87dcd926369bb5229d8aa73a4dc5295ce32a9bd9b6448336678f000d3420be18", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "code" : "0x5a600055602060006001f06001555a606455", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1", + "code" : "{ [[0]](GAS) [[1]] (CREATE 1 0 32) [[100]] (GAS) }", + "nonce" : "0", "storage" : { } } @@ -86,14 +58,14 @@ "" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json index 2697e95b1..c00f43e2b 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json +++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json @@ -2,88 +2,120 @@ "CREATE_EmptyContractWithStorage" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x2933815c2af5c423c25ef33d349898f15a3b79b763de49671616c310b6effcbb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x64" : "0x071d30" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0xa401bb1798616adafc66608fd09285c0c68831f97a9b4d404970da9c2a99a1e1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xcb4d3f29a0485b8ec3eb183afc0b394fc098772e8fa0a84f38014d440933dbd4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xcb4d3f29a0485b8ec3eb183afc0b394fc098772e8fa0a84f38014d440933dbd4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x64" : "0x071fc4" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "0" } } - ], - "Metropolis" : [ - { - "hash" : "0xa401bb1798616adafc66608fd09285c0c68831f97a9b4d404970da9c2a99a1e1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x64" : "0x071d30" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "0" } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000557f600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331676000527f7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000602052604060006000f06001555a606455", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[100]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", - "code" : "0x600c600155", - "nonce" : "0x00", + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", + "code" : "{[[1]]12}", + "nonce" : "0", "storage" : { } } @@ -93,14 +125,14 @@ "" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json index fb383c9f4..8a78d300b 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json +++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json @@ -2,88 +2,126 @@ "CREATE_EmptyContractWithStorageAndCallIt_0wei" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x95724b5fb02381aa665d22187075abd0d6e60a2d7f1d98233fc1e2a9478e7018", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x071d30", + "0x03" : "0x01", + "0x64" : "0x067d4f" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0xa3b9c5957c28604d13f03fafd62478dca544d3dd2573699a404364b7622d871b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xc8ad715cdf4e7489aab9aa1555a1b138356287e51ac3a73557c75c7b48629f96", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xc8ad715cdf4e7489aab9aa1555a1b138356287e51ac3a73557c75c7b48629f96", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x071fc4", + "0x03" : "0x01", + "0x64" : "0x06830d" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "0" } } - ], - "Metropolis" : [ - { - "hash" : "0xa3b9c5957c28604d13f03fafd62478dca544d3dd2573699a404364b7622d871b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x071d30", + "0x03" : "0x01", + "0x64" : "0x067d4f" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "nonce" : "0" } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x00", - "code" : "0x5a6000557f600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331676000527f7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000602052604060006000f06001555a6002556000600060006000600060015461ea60f16003555a606455", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "{ [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[2]] (GAS) [[3]] (CALL 60000 (SLOAD 1) 0 0 0 0 0) [[100]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", - "code" : "0x600c600155", - "nonce" : "0x00", + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", + "code" : "{[[1]]12}", + "nonce" : "0", "storage" : { } } @@ -93,14 +131,14 @@ "" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json index 36a5bc713..2c80b8c84 100644 --- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json +++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json @@ -2,88 +2,104 @@ "CREATE_EmptyContractWithStorageAndCallIt_1wei" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x79da1bc54589028fc4471e13af9b7b5e5c546f35b623f3d44cdf12afa263d38d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158", + "EIP150" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x071d30", + "0x03" : "0x01", + "0x64" : "0x066323" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "0x01", + "storage" : { + "0x00" : "12" + } } } - ], - "EIP158" : [ - { - "hash" : "0x39f3f07069dc28f2485af1b33570a2cc31c565312f56fd0715cd4671d8072897", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xdb693840d5eca93f43d95ef11946b7b5b2b994651b669b971544340bfeed89c7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xdb693840d5eca93f43d95ef11946b7b5b2b994651b669b971544340bfeed89c7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x39f3f07069dc28f2485af1b33570a2cc31c565312f56fd0715cd4671d8072897", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x00" : "0x08d5b6", + "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40", + "0x02" : "0x071fc4", + "0x03" : "0x01", + "0x64" : "0x0668e1" + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } + }, + "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { + "balance" : "0x01", + "storage" : { + "0x00" : "12" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x01", - "code" : "0x5a6000557f600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331676000527f7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000602052604060006000f06001555a6002556000600060006000600160015461ea60f16003555a606455", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1", + "code" : "{ [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[2]] (GAS) [[3]] (CALL 60000 (SLOAD 1) 1 0 0 0 0) [[100]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", - "code" : "0x600c600155", - "nonce" : "0x00", + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", + "code" : "{[[1]]12}", + "nonce" : "0", "storage" : { } } @@ -93,14 +109,14 @@ "" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json b/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json index 4888fecbe..954c6c575 100644 --- a/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json +++ b/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json @@ -2,81 +2,106 @@ "CREATE_empty000CreateinInitCode_Transaction" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x14f55f5a337ba2e8d3282dc8e35821cf9e0418040fe8a38a4cc685d0b3de91f8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "nonce" : "0x02" + }, + "a42676447b7cedfa5fde894d1d3df24aab362701" : { + "shouldnotexist" : "1" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } } } - ], - "EIP158" : [ - { - "hash" : "0x130a3511ff49e18b6c345692ae59f91919b89ce32c4ff1d0b5117baf99266e9f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa31291b591da36e79fe99a2dea8664d3e327097d50416054c348d5e7a9277d84", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x0eadf14941ab52c4bd16e5f80717342215a2ffc76116af4237d0fe1761f5db3f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "nonce" : "0x02" + }, + "a42676447b7cedfa5fde894d1d3df24aab362701" : { + "shouldnotexist" : "1" + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } } } - ], - "Metropolis" : [ - { - "hash" : "0x130a3511ff49e18b6c345692ae59f91919b89ce32c4ff1d0b5117baf99266e9f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP150" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "nonce" : "0x01" + }, + "a42676447b7cedfa5fde894d1d3df24aab362701" : { + "balance" : "0x00", + "code" : "0x", + "nonce" : "0x00", + "storage" : { + } + }, + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "storage" : { + "0x01" : "12" + } } } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xe8d4a51000", - "code" : "0x600c600155", - "nonce" : "0x00", + "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000", + "code" : "{[[1]]12}", + "nonce" : "0", "storage" : { } } @@ -86,14 +111,14 @@ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600060006000f0" ], "gasLimit" : [ - "0x0927c0" + "600000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x00" + "0" ] } } -- cgit