From f71c2688e1a839f8429f7e94ec5e56bb182d82cf Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 09:11:00 +0300 Subject: regenerate hive tests --- .../contractCreationOOGdontLeaveEmptyContract.json | 106 ++++++---------- ...ionOOGdontLeaveEmptyContractViaTransaction.json | 133 ++++++++++----------- .../createContractViaContract.json | 107 ++++++----------- .../createContractViaContractOOGInitCode.json | 106 ++++++---------- .../createContractViaTransactionCost53000.json | 109 ++++++++--------- 5 files changed, 224 insertions(+), 337 deletions(-) (limited to 'GeneralStateTests/stHomesteadSpecific') diff --git a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract.json b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract.json index eb9f03d3f..6ea796fb8 100644 --- a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract.json +++ b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract.json @@ -2,81 +2,49 @@ "contractCreationOOGdontLeaveEmptyContract" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x35df33d2a146ff660bb837914781857715d1b8752371b2f3e0768f29dd484775", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643" : { + "shouldnotexist" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0x35df33d2a146ff660bb837914781857715d1b8752371b2f3e0768f29dd484775", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x11ad11c6c73f16022220dad1de2eb827aa3c04fa651f7a7b15231ed98efab9bc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x11ad11c6c73f16022220dad1de2eb827aa3c04fa651f7a7b15231ed98efab9bc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x35df33d2a146ff660bb837914781857715d1b8752371b2f3e0768f29dd484775", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60106001557f6001600155601080600c6000396000f3006000355415600957005b6020356000600052602060006000f0", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (SSTORE 1 0x10) (MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 ) (CREATE 0 0 32)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0186a0", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "100000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x016b80" + "93056" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000001", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000001", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json index 7f0ae090b..67e127e68 100644 --- a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json +++ b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json @@ -2,88 +2,85 @@ "contractCreationOOGdontLeaveEmptyContractViaTransaction" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x982629977cc807888a4aca6888907d0348ce9b6af9482eb0606bb42d3312d883", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Homestead" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "shouldnotexist" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0x86631b9f3536a824efa412c3162885c8bbb1657e315b8dbbda6a24a8ae8ff868", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x09977193631f79f56dc2d8dd43b100c0d93e3e1019f12bc7990e06769790b7c5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xbf80ccfd1a7e6bf9f0ab98b938595389fd7240f2206c33bade862e49c19c2248", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "EIP158", + "EIP150" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0" } } - ], - "Metropolis" : [ - { - "hash" : "0x86631b9f3536a824efa412c3162885c8bbb1657e315b8dbbda6a24a8ae8ff868", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0" } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x6001600155", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{(SSTORE 1 1)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x10c8e0", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1100000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0186a0", - "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1", - "nonce" : "0x00", + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "100000", + "code" : "{(CALL 50000 0x1000000000000000000000000000000000000001 0 0 64 0 64)}", + "nonce" : "0", "storage" : { } } @@ -93,14 +90,14 @@ "0x6040600060406000600073100000000000000000000000000000000000000161c350f1" ], "gasLimit" : [ - "0x017700" + "96000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stHomesteadSpecific/createContractViaContract.json b/GeneralStateTests/stHomesteadSpecific/createContractViaContract.json index 5b56f226f..f7d48cf27 100644 --- a/GeneralStateTests/stHomesteadSpecific/createContractViaContract.json +++ b/GeneralStateTests/stHomesteadSpecific/createContractViaContract.json @@ -2,81 +2,50 @@ "createContractViaContract" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x373942284112628b5c8cfd0f36d8058934fe6861cd7224feb3ac2d03739da305", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "46991", + "nonce" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0x00a243435c3922719d07f434874d20e02a1971ca2bc6d6359bcc18f7e1e766f1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x373942284112628b5c8cfd0f36d8058934fe6861cd7224feb3ac2d03739da305", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x373942284112628b5c8cfd0f36d8058934fe6861cd7224feb3ac2d03739da305", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x00a243435c3922719d07f434874d20e02a1971ca2bc6d6359bcc18f7e1e766f1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x600060006000f0", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (CREATE 0 0 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0186a0", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "100000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x0186a0" + "100000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000001", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000001", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode.json b/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode.json index 1766b6b52..d5b6d8142 100644 --- a/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode.json +++ b/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode.json @@ -2,81 +2,49 @@ "createContractViaContractOOGInitCode" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractOOGInitCodeFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf079b93388a39a4c343c66a917a044fb0d91de079786366d0c6c3b01bee07e7b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead", + "EIP158", + "EIP150" + ], + "result" : { + "4ff884bffc83e888ae11b32b1d94bf9bc8d1732f" : { + "shouldnotexist" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0xf079b93388a39a4c343c66a917a044fb0d91de079786366d0c6c3b01bee07e7b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xef627373222f9f8a0c974af676a99f9a8c62a585e7b8935cec7a26a7029ae6f0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xef627373222f9f8a0c974af676a99f9a8c62a585e7b8935cec7a26a7029ae6f0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf079b93388a39a4c343c66a917a044fb0d91de079786366d0c6c3b01bee07e7b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x6b602060406000f0600c600055600052600c60146000f0", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (MSTORE 0 0x602060406000f0600c600055)(CREATE 0 20 12)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x10c8e0", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1100000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x019a54" + "105044" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000001", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000001", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json b/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json index f42fb3a0b..99c704098 100644 --- a/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json +++ b/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json @@ -2,74 +2,59 @@ "createContractViaTransactionCost53000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "0x0f4240", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "1000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Homestead", + "EIP158", + "EIP150", + "Metropolis" + ], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "47000", + "nonce" : "1" } } - ], - "EIP158" : [ - { - "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xcf29b86efa1b7f5f999ef519fcc921062924d5c14d78baf491252fbf5a0d85b8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier" + ], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "79000", + "nonce" : "1" } } - ], - "Metropolis" : [ - { - "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0186a0", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "100000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -79,14 +64,14 @@ "" ], "gasLimit" : [ - "0x0186a0" + "100000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", "to" : "", "value" : [ - "0x00" + "0" ] } } -- cgit v1.2.3