From 35777d7779302fb028becd2794004c03743ae297 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Wed, 23 Aug 2017 17:05:49 +0200 Subject: Changes for EIP-684 The change was agreed on the last coredev call and this morning I got an OK from @arkpar. --- .../createJS_ExampleContractFiller.json | 16 +----- .../RevertDepthCreateAddressCollisionFiller.json | 57 +--------------------- .../CreateHashCollisionFiller.json | 23 +-------- 3 files changed, 3 insertions(+), 93 deletions(-) (limited to 'src') diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json index 921a80f39..b65710c59 100644 --- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json +++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json @@ -9,23 +9,9 @@ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : [ - { - "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158", "EIP150", "Byzantium"], - "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { - "storage" : { - "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", - "0x01" : "0x42", - "0x02" : "0x23", - "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", - "0x05" : "0x03e8" } - } - } - }, { "indexes" : { "data" : -1, "gas" : -1, "value" : -1 }, - "network" : ["Constantinople" ], + "network" : ["ALL"], "result" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056", diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json index 115365cbf..22e183874 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json @@ -9,68 +9,13 @@ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : [ - { - "comment" : "NO OOG", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 - }, - "network" : ["EIP158"], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x06", - "code" : "0x", - "nonce" : "1", - "storage" : { - "0x00" : "0x01", - "0x01" : "0x01", - "0x04" : "0x0c" - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x02" : "0x08", - "0x03" : "0x0c" - } - } - } - }, - { - "comment" : "NO OOG", - "indexes" : { - "data" : 1, - "gas" : 1, - "value" : 0 - }, - "network" : ["EIP150"], - "result" : { - "3e180b1862f9d158abb5e519a6d8605540c23682" : { - "balance" : "0x06", - "code" : "0x", - "nonce" : "0", - "storage" : { - "0x00" : "0x01", - "0x01" : "0x01", - "0x04" : "0x0c" - } - }, - "b000000000000000000000000000000000000000" : { - "storage" : { - "0x02" : "0x08", - "0x03" : "0x0c" - } - } - } - }, { - "comment" : "NO OOG", "indexes" : { "data" : 1, "gas" : 1, "value" : 0 }, - "network" : ["Frontier", "Homestead"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "3e180b1862f9d158abb5e519a6d8605540c23682" : { "balance" : "0x05", diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json index f5affbd7b..fd2ae5835 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json @@ -15,28 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead" , "EIP150" , "EIP158", "Byzantium"], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "storage" : { - "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6" - } - }, - "d2571607e241ecf590ed94b12d87c94babe36db6" : { - "balance" : "65", - "code" : "0x6000355415600957005b602035600035", - "storage" : { - } - } - } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Constantinople"], + "network" : ["ALL"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { -- cgit