aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry <winsvega@mail.ru>2016-12-08 01:07:42 +0800
committerDimitry <winsvega@mail.ru>2016-12-08 01:07:42 +0800
commitdf97106322e39ced3007bb3fee6b96003c791b5a (patch)
tree95a83e69dd91890ba807f4a17b572f38ad46a355
parente0d64ef1dd2b058fcb97e1453334ccdaec8f6a8f (diff)
downloaddexon-tests-df97106322e39ced3007bb3fee6b96003c791b5a.tar
dexon-tests-df97106322e39ced3007bb3fee6b96003c791b5a.tar.gz
dexon-tests-df97106322e39ced3007bb3fee6b96003c791b5a.tar.bz2
dexon-tests-df97106322e39ced3007bb3fee6b96003c791b5a.tar.lz
dexon-tests-df97106322e39ced3007bb3fee6b96003c791b5a.tar.xz
dexon-tests-df97106322e39ced3007bb3fee6b96003c791b5a.tar.zst
dexon-tests-df97106322e39ced3007bb3fee6b96003c791b5a.zip
upgrade eip158 to general tests
-rw-r--r--src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json4
-rw-r--r--src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json11
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfterFiller.json4
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json33
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfterFiller.json43
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json33
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfterFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json33
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfterFiller.json8
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json38
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfterFiller.json48
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json38
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfterFiller.json47
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json38
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json8
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json38
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfterFiller.json4
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json33
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfterFiller.json8
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json33
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfterFiller.json8
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json33
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfterFiller.json8
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json38
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfterFiller.json8
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json38
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfterFiller.json8
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json38
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGEFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json8
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json38
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json18
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json19
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json20
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json4
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json18
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json19
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json8
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json32
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json32
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json32
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json32
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json32
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json32
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json8
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json10
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json9
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json28
-rw-r--r--src/GeneralStateTestsFiller/stExample/add11Filler.json4
-rw-r--r--src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractOOGInitCodeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json26
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json26
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json29
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json26
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json23
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json24
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json13
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log0_emptyMemFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log0_logMemStartTooHighFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log0_logMemsizeTooHighFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log0_logMemsizeZeroFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMemFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMem_logMemSize1Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log1_CallerFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log1_MaxTopicFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log1_emptyMemFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log1_logMemStartTooHighFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log1_logMemsizeTooHighFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log1_logMemsizeZeroFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMemFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMem_logMemSize1Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log2_CallerFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log2_MaxTopicFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log2_emptyMemFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log2_logMemStartTooHighFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log2_logMemsizeTooHighFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log2_logMemsizeZeroFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMemFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMem_logMemSize1Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log3_CallerFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log3_MaxTopicFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log3_PCFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log3_emptyMemFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log3_logMemStartTooHighFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log3_logMemsizeTooHighFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log3_logMemsizeZeroFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMemFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMem_logMemSize1Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log4_CallerFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log4_MaxTopicFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log4_PCFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log4_emptyMemFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log4_logMemStartTooHighFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log4_logMemsizeTooHighFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log4_logMemsizeZeroFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMemFiller.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMem_logMemSize1Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json2
-rw-r--r--src/GeneralStateTestsFiller/stLogTests/logInOOG_CallFiller.json2
216 files changed, 1321 insertions, 254 deletions
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json
index 0104a09c7..736a8995c 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json
@@ -15,7 +15,7 @@
"result" : {
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
- "0x00" : "0x0401",
+ "0x00" : "0x401",
"0x01" : "0x01",
"0x02" : "0x0fa3e9"
}
@@ -28,7 +28,7 @@
"result" : {
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
- "0x00" : "0x0401",
+ "0x00" : "0x85",
"0x01" : "0x01",
"0x02" : "0x20789"
}
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json
index 5dd941ba4..13b573a8c 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json
@@ -27,7 +27,7 @@
"result" : {
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
- "0x00" : "0x01",
+ "0x00" : "0x00",
"0x02" : "0x00"
}
}
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
index 38cbba6a9..0c93d608c 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
@@ -11,12 +11,21 @@
"expect" : [
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
- "network" : ["Frontier", "Homestead", "EIP158"],
+ "network" : ["Frontier", "Homestead"],
"result" : {
"0000000000000000000000000000000000000000" : {
"balance" : "0x0de0b6b3a7640017"
}
}
+ },
+ {
+ "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+ "network" : ["EIP158"],
+ "result" : {
+ "0000000000000000000000000000000000000000" : {
+ "shouldnotexist" : "1"
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001Filler.json
index b8d2280fa..b5dbe655f 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001Filler.json
@@ -64,7 +64,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGEFiller.json
index 3fff39a3d..8e9f79875 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGEFiller.json
@@ -53,7 +53,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfterFiller.json
index 326084e1b..5b1b99f9c 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfterFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -63,7 +63,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBeforeFiller.json
index 39b5f5da0..81569176f 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBeforeFiller.json
@@ -55,7 +55,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json
index 1e39eb79c..55b11bade 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json
@@ -50,7 +50,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json
index 4c65e1a41..513704c9a 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json
@@ -55,7 +55,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
index 3daa03688..cc3bf2335 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
@@ -46,7 +46,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -70,6 +70,37 @@
"balance" : "566207"
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568187"
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01Filler.json
index 0dcec2184..2402ad8dc 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01Filler.json
@@ -51,7 +51,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGEFiller.json
index 4726d8f3d..d92d5e8e1 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGEFiller.json
@@ -42,7 +42,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json
index 05bcd454c..eb4d7973f 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json
@@ -47,7 +47,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010Filler.json
index 66664ccf3..39884ee36 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010Filler.json
@@ -59,7 +59,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGEFiller.json
index 8f78d3581..54e29113c 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGEFiller.json
@@ -53,7 +53,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfterFiller.json
index 322fa1828..61447365b 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfterFiller.json
@@ -54,7 +54,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -86,6 +86,45 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
}
],
"pre" : {
@@ -141,4 +180,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBeforeFiller.json
index b3e4b04ef..1523458cf 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBeforeFiller.json
@@ -56,7 +56,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json
index 188cfda39..b4496665e 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json
@@ -45,7 +45,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json
index 2bf1fd974..f403eccfe 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json
@@ -47,7 +47,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
index af27f96e7..e290e3827 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
@@ -46,7 +46,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -70,6 +70,37 @@
"balance" : "566207"
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568187"
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011Filler.json
index bd6ad30bb..d01be15bf 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011Filler.json
@@ -48,7 +48,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGEFiller.json
index 695fbc543..2cc9a831a 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGEFiller.json
@@ -55,7 +55,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfterFiller.json
index 9793f87be..b4aacd4b7 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfterFiller.json
@@ -56,7 +56,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json
index 3d34e414a..f9ccc20c4 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json
@@ -57,7 +57,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json
index 7b4ade132..ffe19ab54 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json
@@ -50,7 +50,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
index d2f5f90b0..2ce42b1cc 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
@@ -38,7 +38,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
index e7ea74889..f7dd34513 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -46,7 +46,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -70,6 +70,37 @@
"balance" : "566204"
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568184"
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10Filler.json
index 46205c7b6..402a34e0c 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10Filler.json
@@ -45,7 +45,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGEFiller.json
index 85ea6be22..15b5f717b 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGEFiller.json
@@ -48,7 +48,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json
index 0c5a2dd7b..fa8a760eb 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json
@@ -39,7 +39,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100Filler.json
index e77b40305..807a33434 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100Filler.json
@@ -52,7 +52,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGEFiller.json
index c2a10bc99..ce9d549c7 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGEFiller.json
@@ -56,7 +56,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfterFiller.json
index 859218f06..a3fbd8ea5 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfterFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -57,11 +57,11 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x00",
+ "0x00" : "0x01",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -147,4 +147,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBeforeFiller.json
index 0b5dbfedd..78dc05d76 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBeforeFiller.json
@@ -57,7 +57,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json
index eb96bc404..d1016a71d 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json
@@ -52,7 +52,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json
index 8ed15aa53..ebfeb7258 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json
@@ -44,7 +44,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
index 223286e45..0589892f1 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
@@ -51,7 +51,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -80,6 +80,42 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568187"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101Filler.json
index 876d5913e..41c3dde47 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101Filler.json
@@ -62,7 +62,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGEFiller.json
index 75787d025..917ffe397 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGEFiller.json
@@ -56,7 +56,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfterFiller.json
index 2597ac3be..e5ed8fd40 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfterFiller.json
@@ -59,7 +59,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -96,6 +96,50 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
}
],
"pre" : {
@@ -151,4 +195,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json
index 88049c17b..0ac5ee9eb 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json
@@ -55,7 +55,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json
index 0846b7ec1..7031f6c51 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json
@@ -51,7 +51,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
index 5d1cb8085..6b0b4f905 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
@@ -50,7 +50,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
index 8894520fc..438182fc5 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
@@ -51,7 +51,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -80,6 +80,42 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568184"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11Filler.json
index 84af96919..7e20019cd 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11Filler.json
@@ -60,7 +60,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGEFiller.json
index d0065581b..81b2e1e94 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGEFiller.json
@@ -48,7 +48,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json
index c0209ef06..5c5f6cf1b 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json
@@ -40,7 +40,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110Filler.json
index 536247aaf..366b45a7d 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110Filler.json
@@ -54,7 +54,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGEFiller.json
index 642567955..4e4a5a19d 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGEFiller.json
@@ -56,7 +56,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfterFiller.json
index 6c2482fa6..0e6c94074 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfterFiller.json
@@ -58,7 +58,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -94,6 +94,49 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
}
],
"pre" : {
@@ -149,4 +192,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json
index 003ed4c8b..07bafc393 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json
@@ -56,7 +56,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json
index 5aaa1726b..2e419880a 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json
@@ -44,7 +44,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
index 6c0b16667..318d91abc 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
@@ -45,7 +45,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
index 231da81cd..079cf8eed 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
@@ -51,7 +51,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -80,6 +80,42 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568184"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111Filler.json
index 6c48c2bb8..8b58ebba5 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111Filler.json
@@ -47,7 +47,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGEFiller.json
index 3eb8b1cdc..b3cfe8731 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGEFiller.json
@@ -56,7 +56,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json
index d31a51877..4aa77c132 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -57,11 +57,11 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x00",
+ "0x00" : "0x01",
"0x01" : "0x00",
"0x02" : "0x00"
}
@@ -147,4 +147,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json
index c35817ae4..fa213a0fb 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json
@@ -56,7 +56,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
index 4e9d484c9..1bb034b8e 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
@@ -48,7 +48,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
index 351353024..6a5720a10 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
@@ -46,7 +46,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
index 4f5e250df..723b182ec 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -51,7 +51,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -80,6 +80,42 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568181"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001Filler.json
index 383964c21..fd4eb3065 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001Filler.json
@@ -60,7 +60,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGEFiller.json
index f7209eb59..87106e2f1 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGEFiller.json
@@ -55,7 +55,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfterFiller.json
index 8530487e4..7cf5b13cf 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfterFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -59,7 +59,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBeforeFiller.json
index 2123cba74..751396a56 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBeforeFiller.json
@@ -57,7 +57,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json
index d303bf03a..716313c87 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json
@@ -50,7 +50,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json
index 808303fb9..8665a5f36 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json
@@ -51,7 +51,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000010000000000",
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
index d01e5294d..f95f76b78 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
@@ -46,7 +46,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -70,6 +70,37 @@
"balance" : "566207"
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x01",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568187"
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01Filler.json
index 211e0f969..d1fc13f52 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01Filler.json
@@ -48,7 +48,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_OOGEFiller.json
index 6ae2dbc24..7a1859981 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_OOGEFiller.json
@@ -43,7 +43,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json
index 4bda92f08..39530683f 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json
@@ -46,7 +46,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010Filler.json
index 780d10c6f..732747474 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010Filler.json
@@ -55,7 +55,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGEFiller.json
index a7bae21b9..782f32198 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGEFiller.json
@@ -55,7 +55,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfterFiller.json
index 2a43806c5..0c0b7bcc1 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfterFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -57,11 +57,11 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x00",
+ "0x00" : "0x01",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -147,4 +147,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBeforeFiller.json
index c8c5c1fe7..431cedcd5 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBeforeFiller.json
@@ -57,7 +57,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json
index 4fd87e2da..307b6dac0 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json
@@ -45,7 +45,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json
index 4f7a94616..a35660e97 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json
@@ -46,7 +46,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000010000000000",
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
index 26f2a6a34..47c167fbc 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
@@ -46,7 +46,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -70,6 +70,37 @@
"balance" : "566207"
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x01",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568187"
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011Filler.json
index df0e456b8..47a4d1fd9 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011Filler.json
@@ -47,7 +47,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGEFiller.json
index 6ffc53e00..d81272b3e 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGEFiller.json
@@ -55,7 +55,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfterFiller.json
index 85efea5d8..03b4b692c 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfterFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -57,11 +57,11 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x00",
+ "0x00" : "0x01",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -147,4 +147,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json
index 036a0beb4..a3aa743ce 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json
@@ -57,7 +57,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json
index d063762e6..128234c59 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json
@@ -49,7 +49,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
index db52bc301..df69a42c9 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
@@ -38,7 +38,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000002" : {
"balance" : "10000000000",
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
index 84035cc80..fc5b7e6cd 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -46,7 +46,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -70,6 +70,37 @@
"balance" : "566204"
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x01",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568184"
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10Filler.json
index c594618ca..050fcd8bb 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10Filler.json
@@ -43,7 +43,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_OOGEFiller.json
index 1b01eeb24..61f0d9ccd 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_OOGEFiller.json
@@ -47,7 +47,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json
index 24c13a279..f3a1ed2c2 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json
@@ -39,7 +39,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100Filler.json
index c56e8b0f1..f291fc45d 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100Filler.json
@@ -49,7 +49,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGEFiller.json
index 90f1d0c52..52de1d0ad 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGEFiller.json
@@ -56,7 +56,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfterFiller.json
index 11d9a1836..3a3188d9a 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfterFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -57,11 +57,11 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x00",
+ "0x00" : "0x01",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -147,4 +147,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBeforeFiller.json
index 10c2ceb06..3b99ac782 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBeforeFiller.json
@@ -57,7 +57,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json
index dc96e9739..f1472000f 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json
@@ -51,7 +51,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json
index 095aa16a4..151d76b8f 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json
@@ -45,7 +45,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000010000000000",
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
index d639566a7..c37ba6248 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
@@ -51,7 +51,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -80,6 +80,42 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568187"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101Filler.json
index 923677ad6..238067df2 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101Filler.json
@@ -58,7 +58,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGEFiller.json
index 3ce2894d7..d65a81e6b 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGEFiller.json
@@ -56,7 +56,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfterFiller.json
index e37d41442..c0bc22880 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfterFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -57,11 +57,11 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x00",
+ "0x00" : "0x01",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -147,4 +147,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json
index ca55ca746..71a19113b 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json
@@ -57,7 +57,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json
index ff2381247..79b030813 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json
@@ -53,7 +53,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
index e97e520bd..8b4170f88 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
@@ -45,7 +45,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"balance" : "1000000010000000000",
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
index b6f04963e..d79a47ce9 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
@@ -51,7 +51,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -80,6 +80,42 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568184"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11Filler.json
index 417bc6f0e..d307693ce 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11Filler.json
@@ -58,7 +58,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_OOGEFiller.json
index d0065581b..81b2e1e94 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_OOGEFiller.json
@@ -48,7 +48,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json
index c0209ef06..5c5f6cf1b 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json
@@ -40,7 +40,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110Filler.json
index 40b36f0d8..2f4fc4575 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110Filler.json
@@ -52,7 +52,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGEFiller.json
index dcd016ed6..9ecedd70d 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGEFiller.json
@@ -57,7 +57,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfterFiller.json
index 170ccd6e4..56a3e37c3 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfterFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -57,11 +57,11 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x00",
+ "0x00" : "0x01",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -147,4 +147,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json
index e065ede2e..93d23c6c2 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json
@@ -57,7 +57,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json
index bc276895e..ec468db44 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json
@@ -44,7 +44,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
index d61663d6e..882262de0 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
@@ -45,7 +45,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
index 357c66cbc..bc92feb34 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
@@ -51,7 +51,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -80,6 +80,42 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568184"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111Filler.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111Filler.json
index 937140349..69a70aca3 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111Filler.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111Filler.json
@@ -47,7 +47,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGEFiller.json
index c6f8835b0..8c440c651 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGEFiller.json
@@ -57,7 +57,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json
index bcdcb5ca6..82a3765c3 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier","Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -57,11 +57,11 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
- "0x00" : "0x00",
+ "0x00" : "0x01",
"0x01" : "0x00",
"0x02" : "0x00",
"0x03" : "0x00"
@@ -147,4 +147,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json
index c35817ae4..fa213a0fb 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json
@@ -56,7 +56,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
index d79d0ae6e..00cbeff6b 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
@@ -42,7 +42,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000001" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
index 351353024..6a5720a10 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
@@ -46,7 +46,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000001" : {
"balance" : "10000000000",
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
index 4f5e250df..723b182ec 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -51,7 +51,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
@@ -80,6 +80,42 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "568181"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
index eaebdd879..dad14bf17 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
@@ -30,7 +30,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
@@ -38,6 +38,22 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x" : "0x0401",
+ "0x01" : "0x01"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
index 7d903a475..6310606f8 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
@@ -32,7 +32,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
@@ -42,6 +42,23 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x" : "0x85",
+ "0x01" : "0x01",
+ "0x02" : "0x020789"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
index b7b96bcf7..07032979b 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
@@ -32,7 +32,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
@@ -42,6 +42,24 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x03e4",
+ "0x01" : "0x01",
+ "0x02" : "0x01",
+ "0x03" : "0x01"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
index 0f7b5d847..032b750a0 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
@@ -31,7 +31,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
index eaed0bf0a..ebde9a162 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
@@ -40,7 +40,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
index 5ba071334..50b839b21 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "EIP158"],
"result" : {
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
@@ -31,7 +31,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
index 16885ad4f..f0ba9db68 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
@@ -30,7 +30,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
@@ -38,6 +38,22 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x0401",
+ "0x01" : "0x01"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
index 35ae35897..c14ab48f2 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
@@ -32,7 +32,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
@@ -42,6 +42,23 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x" : "0x85",
+ "0x01" : "0x01",
+ "0x02" : "0x020789"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
index afbd9fe31..1ace87f39 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "Homestead"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
@@ -29,10 +29,12 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
}
}
}
@@ -77,4 +79,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
index 8948f993e..578819b1c 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
@@ -8,6 +8,36 @@
"currentTimestamp" : 1,
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead", "EIP158"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000000000",
@@ -47,4 +77,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
index 773f324d0..3da49c9d6 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
@@ -8,6 +8,36 @@
"currentTimestamp" : 1,
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead", "EIP158"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000000000",
@@ -47,4 +77,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
index 20fa9ba59..6345fc112 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
@@ -8,6 +8,36 @@
"currentTimestamp" : 1,
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead", "EIP158"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000000000",
@@ -47,4 +77,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
index 7fc5f0f22..8a9aad903 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
@@ -8,6 +8,36 @@
"currentTimestamp" : 1,
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead", "EIP158"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000000000",
@@ -47,4 +77,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
index 8d5b5aae9..68652b5cd 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
@@ -8,6 +8,36 @@
"currentTimestamp" : 1,
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead", "EIP158"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000000000",
@@ -47,4 +77,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
index 07637dea1..376a1a3c2 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
@@ -8,6 +8,36 @@
"currentTimestamp" : 1,
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : "Frontier",
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead", "EIP158"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000000000",
@@ -47,4 +77,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
index ccbcce94d..e78993d84 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "Homestead"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
@@ -29,10 +29,12 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
}
}
}
@@ -77,4 +79,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
index b22d2023c..f2b56e5ad 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
@@ -39,7 +39,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
index 565884e83..a81ef4987 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "Homestead"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
@@ -32,14 +32,16 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
}
},
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "3000000"
+ "balance" : "61745"
}
}
}
@@ -83,4 +85,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
index 8d5e80ed9..2065af69e 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
@@ -31,7 +31,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
index 7492db961..feb7be590 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
@@ -30,7 +30,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"1000000000000000000000000000000000000000" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
index 3a405262f..db35c2bbd 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
@@ -28,7 +28,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"13136008b64ff592819b2fa6d43f2835c452020e" : {
"balance" : "0x01",
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
index 5cf92eb76..4aa2c6be4 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
@@ -28,7 +28,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"13136008b64ff592819b2fa6d43f2835c452020e" : {
"balance" : "0x01",
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
index 99d34439c..7547a3dce 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
@@ -15,23 +15,22 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier", "Homestead"],
"result" : {
"13136008b64ff592819b2fa6d43f2835c452020e" : {
"shouldnotexist" : "1"
}
}
},
- {
+ {
"indexes" : {
"data" : -1,
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["EIP158"],
"result" : {
"13136008b64ff592819b2fa6d43f2835c452020e" : {
- "shouldnotexist" : "1"
}
}
}
@@ -75,4 +74,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
index bd37a449e..46270f4a3 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
@@ -31,7 +31,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
index 586d559b1..0e5216c77 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
@@ -31,7 +31,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
index e8901b1be..088a56788 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
@@ -28,7 +28,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"13136008b64ff592819b2fa6d43f2835c452020e" : {
"balance" : "0x01",
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
index 79cee2441..9e85ba97d 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["Frontier"],
"result" : {
"0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
"shouldnotexist" : "1"
@@ -31,7 +31,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead"],
"result" : {
"0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
"balance" : "0x01"
@@ -46,12 +46,34 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
+ "shouldnotexist" : "1"
+ },
+ "13136008b64ff592819b2fa6d43f2835c452020e" : {
+ "balance" : "0x00",
+ "storage" : {
+ "0x00" : "0x00",
+ "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
+ "0x0b" : "0x01",
+ "0x14" : "0x00"
+ }
+ }
+ }
}
],
"pre" : {
"1000000000000000000000000000000000000000" : {
"balance" : "10000",
- "code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6620186) \t\t\t\t (MSTORE 64 0xa0f4600b55000000000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }",
+ "code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6620186) (MSTORE 64 0xa0f4600b55000000000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }",
"nonce" : "0",
"storage" : {
}
diff --git a/src/GeneralStateTestsFiller/stExample/add11Filler.json b/src/GeneralStateTestsFiller/stExample/add11Filler.json
index 094b35d24..6c163fd74 100644
--- a/src/GeneralStateTestsFiller/stExample/add11Filler.json
+++ b/src/GeneralStateTestsFiller/stExample/add11Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Frontier",
+ "network" : ["ALL"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "1000000000000100000",
@@ -73,4 +73,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractFiller.json b/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractFiller.json
index c713a3260..785d84a0c 100644
--- a/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractFiller.json
+++ b/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractFiller.json
@@ -11,7 +11,7 @@
"expect" : [
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json b/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json
index 04db36f13..fea3194c3 100644
--- a/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json
+++ b/src/GeneralStateTestsFiller/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json
@@ -20,7 +20,7 @@
},
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1},
- "network" : ["Frontier"],
+ "network" : ["Frontier", "EIP158"],
"result" : {
"6295ee1b4f6dd65047762f924ecd367c17eabf8f": {
}
diff --git a/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractFiller.json b/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractFiller.json
index 6860e8b9d..5c83171b1 100644
--- a/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractFiller.json
+++ b/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractFiller.json
@@ -11,7 +11,7 @@
"expect" : [
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "21000 + Code Execution + Contract Creation",
diff --git a/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractOOGInitCodeFiller.json b/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractOOGInitCodeFiller.json
index 5f267699d..49fb49dcd 100644
--- a/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractOOGInitCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaContractOOGInitCodeFiller.json
@@ -11,7 +11,7 @@
"expect" : [
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"4ff884bffc83e888ae11b32b1d94bf9bc8d1732f" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json b/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json
index 59cad9354..670a812f5 100644
--- a/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json
+++ b/src/GeneralStateTestsFiller/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json
@@ -11,7 +11,7 @@
"expect" : [
{
"indexes" : { "data" : -1, "gas" : -1, "value" : -1},
- "network" : ["Homestead"],
+ "network" : ["Homestead", "EIP158"],
"result" : {
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"nonce" : "1",
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json
index af12c5149..31965829b 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json
@@ -34,6 +34,32 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+ "balance" : "1",
+ "nonce" : "1",
+ "storage" : {
+ "0x" : "0x0c"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json
index 3b25d514c..f6774d396 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier","Homestead"],
+ "network" : ["Frontier","Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"nonce" : "0"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json
index 7cfb1c193..41a669340 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json
@@ -34,6 +34,32 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+ "balance" : "1",
+ "nonce" : "1",
+ "storage" : {
+ "0x" : "0x0c"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json
index 7ca38d787..8289698e2 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier","Homestead"],
+ "network" : ["Frontier","Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"nonce" : "0"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
index 30d99d930..88acc27a5 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
@@ -37,6 +37,35 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+ }
+ },
+ "62c01474f089b07dae603491675dc5b5748f7049" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+ "balance" : "2",
+ "nonce" : "2",
+ "storage" : {
+ "0x" : "0x0c"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json
index c5ee8f6d4..d41f9954f 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json
@@ -34,6 +34,32 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1",
+ "nonce" : "1"
+ },
+ "62c01474f089b07dae603491675dc5b5748f7049" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+ "nonce" : "2",
+ "storage" : {
+ "0x" : "0x0c"
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json
index c9a342f2a..568016315 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json
@@ -37,6 +37,29 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1",
+ "nonce" : "41",
+ "storage" : {
+ "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87"
+ }
+ },
+ "1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : {
+ "shouldnotexist" : "1"
+ },
+ "8e3411c91d5dd4081b4846fa2f93808f5ad19686" : {
+ "shouldnotexist" : "1"
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json
index e4f72e886..1817dea3b 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json
@@ -32,6 +32,30 @@
}
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1",
+ "nonce" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+ "balance" : "0",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json
index 845ae1205..c82921156 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier","Homestead"],
+ "network" : ["Frontier","Homestead", "EIP158"],
"result" : {
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "22177"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json
index 6289e9a32..90c613ab1 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json
@@ -28,7 +28,7 @@
"gas" : -1,
"value" : -1
},
- "network" : "Homestead",
+ "network" : ["Homestead", "EIP158"],
"result" : {
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1000000"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json
index ef64c773f..aa9b95113 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json
@@ -35,7 +35,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Homestead"],
+ "network" : ["Homestead", "EIP158"],
"result" : {
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json b/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json
index 93ebbf640..f0d4d2123 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier","Homestead"],
+ "network" : ["Frontier","Homestead", "EIP158"],
"result" : {
"194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json
index 78459b764..07a441327 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier","Homestead"],
+ "network" : ["Frontier","Homestead", "EIP158"],
"result" : {
"194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json
index 4ad3af366..7c5acb01a 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier","Homestead"],
+ "network" : ["Frontier","Homestead", "EIP158"],
"result" : {
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
"balance" : "72000"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json
index feddfab3e..9b18dfee2 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json
@@ -21,6 +21,19 @@
"balance" : "15"
}
}
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "0000000000000000000000000000000000000000" : {
+ "shouldnotexist" : "1"
+ }
+ }
}
],
"pre" : {
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json
index 534ed8d94..1f44835c4 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier","Homestead"],
+ "network" : ["Frontier","Homestead", "EIP158"],
"result" : {
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
"balance" : "64599"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json
index a0dbb8d6a..b4b474b6e 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier","Homestead"],
+ "network" : ["Frontier","Homestead", "EIP158"],
"result" : {
"6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
"balance" : "1"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json
index 6bf9bd90b..d14eed1d9 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier","Homestead"],
+ "network" : ["Frontier","Homestead", "EIP158"],
"result" : {
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
"balance" : "55000"
diff --git a/src/GeneralStateTestsFiller/stLogTests/log0_emptyMemFiller.json b/src/GeneralStateTestsFiller/stLogTests/log0_emptyMemFiller.json
index 33f4df040..382662127 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log0_emptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log0_emptyMemFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log0_logMemStartTooHighFiller.json b/src/GeneralStateTestsFiller/stLogTests/log0_logMemStartTooHighFiller.json
index ff9f433c9..8cc0220e2 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log0_logMemStartTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log0_logMemStartTooHighFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log0_logMemsizeTooHighFiller.json b/src/GeneralStateTestsFiller/stLogTests/log0_logMemsizeTooHighFiller.json
index 0f6407c15..1c9af9412 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log0_logMemsizeTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log0_logMemsizeTooHighFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log0_logMemsizeZeroFiller.json b/src/GeneralStateTestsFiller/stLogTests/log0_logMemsizeZeroFiller.json
index 310e9fc7d..f1d49d855 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log0_logMemsizeZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log0_logMemsizeZeroFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMemFiller.json b/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMemFiller.json
index 6c816fe82..8ac623995 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMemFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMem_logMemSize1Filler.json b/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMem_logMemSize1Filler.json
index a906adc6e..cb7d235a5 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMem_logMemSize1Filler.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMem_logMemSize1Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index a61441556..41e468911 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log1_CallerFiller.json b/src/GeneralStateTestsFiller/stLogTests/log1_CallerFiller.json
index dd993c338..a2f000430 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log1_CallerFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log1_CallerFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log1_MaxTopicFiller.json b/src/GeneralStateTestsFiller/stLogTests/log1_MaxTopicFiller.json
index 9503333f4..084eb82e7 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log1_MaxTopicFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log1_MaxTopicFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log1_emptyMemFiller.json b/src/GeneralStateTestsFiller/stLogTests/log1_emptyMemFiller.json
index fb30aba8c..b36d6697a 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log1_emptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log1_emptyMemFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log1_logMemStartTooHighFiller.json b/src/GeneralStateTestsFiller/stLogTests/log1_logMemStartTooHighFiller.json
index 4a8794166..09f26d9c9 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log1_logMemStartTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log1_logMemStartTooHighFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log1_logMemsizeTooHighFiller.json b/src/GeneralStateTestsFiller/stLogTests/log1_logMemsizeTooHighFiller.json
index 42b470f90..56085e579 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log1_logMemsizeTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log1_logMemsizeTooHighFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log1_logMemsizeZeroFiller.json b/src/GeneralStateTestsFiller/stLogTests/log1_logMemsizeZeroFiller.json
index 9b96a2887..73a29105c 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log1_logMemsizeZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log1_logMemsizeZeroFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMemFiller.json b/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMemFiller.json
index b137a8cdd..538e635f2 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMemFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMem_logMemSize1Filler.json b/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMem_logMemSize1Filler.json
index cff20281b..323a1a96f 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMem_logMemSize1Filler.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMem_logMemSize1Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index 8d2dffda7..d1900daea 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log2_CallerFiller.json b/src/GeneralStateTestsFiller/stLogTests/log2_CallerFiller.json
index 85ca75316..d9ecaf22f 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log2_CallerFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log2_CallerFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log2_MaxTopicFiller.json b/src/GeneralStateTestsFiller/stLogTests/log2_MaxTopicFiller.json
index aaed1f0af..245a86a8c 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log2_MaxTopicFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log2_MaxTopicFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log2_emptyMemFiller.json b/src/GeneralStateTestsFiller/stLogTests/log2_emptyMemFiller.json
index a95114c84..d4e2dbc7b 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log2_emptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log2_emptyMemFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log2_logMemStartTooHighFiller.json b/src/GeneralStateTestsFiller/stLogTests/log2_logMemStartTooHighFiller.json
index c3e2e77f0..d2d966f7b 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log2_logMemStartTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log2_logMemStartTooHighFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log2_logMemsizeTooHighFiller.json b/src/GeneralStateTestsFiller/stLogTests/log2_logMemsizeTooHighFiller.json
index 2d1fd1af7..445acf1a4 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log2_logMemsizeTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log2_logMemsizeTooHighFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log2_logMemsizeZeroFiller.json b/src/GeneralStateTestsFiller/stLogTests/log2_logMemsizeZeroFiller.json
index 25c978623..1c65c721d 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log2_logMemsizeZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log2_logMemsizeZeroFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMemFiller.json b/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMemFiller.json
index d242f5ff0..1a77a267b 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMemFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMem_logMemSize1Filler.json b/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMem_logMemSize1Filler.json
index a3467efdc..f5a061f9e 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMem_logMemSize1Filler.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMem_logMemSize1Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index e43ba3f12..1feb2f530 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log3_CallerFiller.json b/src/GeneralStateTestsFiller/stLogTests/log3_CallerFiller.json
index d11001e86..83f61780b 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log3_CallerFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log3_CallerFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log3_MaxTopicFiller.json b/src/GeneralStateTestsFiller/stLogTests/log3_MaxTopicFiller.json
index 51d252dd8..780ec911a 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log3_MaxTopicFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log3_MaxTopicFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log3_PCFiller.json b/src/GeneralStateTestsFiller/stLogTests/log3_PCFiller.json
index 250b39110..90ec3d9c6 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log3_PCFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log3_PCFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log3_emptyMemFiller.json b/src/GeneralStateTestsFiller/stLogTests/log3_emptyMemFiller.json
index c7fd41810..3f0fa44ad 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log3_emptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log3_emptyMemFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log3_logMemStartTooHighFiller.json b/src/GeneralStateTestsFiller/stLogTests/log3_logMemStartTooHighFiller.json
index 4917a5d8c..9061bc3a3 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log3_logMemStartTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log3_logMemStartTooHighFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log3_logMemsizeTooHighFiller.json b/src/GeneralStateTestsFiller/stLogTests/log3_logMemsizeTooHighFiller.json
index ca9c1be0f..536b30e35 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log3_logMemsizeTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log3_logMemsizeTooHighFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log3_logMemsizeZeroFiller.json b/src/GeneralStateTestsFiller/stLogTests/log3_logMemsizeZeroFiller.json
index 1baed0745..0d8730697 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log3_logMemsizeZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log3_logMemsizeZeroFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMemFiller.json b/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMemFiller.json
index 4243ff5a3..a2fbd6a13 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMemFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMem_logMemSize1Filler.json b/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMem_logMemSize1Filler.json
index 10ffb98cc..a6f34cf86 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMem_logMemSize1Filler.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMem_logMemSize1Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index 2a15ce5e9..65bb2bb6e 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log4_CallerFiller.json b/src/GeneralStateTestsFiller/stLogTests/log4_CallerFiller.json
index c82adbf9c..71693a28a 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log4_CallerFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log4_CallerFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log4_MaxTopicFiller.json b/src/GeneralStateTestsFiller/stLogTests/log4_MaxTopicFiller.json
index 14b632d72..1260f3f23 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log4_MaxTopicFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log4_MaxTopicFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log4_PCFiller.json b/src/GeneralStateTestsFiller/stLogTests/log4_PCFiller.json
index 963a0acdc..d281bf9e0 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log4_PCFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log4_PCFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log4_emptyMemFiller.json b/src/GeneralStateTestsFiller/stLogTests/log4_emptyMemFiller.json
index 4d8d2341f..9b7c0efca 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log4_emptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log4_emptyMemFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log4_logMemStartTooHighFiller.json b/src/GeneralStateTestsFiller/stLogTests/log4_logMemStartTooHighFiller.json
index 215e89675..a448f0f79 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log4_logMemStartTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log4_logMemStartTooHighFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log4_logMemsizeTooHighFiller.json b/src/GeneralStateTestsFiller/stLogTests/log4_logMemsizeTooHighFiller.json
index e2067170d..583707d27 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log4_logMemsizeTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log4_logMemsizeTooHighFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log4_logMemsizeZeroFiller.json b/src/GeneralStateTestsFiller/stLogTests/log4_logMemsizeZeroFiller.json
index 63577ab34..1d6fdaea0 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log4_logMemsizeZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log4_logMemsizeZeroFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMemFiller.json b/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMemFiller.json
index 9e90c4d01..180615d34 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMemFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMem_logMemSize1Filler.json b/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMem_logMemSize1Filler.json
index 1ec4a55a8..c07550722 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMem_logMemSize1Filler.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMem_logMemSize1Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index d0fc084c4..ae0f59fe1 100644
--- a/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {
diff --git a/src/GeneralStateTestsFiller/stLogTests/logInOOG_CallFiller.json b/src/GeneralStateTestsFiller/stLogTests/logInOOG_CallFiller.json
index 61e102fb5..18a280927 100644
--- a/src/GeneralStateTestsFiller/stLogTests/logInOOG_CallFiller.json
+++ b/src/GeneralStateTestsFiller/stLogTests/logInOOG_CallFiller.json
@@ -15,7 +15,7 @@
"gas" : -1,
"value" : -1
},
- "network" : ["Frontier", "Homestead"],
+ "network" : ["Frontier", "Homestead", "EIP158"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"storage" : {