aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry <winsvega@mail.ru>2016-12-16 23:22:29 +0800
committerDimitry <winsvega@mail.ru>2016-12-16 23:22:29 +0800
commit60075171252faccb5cb761939fd0e49f88e40204 (patch)
tree989bfb93c24ffbf93d02f7f8fe1f48a63f9ae8f7
parentda5bd1d9b6ff3aa48d653d7c2f26c2d481e5d19b (diff)
downloadtangerine-tests-60075171252faccb5cb761939fd0e49f88e40204.tar
tangerine-tests-60075171252faccb5cb761939fd0e49f88e40204.tar.gz
tangerine-tests-60075171252faccb5cb761939fd0e49f88e40204.tar.bz2
tangerine-tests-60075171252faccb5cb761939fd0e49f88e40204.tar.lz
tangerine-tests-60075171252faccb5cb761939fd0e49f88e40204.tar.xz
tangerine-tests-60075171252faccb5cb761939fd0e49f88e40204.tar.zst
tangerine-tests-60075171252faccb5cb761939fd0e49f88e40204.zip
eip150 test fillers to general tests
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/Call1024BalanceTooLowFiller.json87
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json90
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/Callcode1024BalanceTooLowFiller.json85
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_1Filler.json88
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_2Filler.json88
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_valueTransferFiller.json94
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcallcall_000_OOGMAfterFiller.json135
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_1Filler.json159
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_2Filler.json151
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_3Filler.json135
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_1Filler.json141
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_2Filler.json147
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_3Filler.json141
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1Filler.json147
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2Filler.json137
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_1Filler.json147
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_2Filler.json147
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_3Filler.json133
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1Filler.json131
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2Filler.json151
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3Filler.json147
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1Filler.json149
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2Filler.json147
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3Filler.json141
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfterFiller.json113
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1Filler.json147
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2Filler.json147
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3Filler.json147
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json89
-rw-r--r--src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json84
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json91
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json105
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json105
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json106
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json91
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json89
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json83
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json131
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json91
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json91
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json96
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json96
-rw-r--r--src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json96
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json78
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasAskFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasFiller.json116
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAskFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAskFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAskFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasAskFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferAskFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAskFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallMemoryGasAskFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallMemoryGasFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2Filler.json84
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransferFiller.json84
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasFiller.json84
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasMemoryFiller.json84
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasValueTransferFiller.json84
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemoryFiller.json84
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasAskFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasFiller.json116
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAskFiller.json95
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryFiller.json116
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyGasFiller.json85
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGasFiller.json85
-rw-r--r--src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json85
-rw-r--r--src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCallsFiller.json103
-rw-r--r--src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCallsFiller.json117
-rw-r--r--src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCallsFiller.json101
-rw-r--r--src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCallsFiller.json101
-rw-r--r--src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCallsFiller.json97
-rw-r--r--src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCallsFiller.json97
-rw-r--r--src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCallsFiller.json105
-rw-r--r--src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCallsFiller.json147
-rw-r--r--src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert2Filler.json (renamed from src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert2Filler.json)0
-rw-r--r--src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json (renamed from src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert3Filler.json)0
-rw-r--r--src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevertFiller.json (renamed from src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevertFiller.json)0
-rw-r--r--src/GeneralStateTestsFiller/stRevertTest/chfastRevertDepth2Filler.json (renamed from src/GeneralStateTestsFiller/stEIP158Specific/chfastRevertDepth2Filler.json)7
-rw-r--r--src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundEmptyFiller.json88
-rw-r--r--src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundEmptyOOGFiller.json71
-rw-r--r--src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundFiller.json88
-rw-r--r--src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundOOGFiller.json71
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevertFiller.json69
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevertFiller.json80
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevertFiller.json76
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevertFiller.json79
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_OOGRevertFiller.json69
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevertFiller.json76
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevertFiller.json76
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevertFiller.json77
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevertFiller.json69
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevertFiller.json80
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevertFiller.json76
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevertFiller.json79
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json72
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json79
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json79
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json82
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevertFiller.json58
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevertFiller.json62
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevertFiller.json62
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevertFiller.json63
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevertFiller.json58
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevertFiller.json62
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevertFiller.json62
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevertFiller.json63
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json87
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToEmptyFiller.json101
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalanceFiller.json93
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKeyFiller.json98
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json91
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json98
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json94
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json100
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALLFiller.json106
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmptyFiller.json125
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalanceFiller.json113
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json120
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json82
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json89
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json85
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json89
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLFiller.json75
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmptyFiller.json76
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalanceFiller.json72
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json73
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithDataFiller.json75
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmptyFiller.json76
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalanceFiller.json72
-rw-r--r--src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json78
-rw-r--r--src/StateTestsFiller/EIP150/stChangedTestsFiller.json30
-rw-r--r--src/StateTestsFiller/EIP150/stEIPsingleCodeGasPricesFiller.json2
139 files changed, 12984 insertions, 33 deletions
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/Call1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/Call1024BalanceTooLowFiller.json
new file mode 100644
index 000000000..2917b48f6
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/Call1024BalanceTooLowFiller.json
@@ -0,0 +1,87 @@
+{
+ "Call1024BalanceTooLow" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "0x7fffffffffffffff",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x0401",
+ "0x01" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xffffffffffffffffffffffffffffffff",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+
+ "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "7000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1024",
+ "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b @@0 0 0 0 0) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "17592186099592"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json
new file mode 100644
index 000000000..5c317c068
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json
@@ -0,0 +1,90 @@
+{
+ "Call1024PreCalls" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "0x7fffffffffffffff",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x03e4",
+ "0x01" : "0x01",
+ "0x02" : "0x01",
+ "0x03" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "1",
+ "0x01" : "0",
+ "0x02" : "1",
+ "0x03" : "1"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xfffffffffffffffffffffffffffffffff",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+
+ "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "7000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "2024",
+ "code" : "{ [[ 2 ]] (CALL 0xffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[ 3 ]] (CALL 0xffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "0x7ffffffffffffff0"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/Callcode1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/Callcode1024BalanceTooLowFiller.json
new file mode 100644
index 000000000..bb6cbc74d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/Callcode1024BalanceTooLowFiller.json
@@ -0,0 +1,85 @@
+{
+ "Callcode1024BalanceTooLow" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "0x7fffffffffffffff",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x0401",
+ "0x01" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xffffffffffffffffffffffffffffffff",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "7000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1024",
+ "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALLCODE 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b @@0 0 0 0 0) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "0x7ffffffffffffff0"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_1Filler.json
new file mode 100644
index 000000000..5137cc462
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_1Filler.json
@@ -0,0 +1,88 @@
+{
+ "callcall_00_OOGE_1" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "30000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x01",
+ "0x05" : "0x02"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0",
+ "0x05" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 2 1) (SSTORE 5 (CALLVALUE)) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "180066"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_2Filler.json
new file mode 100644
index 000000000..dfdea91fc
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_2Filler.json
@@ -0,0 +1,88 @@
+{
+ "callcall_00_OOGE_2" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "30000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x01",
+ "0x05" : "0x02"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x05" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 2 1) (SSTORE 5 (CALLVALUE)) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "150066"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_valueTransferFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_valueTransferFiller.json
new file mode 100644
index 000000000..adc8327a8
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_valueTransferFiller.json
@@ -0,0 +1,94 @@
+{
+ "callcall_00_OOGE_valueTransfer" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "10"
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "10",
+ "storage" : {
+ "0x02" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0"
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "storage" : {
+ "0x02" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALL 150000 0x1000000000000000000000000000000000000001 20 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 10 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 2 1) (MSTORE 2 1)}",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcall_000_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcall_000_OOGMAfterFiller.json
new file mode 100644
index 000000000..4b3a06da3
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcall_000_OOGMAfterFiller.json
@@ -0,0 +1,135 @@
+{
+ "callcallcall_000_OOGMAfter" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1)}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_1Filler.json
new file mode 100644
index 000000000..956cbf00a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_1Filler.json
@@ -0,0 +1,159 @@
+{
+ "callcallcallcode_001_OOGMAfter_1" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150", "Frontier"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALLCODE 60151 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALLCODE 40073 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_2Filler.json
new file mode 100644
index 000000000..1558db87b
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_2Filler.json
@@ -0,0 +1,151 @@
+{
+ "callcallcallcode_001_OOGMAfter_2" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150", "Frontier"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALL 40085 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_3Filler.json
new file mode 100644
index 000000000..730a3d511
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_3Filler.json
@@ -0,0 +1,135 @@
+{
+ "callcallcallcode_001_OOGMAfter_3" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1)}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_1Filler.json
new file mode 100644
index 000000000..08a89bf00
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_1Filler.json
@@ -0,0 +1,141 @@
+{
+ "callcallcodecall_010_OOGMAfter_1" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "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"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "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" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALLCODE 60151 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (DELEGATECALL 40077 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_2Filler.json
new file mode 100644
index 000000000..4fe779726
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_2Filler.json
@@ -0,0 +1,147 @@
+{
+ "callcallcodecall_010_OOGMAfter_2" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (DELEGATECALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALL 20040 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_3Filler.json
new file mode 100644
index 000000000..59769385c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_3Filler.json
@@ -0,0 +1,141 @@
+{
+ "callcallcodecall_010_OOGMAfter_3" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1Filler.json
new file mode 100644
index 000000000..7eaedf9e9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1Filler.json
@@ -0,0 +1,147 @@
+{
+ "callcallcodecallcode_011_OOGMAfter_1" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALL 60140 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (DELEGATECALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2Filler.json
new file mode 100644
index 000000000..1bbb28f95
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2Filler.json
@@ -0,0 +1,137 @@
+{
+ "callcallcodecallcode_011_OOGMAfter_2" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALL 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_1Filler.json
new file mode 100644
index 000000000..25b097da2
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_1Filler.json
@@ -0,0 +1,147 @@
+{
+ "callcodecallcall_100_OOGMAfter_1" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (DELEGATECALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALLCODE 40085 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_2Filler.json
new file mode 100644
index 000000000..e7d6850d2
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_2Filler.json
@@ -0,0 +1,147 @@
+{
+ "callcodecallcall_100_OOGMAfter_2" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (DELEGATECALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_3Filler.json
new file mode 100644
index 000000000..1b20e52c2
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_3Filler.json
@@ -0,0 +1,133 @@
+{
+ "callcodecallcall_100_OOGMAfter_3" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALLCODE 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1Filler.json
new file mode 100644
index 000000000..84b46229c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1Filler.json
@@ -0,0 +1,131 @@
+{
+ "callcodecallcallcode_101_OOGMAfter_1" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALLCODE 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2Filler.json
new file mode 100644
index 000000000..701d50581
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2Filler.json
@@ -0,0 +1,151 @@
+{
+ "callcodecallcallcode_101_OOGMAfter_2" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "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"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "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" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (DELEGATECALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALLCODE 40085 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3Filler.json
new file mode 100644
index 000000000..a747d0538
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3Filler.json
@@ -0,0 +1,147 @@
+{
+ "callcodecallcallcode_101_OOGMAfter_3" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (DELEGATECALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALL 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1Filler.json
new file mode 100644
index 000000000..7f130ab7e
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1Filler.json
@@ -0,0 +1,149 @@
+{
+ "callcodecallcodecall_110_OOGMAfter_1" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "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"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "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" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (DELEGATECALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (DELEGATECALL 40085 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 3 1)}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2Filler.json
new file mode 100644
index 000000000..232d62f14
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2Filler.json
@@ -0,0 +1,147 @@
+{
+ "callcodecallcodecall_110_OOGMAfter_2" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (DELEGATECALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (DELEGATECALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 3 1)}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3Filler.json
new file mode 100644
index 000000000..693ad83b4
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3Filler.json
@@ -0,0 +1,141 @@
+{
+ "callcodecallcodecall_110_OOGMAfter_3" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALLCODE 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1)}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALL 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfterFiller.json
new file mode 100644
index 000000000..27a457595
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfterFiller.json
@@ -0,0 +1,113 @@
+{
+ "callcodecallcodecallcode_111_OOGMAfter" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (CALLCODE 60150 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1Filler.json
new file mode 100644
index 000000000..ad7537566
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1Filler.json
@@ -0,0 +1,147 @@
+{
+ "callcodecallcodecallcode_111_OOGMAfter_1" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (DELEGATECALL 60140 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (DELEGATECALL 40100 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SSTORE 3 (GAS)) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2Filler.json
new file mode 100644
index 000000000..30b9b0767
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2Filler.json
@@ -0,0 +1,147 @@
+{
+ "callcodecallcodecallcode_111_OOGMAfter_2" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (DELEGATECALL 60140 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (DELEGATECALL 40100 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3Filler.json
new file mode 100644
index 000000000..142413a23
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3Filler.json
@@ -0,0 +1,147 @@
+{
+ "callcodecallcodecallcode_111_OOGMAfter_3" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "storage" : {
+ "0x02" : "0x00",
+ "0x03" : "0x00"
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "storage" : {
+ "0x03" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{ [[ 0 ]] (DELEGATECALL 60140 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ [[ 1 ]] (DELEGATECALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 3 1) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000002" : {
+ "balance" : "0",
+ "code" : "{ [[ 2 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000003" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 3 1) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "172000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json
new file mode 100644
index 000000000..fddf37ec5
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json
@@ -0,0 +1,89 @@
+{
+ "contractCreationMakeCallThatAskMoreGasThenTransactionProvided" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150", "Frontier"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f": {
+ "balance" : "0"
+ },
+ "1000000000000000000000000000000000000001": {
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f": {
+ "shouldnotexist" : "1"
+ },
+ "1000000000000000000000000000000000000001": {
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1100000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100000",
+ "code" : "{(CALL 50000 0x1000000000000000000000000000000000000001 0 0 64 0 64)}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "100000",
+ "code" : "{(SSTORE 1 1)}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x6040600060406000600073100000000000000000000000000000000000000161c350f1"
+ ],
+ "gasLimit" : [
+ "96000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ ""
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json
new file mode 100644
index 000000000..e1f89afe1
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json
@@ -0,0 +1,84 @@
+{
+ "createInitFail_OOGduringInit" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "0000000000000000000000000000000000000000" : {
+ "shouldnotexist" : "1"
+ },
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a76330e3"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "0000000000000000000000000000000000000000" : {
+ "balance" : "1000000000000100000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ },
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999870979"
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "53021"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json
new file mode 100644
index 000000000..ff5908cae
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json
@@ -0,0 +1,91 @@
+{
+ "CallAndCallcodeConsumeMoreGasThenTransactionHas" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x12",
+ "0x08" : "0x08d5b6",
+ "0x09" : "0x01",
+ "0x0a" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x08" : "0",
+ "0x09" : "0",
+ "0x0a" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "By new EIP150 rules this transaction would be executed even if call consumes more gas then transaction has.",
+ "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000103 0 0 0 0 0)) (SSTORE 10 (CALLCODE 600000 0x1000000000000000000000000000000000000103 0 0 0 0 0)) } ",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000103" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "should be 12 in the post state",
+ "code" : "{ (SSTORE 0 0x12) } ",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json
new file mode 100644
index 000000000..5192f9349
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json
@@ -0,0 +1,105 @@
+{
+ "CallAskMoreGasOnDepth2ThenTransactionHas" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000107" : {
+ "storage" : {
+ "0x08" : "0x030d3e",
+ "0x09" : "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000108" : {
+ "storage" : {
+ "0x08" : "0x02b157"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000107" : {
+ "storage" : {
+ "0x08" : "0",
+ "0x09" : "0"
+ }
+ },
+ "1000000000000000000000000000000000000108" : {
+ "storage" : {
+ "0x08" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "ordinal call should work but on second depth it has call that asks more gas than left",
+ "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 200000 0x1000000000000000000000000000000000000107 0 0 0 0 0)) } ",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000107" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "should work on EIP150",
+ "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000108 0 0 0 0 0)) } ",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000108" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "should be set in the post state",
+ "code" : "{ (SSTORE 8 (GAS))} ",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json b/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json
new file mode 100644
index 000000000..e01c8431a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json
@@ -0,0 +1,105 @@
+{
+ "CallGoesOOGOnSecondLevel2" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000113" : {
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000114" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000113" : {
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000114" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "OOG Call transaction has less gas then in example above",
+ "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000113 0 0 0 0 0)) } ",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000113" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000114 0 0 0 0 0)) } ",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000114" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (GAS)) (SSTORE 10 (GAS)) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "160000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json
new file mode 100644
index 000000000..0bd615c84
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json
@@ -0,0 +1,106 @@
+{
+ "CallGoesOOGOnSecondLevel" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000110" : {
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000111" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000110" : {
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000111" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "OOG Call because call goes OOG on second level",
+ "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000110 0 0 0 0 0)) } ",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000110" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "Inner CaLL goes OOG on EIP150",
+ "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 0x1000000000000000000000000000000000000111 0 0 0 0 0)) } ",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000111" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 8 (GAS)) (CREATE 0 0 0) (CREATE 0 0 0) (SSTORE 9 (GAS)) (SSTORE 10 (GAS)) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "220000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json
new file mode 100644
index 000000000..48a7ef3d4
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json
@@ -0,0 +1,91 @@
+{
+ "CreateAndGasInsideCreate" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x09" : "0x076e34",
+ "0x0a" : "0x08d5b6",
+ "0x0b" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "storage" : {
+ "0xfd" : "0x07ea53"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x09" : "0x076e34",
+ "0x0a" : "0x08d5b6",
+ "0x0b" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "storage" : {
+ "0xfd" : "0x080a7c"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "Test gas before Create, inside create and after",
+ "code" : "{ (SSTORE 10 (GAS)) (MSTORE 0 0x5a60fd55) (SSTORE 11 (CREATE 0 28 4)) (SSTORE 9 (GAS)) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json
new file mode 100644
index 000000000..0518e4beb
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json
@@ -0,0 +1,89 @@
+{
+ "DelegateCallOnEIP" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x12",
+ "0x08" : "0x08d5b6",
+ "0x09" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x08" : "0",
+ "0x09" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "should work on EIP150 rules",
+ "code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (DELEGATECALL 600000 0x1000000000000000000000000000000000000105 0 0 0 0)) }",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000105" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "should be 12 in the post state",
+ "code" : "{ (SSTORE 0 0x12) } ",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json
new file mode 100644
index 000000000..bd2e3af71
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json
@@ -0,0 +1,83 @@
+{
+ "ExecuteCallThatAskForeGasThenTrabsactionHas" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0x0c"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000001" : {
+ "storage" : {
+ "0x01" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "{ [[1]] (CALL 600000 0x1000000000000000000000000000000000000001 0 0 0 0 0) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "100000",
+ "code" : "{ [[1]] 12 }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "100000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json
new file mode 100644
index 000000000..e7550ba15
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json
@@ -0,0 +1,131 @@
+{
+ "NewGasPriceForCodes" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x12",
+ "0x01" : "0x20",
+ "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000",
+ "0x03" : "0xe8d49be840",
+ "0x04" : "0x12",
+ "0x07" : "0x01",
+ "0x08" : "0x01",
+ "0x0a" : "0x05e276",
+ "0x64" : "0x11"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x12",
+ "0x01" : "0",
+ "0x02" : "0",
+ "0x03" : "0",
+ "0x04" : "0",
+ "0x07" : "0",
+ "0x08" : "0",
+ "0x0a" : "0",
+ "0x64" : "0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x12",
+ "0x01" : "0x20",
+ "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000",
+ "0x03" : "0xe8d49be840",
+ "0x04" : "0x12",
+ "0x07" : "0x01",
+ "0x08" : "0x01",
+ "0x0a" : "0x05f428",
+ "0x64" : "0x11"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000010" : {
+ "balance" : "111",
+ "code" : "0x1122334455667788991011121314151617181920212223242526272829303132",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000011" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SSTORE 100 0x11) }",
+ "storage": {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "Test gasPrice of thise codes after EIP150 transition",
+ "code" : "{ (SSTORE 1 (EXTCODESIZE 0x1000000000000000000000000000000000000010)) (EXTCODECOPY 0x1000000000000000000000000000000000000010 0 0 20) (SSTORE 2 (MLOAD 0)) (SSTORE 4 (SLOAD 0)) (SSTORE 5 (CALL 30000 0x1000000000000000000000000000000000000011 1 0 0 0 0)) (SSTORE 6 (CALLCODE 30000 0x1000000000000000000000000000000000000011 1 0 0 0 0)) (SSTORE 7 (DELEGATECALL 30000 0x1000000000000000000000000000000000000011 0 0 0 0)) (SSTORE 8 (CALL 30000 0x1000000000000000000000000000000000000013 0 0 0 0 0)) (SSTORE 3 (BALANCE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)) (SSTORE 10 (GAS)) }",
+ "storage": {
+ "0x00" : "0x12"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json
new file mode 100644
index 000000000..31841f032
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json
@@ -0,0 +1,91 @@
+{
+ "SuicideToExistingContract" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000118" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x08bf58"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000118" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x08d574"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "check gas spent on suicide known contract on EIP150",
+ "code" : "{ (CALL 60000 0x1000000000000000000000000000000000000118 0 0 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000118" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "Suicide to existing account",
+ "code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json
new file mode 100644
index 000000000..c851b9157
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json
@@ -0,0 +1,91 @@
+{
+ "SuicideToNotExistingContract" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000116" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x085db0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000116" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x08d574"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "check gas spent on suicide to unknown contract on EIP150",
+ "code" : "{ (CALL 60000 0x1000000000000000000000000000000000000116 0 0 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000116" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "Suicide to not existing account",
+ "code" : "{ (SUICIDE 0x2000000000000000000000000000000000000115) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json
new file mode 100644
index 000000000..efab9e041
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json
@@ -0,0 +1,96 @@
+{
+ "Transaction64Rule_d64e0" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000118" : {
+ "storage" : {
+ "0x01" : "0x0c"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x021f34",
+ "0x02" : "0x018016"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000118" : {
+ "storage" : {
+ "0x01" : "0"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x02" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "check gas spent on suicide known contract on EIP150",
+ "code" : "{ [[0]] (GAS) (CALL 160000 0x1000000000000000000000000000000000000118 0 0 0 0 0) [[2]] (GAS) }",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000118" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[1]] 12 }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "160062"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json
new file mode 100644
index 000000000..ecfd4c218
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json
@@ -0,0 +1,96 @@
+{
+ "Transaction64Rule_d64m1" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000118" : {
+ "storage" : {
+ "0x01" : "0x0c"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x021f33",
+ "0x02" : "0x018015"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000118" : {
+ "storage" : {
+ "0x01" : "0"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x02" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "check gas spent on suicide known contract on EIP150",
+ "code" : "{ [[0]] (GAS) (CALL 160000 0x1000000000000000000000000000000000000118 0 0 0 0 0) [[2]] (GAS) }",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000118" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[1]] 12 }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "160061"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json
new file mode 100644
index 000000000..e0fc55cef
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json
@@ -0,0 +1,96 @@
+{
+ "Transaction64Rule_d64p1" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000118" : {
+ "storage" : {
+ "0x01" : "0x0c"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x021f35",
+ "0x02" : "0x018017"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000118" : {
+ "storage" : {
+ "0x01" : "0"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x02" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "check gas spent on suicide known contract on EIP150",
+ "code" : "{ [[0]] (GAS) (CALL 160000 0x1000000000000000000000000000000000000118 0 0 0 0 0) [[2]] (GAS) }",
+ "storage": {
+ }
+ },
+ "1000000000000000000000000000000000000118" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[1]] 12 }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "160063"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json
new file mode 100644
index 000000000..bf6fe0ed5
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json
@@ -0,0 +1,78 @@
+{
+ "RawBalanceGas" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x0885fc"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x088778"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (BALANCE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasAskFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasAskFiller.json
new file mode 100644
index 000000000..3c52efbd5
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasAskFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallCodeGasAsk" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06aff9",
+ "0x02" : "0x06e228"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x02" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALLCODE 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasFiller.json
new file mode 100644
index 000000000..fb35a1a89
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasFiller.json
@@ -0,0 +1,116 @@
+{
+ "RawCallCodeGas" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06aff9",
+ "0x02" : "0x752e"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06b28d",
+ "0x02" : "0x0752e"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06b28d",
+ "0x02" : "0x752e"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALLCODE 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAskFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAskFiller.json
new file mode 100644
index 000000000..94350b4f5
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAskFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallCodeGasMemoryAsk" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06ac91",
+ "0x02" : "0x06dece"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x02" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALLCODE 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 8000 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryFiller.json
new file mode 100644
index 000000000..56706df2d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallCodeGasMemory" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06ac91",
+ "0x02" : "0x752e"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06af25",
+ "0x02" : "0x752e"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALLCODE 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 8000 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAskFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAskFiller.json
new file mode 100644
index 000000000..14b9eb3de
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAskFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallCodeGasValueTransferAsk" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x0695cd",
+ "0x02" : "0x06c889"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x02" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALLCODE 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferFiller.json
new file mode 100644
index 000000000..284a33e65
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallCodeGasValueTransfer" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x0695cd",
+ "0x02" : "0x7e2a"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x069861",
+ "0x02" : "0x7e2a"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALLCODE 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAskFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAskFiller.json
new file mode 100644
index 000000000..e7b63e61c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAskFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallCodeGasValueTransferMemoryAsk" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x069265",
+ "0x02" : "0x06c52e"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x02" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALLCODE 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 8000 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryFiller.json
new file mode 100644
index 000000000..360620d33
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallCodeGasValueTransferMemory" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x069265",
+ "0x02" : "0x7e2a"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x0694f9",
+ "0x02" : "0x7e2a"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALLCODE 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 8000 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasAskFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasAskFiller.json
new file mode 100644
index 000000000..8550dcaa9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasAskFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallGasAsk" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x06e228"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06aff9"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasFiller.json
new file mode 100644
index 000000000..ff2f2c15a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallGas" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x752e"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06aff9"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x752e"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06b28d"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALL 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferAskFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferAskFiller.json
new file mode 100644
index 000000000..489975a0b
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferAskFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallGasValueTransferAsk" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x06c889"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x0695cd"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferFiller.json
new file mode 100644
index 000000000..37a3038a9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallGasValueTransfer" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x7e2a"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x0695cd"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x7e2a"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x069861"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALL 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAskFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAskFiller.json
new file mode 100644
index 000000000..1b6c59c64
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAskFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallGasValueTransferMemoryAsk" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x06c52e"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x069265"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 8000 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryFiller.json
new file mode 100644
index 000000000..bb8378e7a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallGasValueTransferMemory" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x7e2a"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x069265"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x7e2a"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x0694f9"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALL 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 10 0 8000 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallMemoryGasAskFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallMemoryGasAskFiller.json
new file mode 100644
index 000000000..9722c67a9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallMemoryGasAskFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallMemoryGasAsk" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x06dece"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06ac91"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 8000 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallMemoryGasFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallMemoryGasFiller.json
new file mode 100644
index 000000000..133d1e2be
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallMemoryGasFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawCallMemoryGas" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x752e"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06ac91"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x02" : "0x752e"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06af25"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CALL 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 8000 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2Filler.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2Filler.json
new file mode 100644
index 000000000..c62934a75
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2Filler.json
@@ -0,0 +1,84 @@
+{
+ "RawCreateFailGasValueTransfer2" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06807e"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06807e"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CREATE 11 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransferFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransferFiller.json
new file mode 100644
index 000000000..6bfe1fa27
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransferFiller.json
@@ -0,0 +1,84 @@
+{
+ "RawCreateFailGasValueTransfer" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x0683e6"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x0683e6"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CREATE 11 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasFiller.json
new file mode 100644
index 000000000..f9befc407
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasFiller.json
@@ -0,0 +1,84 @@
+{
+ "RawCreateGas" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x0683e6"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "0"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x0683e6"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "0"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CREATE 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasMemoryFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasMemoryFiller.json
new file mode 100644
index 000000000..565a41ca2
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasMemoryFiller.json
@@ -0,0 +1,84 @@
+{
+ "RawCreateGasMemory" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06807e"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "0"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06807e"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "0"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CREATE 0 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasValueTransferFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasValueTransferFiller.json
new file mode 100644
index 000000000..0dfa1f5c3
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasValueTransferFiller.json
@@ -0,0 +1,84 @@
+{
+ "RawCreateGasValueTransfer" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x0683e6"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "10"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x0683e6"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "10"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CREATE 10 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemoryFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemoryFiller.json
new file mode 100644
index 000000000..67a81cbec
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemoryFiller.json
@@ -0,0 +1,84 @@
+{
+ "RawCreateGasValueTransferMemory" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06807e"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "10"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06807e"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "10"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (CREATE 10 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasAskFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasAskFiller.json
new file mode 100644
index 000000000..bbac66227
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasAskFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawDelegateCallGasAsk" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06affc",
+ "0x02" : "0x06e22b"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x02" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (DELEGATECALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasFiller.json
new file mode 100644
index 000000000..c782c046f
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasFiller.json
@@ -0,0 +1,116 @@
+{
+ "RawDelegateCallGas" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06affc",
+ "0x02" : "0x752e"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x02" : "0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06b290",
+ "0x02" : "0x752e"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (DELEGATECALL 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAskFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAskFiller.json
new file mode 100644
index 000000000..dab3ae751
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAskFiller.json
@@ -0,0 +1,95 @@
+{
+ "RawDelegateCallGasMemoryAsk" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06ac94",
+ "0x02" : "0x06ded1"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x02" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (DELEGATECALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 8000 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryFiller.json
new file mode 100644
index 000000000..a5ceeb980
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryFiller.json
@@ -0,0 +1,116 @@
+{
+ "RawDelegateCallGasMemory" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06ac94",
+ "0x02" : "0x752e"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x02" : "0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x074f16",
+ "0x01" : "0x06af28",
+ "0x02" : "0x752e"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "{ [[2]] (GAS) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (DELEGATECALL 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 8000 0 8000) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "500000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyGasFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyGasFiller.json
new file mode 100644
index 000000000..48c48b556
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyGasFiller.json
@@ -0,0 +1,85 @@
+{
+ "RawExtCodeCopyGas" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x0884c3"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x08876b"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "0x112233445566778899101112131415161718191202122232425",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (EXTCODECOPY 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 20) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGasFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGasFiller.json
new file mode 100644
index 000000000..dd19f294c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGasFiller.json
@@ -0,0 +1,85 @@
+{
+ "RawExtCodeCopyMemoryGas" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x087bb5"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x087e5d"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "0x112233445566778899101112131415161718191202122232425",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (EXTCODECOPY 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 11120) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json
new file mode 100644
index 000000000..7103bb326
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json
@@ -0,0 +1,85 @@
+{
+ "RawExtCodeSizeGas" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x0884d0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x088778"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "0x112233445566778899101112131415161718191202122232425",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]] (GAS) (EXTCODESIZE 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b) [[1]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCallsFiller.json b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCallsFiller.json
new file mode 100644
index 000000000..267bfebd2
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCallsFiller.json
@@ -0,0 +1,103 @@
+{
+ "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999877487"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {
+ "0x08": "0x08d5b6",
+ "0x09": "0x01",
+ "0x00": "0x12",
+ "0x0a": "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000103": {
+ "storage": {
+ "0x00": "0x12"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999400000"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {
+ "0x08": "0",
+ "0x09": "0",
+ "0x00": "0",
+ "0x0a": "0"
+ }
+ },
+ "1000000000000000000000000000000000000103": {
+ "storage": {
+ "0x00": "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre": {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0xe8d4a51000",
+ "code": "0x",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000103": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x6012600055",
+ "storage": {}
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000103620927c0f160095560ff60ff60ff60ff6000731000000000000000000000000000000000000103620927c0f2600a55",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "0x0927c0"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCallsFiller.json b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCallsFiller.json
new file mode 100644
index 000000000..019a9dbb1
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCallsFiller.json
@@ -0,0 +1,117 @@
+{
+ "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999877441"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {
+ "0x08": "0x08d5b6",
+ "0x09": "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000108": {
+ "storage": {
+ "0x08": "0x02b128"
+ }
+ },
+ "1000000000000000000000000000000000000107": {
+ "storage": {
+ "0x08": "0x030d3e",
+ "0x09": "0x01"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999753883"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {
+ "0x08": "0x08d5b6",
+ "0x09": "0"
+ }
+ },
+ "1000000000000000000000000000000000000108": {
+ "storage": {
+ "0x08": "0"
+ }
+ },
+ "1000000000000000000000000000000000000107": {
+ "storage": {
+ "0x08": "0",
+ "0x09": "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre": {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0xe8d4a51000",
+ "code": "0x",
+ "storage": {}
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x5a60085560ff60ff60ff60ff600073100000000000000000000000000000000000010762030d40f1600955",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000108": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x5a600855",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000107": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000108620927c0f1600955",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "0x0927c0"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCallsFiller.json b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCallsFiller.json
new file mode 100644
index 000000000..0b60034cc
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCallsFiller.json
@@ -0,0 +1,101 @@
+{
+ "CallGoesOOGOnSecondLevel2WithMemExpandingCalls" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999840000"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000113": {
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000114": {
+ "storage": {}
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999840000"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000113": {
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000114": {
+ "storage": {}
+ }
+ }
+ }
+ ],
+ "pre": {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0xe8d4a51000",
+ "code": "0x",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000114": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x5a6008555a6009555a600a55",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000113": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000114620927c0f1600955",
+ "storage": {}
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000113620927c0f1600955",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "0x027100"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCallsFiller.json b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCallsFiller.json
new file mode 100644
index 000000000..96ab92403
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCallsFiller.json
@@ -0,0 +1,101 @@
+{
+ "CallGoesOOGOnSecondLevelWithMemExpandingCalls" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999780000"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000110": {
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000111": {
+ "storage": {}
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999780000"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000110": {
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000111": {
+ "storage": {}
+ }
+ }
+ }
+ ],
+ "pre": {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0xe8d4a51000",
+ "code": "0x",
+ "storage": {}
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000110620927c0f1600955",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000111": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x5a600855600060006000f050600060006000f0505a6009555a600a55",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000110": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000111620927c0f1600955",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "0x035b60"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCallsFiller.json b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCallsFiller.json
new file mode 100644
index 000000000..2d6d54bc5
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCallsFiller.json
@@ -0,0 +1,97 @@
+{
+ "CreateAndGasInsideCreateWithMemExpandingCalls" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999866961"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "storage": {
+ "0x0b": "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x09": "0x076e34",
+ "0x0a": "0x08d5b6"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40": {
+ "storage": {
+ "0xfd": "0x07ea53"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999866961"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "storage": {
+ "0x0b": "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x09": "0x076e34",
+ "0x0a": "0x08d5b6"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40": {
+ "storage": {
+ "0xfd": "0x080a7c"
+ }
+ }
+ }
+ }
+ ],
+ "pre": {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0xe8d4a51000",
+ "code": "0x",
+ "storage": {}
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x5a600a55635a60fd556000526004601c6000f0600b555a600955",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "0x0927c0"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCallsFiller.json b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCallsFiller.json
new file mode 100644
index 000000000..447670907
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCallsFiller.json
@@ -0,0 +1,97 @@
+{
+ "DelegateCallOnEIPWithMemExpandingCalls" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999918220"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {
+ "0x08": "0x08d5b6",
+ "0x09": "0x01",
+ "0x00": "0x12"
+ }
+ },
+ "1000000000000000000000000000000000000105": {
+ "storage": {}
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999400000"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {
+ "0x08": "0",
+ "0x09": "0",
+ "0x00": "0"
+ }
+ },
+ "1000000000000000000000000000000000000105": {
+ "storage": {}
+ }
+ }
+ }
+ ],
+ "pre": {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0xe8d4a51000",
+ "code": "0x",
+ "storage": {}
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x5a60085560ff60ff60ff60ff731000000000000000000000000000000000000105620927c0f4600955",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000105": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x6012600055",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "0x0927c0"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCallsFiller.json b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCallsFiller.json
new file mode 100644
index 000000000..fcc259db5
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCallsFiller.json
@@ -0,0 +1,105 @@
+{
+ "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "38222"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {
+ "0x01": "0x01"
+ }
+ },
+ "1000000000000000000000000000000000000001": {
+ "balance": "100000",
+ "storage": {
+ "0x01": "0x0c"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+ "balance": "61778"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "0"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {
+ "0x01": "0"
+ }
+ },
+ "1000000000000000000000000000000000000001": {
+ "balance": "100000",
+ "storage": {
+ "0x01": "0"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+ "balance": "100000"
+ }
+ }
+ }
+ ],
+ "pre": {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0x0186a0",
+ "code": "0x",
+ "storage": {}
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x60ff60ff60ff60ff6000731000000000000000000000000000000000000001620927c0f1600155",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000001": {
+ "nonce": "0x00",
+ "balance": "0x0186a0",
+ "code": "0x600c600155",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "0x0186a0"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCallsFiller.json b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCallsFiller.json
new file mode 100644
index 000000000..3a9eb4c76
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCallsFiller.json
@@ -0,0 +1,147 @@
+{
+ "NewGasPriceForCodesWithMemExpandingCalls" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "1000000000000000000000000000000000000010": {
+ "balance": "111"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {
+ "0x02": "0x1122334455667788991011121314151617181920000000000000000000000000",
+ "0x03": "0xe8d49be840",
+ "0x00": "0x12",
+ "0x01": "0x20",
+ "0x07": "0x01",
+ "0x04": "0x12",
+ "0x08": "0x01",
+ "0x0a": "0x05e249",
+ "0x64": "0x11"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999765606"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "1000000000000000000000000000000000000010": {
+ "balance": "111"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {
+ "0x02": "0",
+ "0x03": "0",
+ "0x00": "0x12",
+ "0x01": "0",
+ "0x07": "0",
+ "0x04": "0",
+ "0x08": "0",
+ "0x0a": "0",
+ "0x64": "0"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999400000"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "1000000000000000000000000000000000000010": {
+ "balance": "111"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "storage": {
+ "0x02": "0x1122334455667788991011121314151617181920000000000000000000000000",
+ "0x03": "0xe8d49be840",
+ "0x00": "0x12",
+ "0x01": "0x20",
+ "0x07": "0x01",
+ "0x04": "0x12",
+ "0x08": "0x01",
+ "0x0a": "0x05f3fb",
+ "0x64": "0x11"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "1",
+ "balance": "999999770136"
+ }
+ }
+ }
+ ],
+ "pre": {
+ "1000000000000000000000000000000000000010": {
+ "nonce": "0x00",
+ "balance": "0x6f",
+ "code": "0x1122334455667788991011121314151617181920212223242526272829303132",
+ "storage": {}
+ },
+ "1000000000000000000000000000000000000011": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x6011606455",
+ "storage": {}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0xe8d4a51000",
+ "code": "0x",
+ "storage": {}
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x7310000000000000000000000000000000000000103b6001556014600060007310000000000000000000000000000000000000103c60005160025560005460045560ff60ff60ff60ff6001731000000000000000000000000000000000000011617530f160055560ff60ff60ff60ff6001731000000000000000000000000000000000000011617530f260065560ff60ff60ff60ff731000000000000000000000000000000000000011617530f460075560ff60ff60ff60ff6000731000000000000000000000000000000000000013617530f160085573a94f5374fce5edbc8e2a8697c15331677e6ebf0b316003555a600a55",
+ "storage": {
+ "0x00": "0x12"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "0x0927c0"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert2Filler.json
index c59c30353..c59c30353 100644
--- a/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert2Filler.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert2Filler.json
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert3Filler.json b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json
index 20f990a8e..20f990a8e 100644
--- a/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert3Filler.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.json
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevertFiller.json b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevertFiller.json
index 12214cb3a..12214cb3a 100644
--- a/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevertFiller.json
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/chfastRevertDepth2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/chfastRevertDepth2Filler.json
index e7a0cd9d9..7c2c0a80d 100644
--- a/src/GeneralStateTestsFiller/stEIP158Specific/chfastRevertDepth2Filler.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/chfastRevertDepth2Filler.json
@@ -41,6 +41,9 @@
"0x01" : "0x00",
"0x02" : "0x00"
}
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
}
}
}
@@ -92,8 +95,8 @@
"170685"
],
"gasPrice" : "1",
- "nonce" : "0x014f",
- "secretKey" : "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
"to" : "a000000000000000000000000000000000000000",
"value" : [
"0"
diff --git a/src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundEmptyFiller.json b/src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundEmptyFiller.json
new file mode 100644
index 000000000..9a75d1eed
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundEmptyFiller.json
@@ -0,0 +1,88 @@
+{
+ "chfastRevertPrefound" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a000000000000000000000000000000000000000" : {
+ "balance" : "1",
+ "code" : "{ [[0]] (CREATE 0 0 32) [[1]]12 }",
+ "nonce" : "",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG",
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "94000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "a000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundEmptyOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundEmptyOOGFiller.json
new file mode 100644
index 000000000..b20009ea5
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundEmptyOOGFiller.json
@@ -0,0 +1,71 @@
+{
+ "chfastRevertPrefound" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a000000000000000000000000000000000000000" : {
+ "balance" : "1",
+ "code" : "{ [[0]] (CREATE 0 0 32) [[1]]12 }",
+ "nonce" : "",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG",
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "93000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "a000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundFiller.json b/src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundFiller.json
new file mode 100644
index 000000000..598befca7
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundFiller.json
@@ -0,0 +1,88 @@
+{
+ "chfastRevertPrefound" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+ "balance" : "1",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+ "balance" : "1",
+ "code" : "",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+ "balance" : "1",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a000000000000000000000000000000000000000" : {
+ "balance" : "1",
+ "code" : "{ [[0]] (CREATE 0 0 32) [[1]]12 }",
+ "nonce" : "",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG",
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "94000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "a000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundOOGFiller.json
new file mode 100644
index 000000000..4c93d8879
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRevertTest/chfastRevertPrefoundOOGFiller.json
@@ -0,0 +1,71 @@
+{
+ "chfastRevertPrefound" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+ "balance" : "1",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+ "balance" : "1",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a000000000000000000000000000000000000000" : {
+ "balance" : "1",
+ "code" : "{ [[0]] (CREATE 0 0 32) [[1]]12 }",
+ "nonce" : "",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "so X has nothing but the balance Transaction calls A A creates X A went OOG",
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "93000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "a000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevertFiller.json
new file mode 100644
index 000000000..e458d885d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevertFiller.json
@@ -0,0 +1,69 @@
+{
+ "ZeroValue_CALLCODE_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x64" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "135000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevertFiller.json
new file mode 100644
index 000000000..0239bb7c0
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevertFiller.json
@@ -0,0 +1,80 @@
+{
+ "ZeroValue_CALLCODE_ToEmpty_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x64" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "135000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevertFiller.json
new file mode 100644
index 000000000..39d231ac9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevertFiller.json
@@ -0,0 +1,76 @@
+{
+ "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x64" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "135000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevertFiller.json
new file mode 100644
index 000000000..e0099a69e
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevertFiller.json
@@ -0,0 +1,79 @@
+{
+ "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x64" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "135000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_OOGRevertFiller.json
new file mode 100644
index 000000000..9bc9594c9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_OOGRevertFiller.json
@@ -0,0 +1,69 @@
+{
+ "ZeroValue_CALL_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x64" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "135000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevertFiller.json
new file mode 100644
index 000000000..5c655e905
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevertFiller.json
@@ -0,0 +1,76 @@
+{
+ "ZeroValue_CALL_ToEmpty_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {}
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x64" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "135000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevertFiller.json
new file mode 100644
index 000000000..b8c7cc91c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevertFiller.json
@@ -0,0 +1,76 @@
+{
+ "ZeroValue_CALL_ToNonZeroBalance_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x64" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "135000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevertFiller.json
new file mode 100644
index 000000000..b07f805fe
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevertFiller.json
@@ -0,0 +1,77 @@
+{
+ "ZeroValue_CALL_ToOneStorageKey_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : { "0x00" : "0x01" }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x64" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "135000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevertFiller.json
new file mode 100644
index 000000000..e65d3577e
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevertFiller.json
@@ -0,0 +1,69 @@
+{
+ "ZeroValue_DELEGATECALL_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x64" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]](GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "135000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevertFiller.json
new file mode 100644
index 000000000..d7dae5af4
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevertFiller.json
@@ -0,0 +1,80 @@
+{
+ "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x64" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "135000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevertFiller.json
new file mode 100644
index 000000000..1c5c5e147
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevertFiller.json
@@ -0,0 +1,76 @@
+{
+ "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x64" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "135000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevertFiller.json
new file mode 100644
index 000000000..1dc86b806
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevertFiller.json
@@ -0,0 +1,79 @@
+{
+ "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x64" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "135000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json
new file mode 100644
index 000000000..113a1237c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json
@@ -0,0 +1,72 @@
+{
+ "ZeroValue_SUICIDE_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {}
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {}
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (CALL 40000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]](GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "100000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json
new file mode 100644
index 000000000..e58c0bc3b
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json
@@ -0,0 +1,79 @@
+{
+ "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {}
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {}
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (CALL 50000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 }",
+ "storage": {
+ }
+ },
+ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "75000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
new file mode 100644
index 000000000..f9edb5b68
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
@@ -0,0 +1,79 @@
+{
+ "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {}
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (CALL 50000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 }",
+ "storage": {
+ }
+ },
+ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "75000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json
new file mode 100644
index 000000000..3da96a9f3
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json
@@ -0,0 +1,82 @@
+{
+ "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : { "0x00" : "0x01" }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : { "0x00" : "0x01" }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (CALL 50000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 }",
+ "storage": {
+ "0x00" : "0x01"
+ }
+ },
+ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+ "storage": {
+ "0x00" : "0x01"
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "75000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevertFiller.json
new file mode 100644
index 000000000..c9494b781
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevertFiller.json
@@ -0,0 +1,58 @@
+{
+ "ZeroValue_TransactionCALL_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x00"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "20000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevertFiller.json
new file mode 100644
index 000000000..5dbeb71e6
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevertFiller.json
@@ -0,0 +1,62 @@
+{
+ "ZeroValue_TransactionCALL_ToEmpty_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {}
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "20000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevertFiller.json
new file mode 100644
index 000000000..71cc7dd1c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevertFiller.json
@@ -0,0 +1,62 @@
+{
+ "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "20000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevertFiller.json
new file mode 100644
index 000000000..a2f7bba70
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevertFiller.json
@@ -0,0 +1,63 @@
+{
+ "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : { "0x00" : "0x01" }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "20000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevertFiller.json
new file mode 100644
index 000000000..50d54fca7
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevertFiller.json
@@ -0,0 +1,58 @@
+{
+ "ZeroValue_TransactionCALLwithData_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x00"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
+ ],
+ "gasLimit" : [
+ "60000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevertFiller.json
new file mode 100644
index 000000000..0ba10fe65
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevertFiller.json
@@ -0,0 +1,62 @@
+{
+ "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {}
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
+ ],
+ "gasLimit" : [
+ "60000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevertFiller.json
new file mode 100644
index 000000000..4af24a68e
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevertFiller.json
@@ -0,0 +1,62 @@
+{
+ "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
+ ],
+ "gasLimit" : [
+ "60000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevertFiller.json
new file mode 100644
index 000000000..6e8b2739a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevertFiller.json
@@ -0,0 +1,63 @@
+{
+ "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : { "0x00" : "0x01" }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
+ ],
+ "gasLimit" : [
+ "75000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json
new file mode 100644
index 000000000..33de1bd18
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json
@@ -0,0 +1,87 @@
+{
+ "ZeroValue_CALLCODE" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x08369d"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x083931"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account",
+ "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToEmptyFiller.json
new file mode 100644
index 000000000..a75826999
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToEmptyFiller.json
@@ -0,0 +1,101 @@
+{
+ "ZeroValue_CALLCODE_ToEmpty" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x08369d"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x083931"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalanceFiller.json
new file mode 100644
index 000000000..52f890b2f
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalanceFiller.json
@@ -0,0 +1,93 @@
+{
+ "ZeroValue_CALLCODE_ToNonZeroBalance" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x08369d"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x083931"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKeyFiller.json
new file mode 100644
index 000000000..14fd25b1c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKeyFiller.json
@@ -0,0 +1,98 @@
+{
+ "ZeroValue_CALLCODE_ToOneStorageKey" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x08369d"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x083931"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json
new file mode 100644
index 000000000..5b51234ee
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json
@@ -0,0 +1,91 @@
+{
+ "ZeroValue_CALL" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x08369d"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x07d789"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account",
+ "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json
new file mode 100644
index 000000000..951137dc3
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json
@@ -0,0 +1,98 @@
+{
+ "ZeroValue_CALL_ToEmpty" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x08369d"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x083931"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
+ "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json
new file mode 100644
index 000000000..8fa4b5c2f
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json
@@ -0,0 +1,94 @@
+{
+ "ZeroValue_CALL_ToNonZeroBalance" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x08369d"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x083931"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
+ "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json
new file mode 100644
index 000000000..6e9338bca
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json
@@ -0,0 +1,100 @@
+{
+ "ZeroValue_CALL_ToOneStorageKey" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x08369d"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x083931"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
+ "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALLFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALLFiller.json
new file mode 100644
index 000000000..f83e2334b
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALLFiller.json
@@ -0,0 +1,106 @@
+{
+ "ZeroValue_DELEGATECALL" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x0836a0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x64" : "0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x083934"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmptyFiller.json
new file mode 100644
index 000000000..b38b767f8
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmptyFiller.json
@@ -0,0 +1,125 @@
+{
+ "ZeroValue_DELEGATECALL_ToEmpty" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x0836a0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x64" : "0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x083934"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalanceFiller.json
new file mode 100644
index 000000000..0bd04d6ff
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalanceFiller.json
@@ -0,0 +1,113 @@
+{
+ "ZeroValue_DELEGATECALL_ToNonZeroBalance" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x0836a0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x64" : "0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x083934"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json
new file mode 100644
index 000000000..235349469
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json
@@ -0,0 +1,120 @@
+{
+ "ZeroValue_DELEGATECALL_ToOneStorageKey" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x0836a0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x64" : "0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x083934"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json
new file mode 100644
index 000000000..ee267187f
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json
@@ -0,0 +1,82 @@
+{
+ "ZeroValue_SUICIDE" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json
new file mode 100644
index 000000000..2edaed678
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json
@@ -0,0 +1,89 @@
+{
+ "ZeroValue_SUICIDE_ToEmpty" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json
new file mode 100644
index 000000000..48d88e994
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json
@@ -0,0 +1,85 @@
+{
+ "ZeroValue_SUICIDE_ToNonZeroBalance" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json
new file mode 100644
index 000000000..90ac9040e
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json
@@ -0,0 +1,89 @@
+{
+ "ZeroValue_SUICIDE_ToOneStorageKey" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage": {
+ "0x00" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+ "storage": {
+ "0x00" : "0x01"
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLFiller.json
new file mode 100644
index 000000000..acad2aeb7
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLFiller.json
@@ -0,0 +1,75 @@
+{
+ "ZeroValue_TransactionCALL" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmptyFiller.json
new file mode 100644
index 000000000..c3d717345
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmptyFiller.json
@@ -0,0 +1,76 @@
+{
+ "ZeroValue_TransactionCALL_ToEmpty" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalanceFiller.json
new file mode 100644
index 000000000..b1d95cd2f
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalanceFiller.json
@@ -0,0 +1,72 @@
+{
+ "ZeroValue_TransactionCALL_ToNonZeroBalance" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
new file mode 100644
index 000000000..63fa0a2b4
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
@@ -0,0 +1,73 @@
+{
+ "ZeroValue_TransactionCALL_ToOneStorageKey" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithDataFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithDataFiller.json
new file mode 100644
index 000000000..5de6e0801
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithDataFiller.json
@@ -0,0 +1,75 @@
+{
+ "ZeroValue_TransactionCALLwithData" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x1122334455667788991011121314151617181920"
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmptyFiller.json
new file mode 100644
index 000000000..7e31929a5
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmptyFiller.json
@@ -0,0 +1,76 @@
+{
+ "ZeroValue_TransactionCALLwithData_ToEmpty" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x1122334455667788991011121314151617181920"
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalanceFiller.json
new file mode 100644
index 000000000..455b31a63
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalanceFiller.json
@@ -0,0 +1,72 @@
+{
+ "ZeroValue_TransactionCALLwithData_ToNonZeroBalance" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x1122334455667788991011121314151617181920"
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json
new file mode 100644
index 000000000..934a474f5
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json
@@ -0,0 +1,78 @@
+{
+ "ZeroValue_TransactionCALLwithData_ToOneStorageKey" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x1122334455667788991011121314151617181920"
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/StateTestsFiller/EIP150/stChangedTestsFiller.json b/src/StateTestsFiller/EIP150/stChangedTestsFiller.json
index 4a19e8d59..f26e23046 100644
--- a/src/StateTestsFiller/EIP150/stChangedTestsFiller.json
+++ b/src/StateTestsFiller/EIP150/stChangedTestsFiller.json
@@ -136,7 +136,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -222,7 +221,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -311,7 +309,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -403,7 +400,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -494,7 +490,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -583,7 +578,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -672,7 +666,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -763,7 +756,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -852,7 +844,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -941,7 +932,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -1030,7 +1020,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -1119,7 +1108,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -1208,7 +1196,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -1297,7 +1284,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -1353,7 +1339,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -1409,7 +1394,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -1468,7 +1452,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -1551,7 +1534,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -1634,7 +1616,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -1803,7 +1784,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -1885,7 +1865,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -1966,7 +1945,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -2052,7 +2030,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -2124,7 +2101,6 @@
"code" : "",
"storage": {}
}
-
},
"transaction" : {
"nonce" : "0",
@@ -2181,7 +2157,6 @@
}
}
},
-
"transaction" :
{
"data" : "",
@@ -2231,7 +2206,6 @@
"storage" : {
}
},
-
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "2024",
"code" : "{ [[ 2 ]] (CALL 0xffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[ 3 ]] (CALL 0xffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) }",
@@ -2240,7 +2214,6 @@
}
}
},
-
"transaction" :
{
"data" : "",
@@ -2280,7 +2253,6 @@
"storage" : {
}
},
-
"aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "7000",
"code" : "",
@@ -2288,7 +2260,6 @@
"storage" : {
}
},
-
"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1024",
"code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALLCODE 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b @@0 0 0 0 0) }",
@@ -2297,7 +2268,6 @@
}
}
},
-
"transaction" :
{
"data" : "",
diff --git a/src/StateTestsFiller/EIP150/stEIPsingleCodeGasPricesFiller.json b/src/StateTestsFiller/EIP150/stEIPsingleCodeGasPricesFiller.json
index f483bc4ee..f1b5e65c3 100644
--- a/src/StateTestsFiller/EIP150/stEIPsingleCodeGasPricesFiller.json
+++ b/src/StateTestsFiller/EIP150/stEIPsingleCodeGasPricesFiller.json
@@ -1609,7 +1609,7 @@
}
},
- "RawCreateFailGasValueTransfer" : {
+ "RawCreateFailGasValueTransfer2" : {
"env" : {
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "45678256",