aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json119
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json86
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json106
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json86
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json123
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractAndCallIt_0weiFiller.json90
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractAndCallIt_1weiFiller.json92
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractFiller.json90
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractThatCreateEmptyContractDuiringInit_TransactionFiller.json84
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractThatCreateNOTEmptyContractDuiringInitOOG_TransactionFiller.json94
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractThatCreateNOTEmptyContractDuiringInit_TransactionFiller.json90
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithBalanceFiller.json66
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json108
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json114
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageFiller.json104
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContract_ThenAnotherCALLToNonExistentAccountFiller.json96
-rw-r--r--src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json94
-rw-r--r--src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json94
-rw-r--r--src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json94
-rw-r--r--src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json101
-rw-r--r--src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toEpmtyFiller.json100
-rw-r--r--src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json84
-rw-r--r--src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert2Filler.json77
-rw-r--r--src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert3Filler.json91
-rw-r--r--src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevertFiller.json77
-rw-r--r--src/GeneralStateTestsFiller/stEIP158Specific/chfastRevertDepth2Filler.json103
-rw-r--r--src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.json113
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json86
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmptyFiller.json101
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json91
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKeyFiller.json100
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLFiller.json88
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToEmptyFiller.json93
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json91
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKeyFiller.json100
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALLFiller.json106
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmptyFiller.json125
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json113
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json123
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json81
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json85
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json85
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json93
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLFiller.json81
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmptyFiller.json72
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json72
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKeyFiller.json79
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json81
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmptyFiller.json72
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json72
-rw-r--r--src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json79
51 files changed, 4745 insertions, 0 deletions
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json
new file mode 100644
index 000000000..80b97fd8a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json
@@ -0,0 +1,119 @@
+{
+ "CREATE_AcreateB_BSuicide_BStore" : {
+ "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" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x0c"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x0c"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "1",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "pragma solidity ^0.4.0; Better Make it with LLL",
+ "code" : "contract CSuicide",
+ "code" : "{",
+ "code" : " uint v;",
+ "code" : " function killitself()",
+ "code" : " {",
+ "code" : " suicide(0x11);",
+ "code" : " }",
+ "code" : " ",
+ "code" : " function storesmth()",
+ "code" : " {",
+ "code" : " v = 12;",
+ "code" : " }",
+ "code" : " ",
+ "code" : " function getsmth() returns(uint)",
+ "code" : " {",
+ "code" : " return v;",
+ "code" : " }",
+ "code" : "}",
+ "code" : "",
+ "code" : "contract CreateTest {",
+ "code" : " uint res;",
+ "code" : " uint resV;",
+ "code" : " function run()",
+ "code" : " {",
+ "code" : " CSuicide a = new CSuicide();",
+ "code" : " a.killitself();",
+ "code" : " a.storesmth();",
+ "code" : " resV = a.getsmth();",
+ "code" : " res = 1;",
+ "code" : " }",
+ "code" : "}",
+ "code" : "",
+ "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003c57610037565b610002565b346100025761004e6004805050610050565b005b600060405160c9806101d3833901809050604051809103906000f080156100025790508073ffffffffffffffffffffffffffffffffffffffff166369bda7aa604051817c0100000000000000000000000000000000000000000000000000000000028152600401809050600060405180830381600087803b156100025760325a03f115610002575050508073ffffffffffffffffffffffffffffffffffffffff16633ac6dff3604051817c0100000000000000000000000000000000000000000000000000000000028152600401809050600060405180830381600087803b156100025760325a03f115610002575050508073ffffffffffffffffffffffffffffffffffffffff16636f118b2b600060405160200152604051817c0100000000000000000000000000000000000000000000000000000000028152600401809050602060405180830381600087803b156100025760325a03f115610002575050506040518051906020015060016000508190555060016000600050819055505b5056606060405260b98060106000396000f360606040526000357c0100000000000000000000000000000000000000000000000000000000900480633ac6dff314604d57806369bda7aa14605e5780636f118b2b14606f576049565b6002565b34600257605c60048050506094565b005b34600257606d600480505060a2565b005b34600257607e600480505060a8565b6040518082815260200191505060405180910390f35b600c6000600050819055505b565b6011ff5b565b6000600060005054905060b6565b9056",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "run()",
+ "data" : [
+ "0xc0406226"
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json
new file mode 100644
index 000000000..055464bf9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json
@@ -0,0 +1,86 @@
+{
+ "CREATE_ContractSuicideDuringInit" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "storage" : {
+ "0x01" : "12"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "storage" : {
+ "0x01" : "12"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "This indicates that a call from transaction was initiated",
+ "code" : "{[[1]]12}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+ "data" : [
+ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff"
+ ],
+ "gasLimit" : [
+ "150000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
new file mode 100644
index 000000000..2d1775e7c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
@@ -0,0 +1,106 @@
+{
+ "CREATE_ContractSuicideDuringInit_ThenStoreThenReturn" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "storage" : {
+ "0x01" : "12"
+ }
+ },
+ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "10",
+ "storage" : {
+ "0x01" : "0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "storage" : {
+ "0x01" : "12"
+ }
+ },
+ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "10",
+ "storage" : {
+ "0x01" : "0"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "This indicates that a call from transaction was initiated",
+ "code" : "{[[1]]12}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "This indicates that a call from transaction was initiated",
+ "code" : "{[[1]]12}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}",
+ "data" : [
+ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600b600055600e6012f3"
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json
new file mode 100644
index 000000000..8424e555a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json
@@ -0,0 +1,86 @@
+{
+ "CREATE_ContractSuicideDuringInit_WithValue" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "10",
+ "storage" : {
+ "0x01" : "12"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "10",
+ "storage" : {
+ "0x01" : "12"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "This indicates that a call from transaction was initiated",
+ "code" : "{[[1]]12}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+ "data" : [
+ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff"
+ ],
+ "gasLimit" : [
+ "150000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json
new file mode 100644
index 000000000..ff3c651b5
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json
@@ -0,0 +1,123 @@
+{
+ "CREATE_ContractSuicideDuringInit_WithValueToItself" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "storage" : {
+ "0x01" : "12"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0xe808"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a427ee"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "storage" : {
+ "0x01" : "12"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "22870"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999977120"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "storage" : {
+ "0x01" : "12"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "53740"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999946250"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "This indicates that a call from transaction was initiated",
+ "code" : "{[[1]]12}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0x6295ee1b4f6dd65047762f924ecd367c17eabf8f)}",
+ "data" : [
+ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052736295ee1b4f6dd65047762f924ecd367c17eabf8fff"
+ ],
+ "gasLimit" : [
+ "150000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "10"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractAndCallIt_0weiFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractAndCallIt_0weiFiller.json
new file mode 100644
index 000000000..1af43968a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractAndCallIt_0weiFiller.json
@@ -0,0 +1,90 @@
+{
+ "CREATE_EmptyContractAndCallIt_0wei" : {
+ "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" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x02" : "0x07bc62",
+ "0x03" : "0x01",
+ "0x64" : "0x071c81"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x02" : "0x07bc62",
+ "0x03" : "0x01",
+ "0x64" : "0x071fab"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "nonce" : "0"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CREATE 0 0 32) [[2]](GAS) [[3]] (CALL 60000 (SLOAD 1) 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/stCreateTest/CREATE_EmptyContractAndCallIt_1weiFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractAndCallIt_1weiFiller.json
new file mode 100644
index 000000000..d75e27bb9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractAndCallIt_1weiFiller.json
@@ -0,0 +1,92 @@
+{
+ "CREATE_EmptyContractAndCallIt_1wei" : {
+ "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" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x02" : "0x07bc62",
+ "0x03" : "0x01",
+ "0x64" : "0x070255"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "0x01",
+ "nonce" : "0x01"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x02" : "0x07bc62",
+ "0x03" : "0x01",
+ "0x64" : "0x07057f"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "0x01",
+ "nonce" : "0x00"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CREATE 0 0 32) [[2]](GAS) [[3]](CALL 60000 (SLOAD 1) 1 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/stCreateTest/CREATE_EmptyContractFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractFiller.json
new file mode 100644
index 000000000..c82cee163
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractFiller.json
@@ -0,0 +1,90 @@
+{
+ "CREATE_EmptyContract" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "nonce" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x64" : "0x07bc62"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x64" : "0x07bc62"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "0x00",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CREATE 0 0 32) [[100]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractThatCreateEmptyContractDuiringInit_TransactionFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractThatCreateEmptyContractDuiringInit_TransactionFiller.json
new file mode 100644
index 000000000..4837c393b
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractThatCreateEmptyContractDuiringInit_TransactionFiller.json
@@ -0,0 +1,84 @@
+{
+ "CREATE_EmptyContractThatCreateEmptyContractDuiringInit_Transaction" : {
+ "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" : {
+ "0x01" : "12"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "0x02"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "12"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "0x01"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "This indicates that a call from transaction was initiated",
+ "code" : "{[[1]]12}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (CREATE 0 0 32) }",
+ "data" : [
+ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150602060006000f0"
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractThatCreateNOTEmptyContractDuiringInitOOG_TransactionFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractThatCreateNOTEmptyContractDuiringInitOOG_TransactionFiller.json
new file mode 100644
index 000000000..e981c719a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractThatCreateNOTEmptyContractDuiringInitOOG_TransactionFiller.json
@@ -0,0 +1,94 @@
+{
+ "CREATE_EmptyContractThatCreateNOTEmptyContractDuiringInitOOG_Transaction" : {
+ "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" : {
+ "0x01" : "0x0c"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "0x02"
+ },
+ "a42676447b7cedfa5fde894d1d3df24aab362701" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "0x0c"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "0x01"
+ },
+ "a42676447b7cedfa5fde894d1d3df24aab362701" : {
+ "balance" : "0",
+ "code" : "0x600c600055",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "This indicates that a call from transaction was initiated",
+ "code" : "{[[1]]12}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (CREATE 0 18 14)}",
+ "data" : [
+ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052600e60126000f0"
+ ],
+ "gasLimit" : [
+ "160000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractThatCreateNOTEmptyContractDuiringInit_TransactionFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractThatCreateNOTEmptyContractDuiringInit_TransactionFiller.json
new file mode 100644
index 000000000..c02ebe655
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractThatCreateNOTEmptyContractDuiringInit_TransactionFiller.json
@@ -0,0 +1,90 @@
+{
+ "CREATE_EmptyContractThatCreateNOTEmptyContractDuiringInit_Transaction" : {
+ "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" : {
+ "0x01" : "12"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "0x02"
+ },
+ "64e2ebd6405af8cb348aec519084d3fff42ebba6" : {
+ "code" : "0x600c600055"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "12"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "0x01"
+ },
+ "a42676447b7cedfa5fde894d1d3df24aab362701" : {
+ "code" : "0x600c600055"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "This indicates that a call from transaction was initiated",
+ "code" : "{[[1]]12}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (CREATE 0 18 14)}",
+ "data" : [
+ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052600e60126000f0"
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithBalanceFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithBalanceFiller.json
new file mode 100644
index 000000000..379cde81a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithBalanceFiller.json
@@ -0,0 +1,66 @@
+{
+ "CREATE_EmptyContractWithBalance" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x64" : "0x07bc62"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "0x01"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CREATE 1 0 32) [[100]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
new file mode 100644
index 000000000..47fe72645
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
@@ -0,0 +1,108 @@
+{
+ "CREATE_EmptyContractWithStorageAndCallIt_0wei" : {
+ "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" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x02" : "0x071d30",
+ "0x03" : "0x01",
+ "0x64" : "0x067d4f"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "12"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x02" : "0x071fc4",
+ "0x03" : "0x01",
+ "0x64" : "0x06830d"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "nonce" : "0"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "12"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]]12 (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}",
+ "code" : "{ [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[2]] (GAS) [[3]] (CALL 60000 (SLOAD 1) 0 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "{[[1]]12}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json
new file mode 100644
index 000000000..93d66a39c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json
@@ -0,0 +1,114 @@
+{
+ "CREATE_EmptyContractWithStorageAndCallIt_1wei" : {
+ "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" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x02" : "0x071d30",
+ "0x03" : "0x01",
+ "0x64" : "0x066323"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "0x01",
+ "storage" : {
+ "0x00" : "12"
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "12"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x02" : "0x071fc4",
+ "0x03" : "0x01",
+ "0x64" : "0x0668e1"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "balance" : "0x01",
+ "storage" : {
+ "0x00" : "12"
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "12"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "nonce" : "0",
+ "code" : "{ [[0]]12 (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}",
+ "code" : "{ [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[2]] (GAS) [[3]] (CALL 60000 (SLOAD 1) 1 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "{[[1]]12}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageFiller.json
new file mode 100644
index 000000000..f837b1e63
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageFiller.json
@@ -0,0 +1,104 @@
+{
+ "CREATE_EmptyContractWithStorage" : {
+ "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" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x64" : "0x071d30"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "nonce" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "12"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x64" : "0x071fc4"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "nonce" : "0"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "12"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]]12 (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}",
+ "code" : "{ [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "{[[1]]12}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContract_ThenAnotherCALLToNonExistentAccountFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContract_ThenAnotherCALLToNonExistentAccountFiller.json
new file mode 100644
index 000000000..7023dd41d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContract_ThenAnotherCALLToNonExistentAccountFiller.json
@@ -0,0 +1,96 @@
+{
+ "CREATE_EmptyContract_ThenAnotherCALLToNonExistentAccount" : {
+ "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" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x02" : "0x07bc62",
+ "0x03" : "0x01",
+ "0x64" : "0x071d49"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "nonce" : "1"
+ },
+ "e1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
+ "0x02" : "0x07bc62",
+ "0x03" : "0x01",
+ "0x64" : "0x06be35"
+ }
+ },
+ "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "nonce" : "0"
+ },
+ "e1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+ "nonce" : "0"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CREATE 0 0 32) [[2]](GAS) [[3]] (CALL 60000 0xe1ecf98489fa9ed60a664fc4998db699cfa39d40 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/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json
new file mode 100644
index 000000000..3b1f1ca24
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json
@@ -0,0 +1,94 @@
+{
+ "CREATE_empty000CreateinInitCode_Transaction" : {
+ "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" : {
+ "0x01" : "12"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "0x02"
+ },
+ "a42676447b7cedfa5fde894d1d3df24aab362701" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x01" : "12"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "0x01"
+ },
+ "a42676447b7cedfa5fde894d1d3df24aab362701" : {
+ "balance" : "0x00",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "This indicates that a call from transaction was initiated",
+ "code" : "{[[1]]12}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (CREATE 0 0 0) }",
+ "data" : [
+ "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600060006000f0"
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json
new file mode 100644
index 000000000..9b7c7a57a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json
@@ -0,0 +1,94 @@
+{
+ "CALL_OneVCallSuicide" : {
+ "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",
+ "0x64" : "0x085707"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x64",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x64" : "0x086d23"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+ "storage": {
+ }
+ }
+
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json
new file mode 100644
index 000000000..05416bf2d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json
@@ -0,0 +1,94 @@
+{
+ "CALL_ZeroVCallSuicide" : {
+ "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",
+ "0x64" : "0x087133"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x00",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x64" : "0x08874f"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+ "storage": {
+ }
+ }
+
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json
new file mode 100644
index 000000000..6180c0e1b
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json
@@ -0,0 +1,101 @@
+{
+ "EXP_Empty" : {
+ "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" : {
+ "comment" : "https://etherpad.net/p/EIP158",
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x02" : "0x0873c4",
+ "0x03" : "0x01",
+ "0x04" : "0x07d76c",
+ "0x06" : "0x07741c",
+ "0x08" : "0x070f3c",
+ "0x0a" : "0x06a73c",
+ "0x0b" : "0x01",
+ "0x0c" : "0x060ae4",
+ "0x0d" : "0x01",
+ "0x0e" : "0x056e8c",
+ "0x0f" : "0x01",
+ "0x64" : "0x04d234"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x02" : "0x0873ec",
+ "0x03" : "0x01",
+ "0x04" : "0x07d794",
+ "0x06" : "0x077584",
+ "0x08" : "0x071324",
+ "0x0a" : "0x06b024",
+ "0x0b" : "0x01",
+ "0x0c" : "0x0613cc",
+ "0x0d" : "0x01",
+ "0x0e" : "0x057774",
+ "0x0f" : "0x01",
+ "0x64" : "0x04db1c"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]](EXP 0 12) [[2]](GAS) [[3]](EXP 12 0) [[4]](GAS) [[5]](EXP 0 0xffffffffffffffff) [[6]](GAS) [[7]](EXP 0 0xffffffffffffffffffffffffffffffff) [[8]](GAS) [[9]](EXP 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[10]](GAS) [[11]](EXP 0xffffffffffffffff 0) [[12]](GAS) [[13]](EXP 0xffffffffffffffffffffffffffffffff 0) [[14]](GAS) [[15]](EXP 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toEpmtyFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toEpmtyFiller.json
new file mode 100644
index 000000000..64a89f8d7
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toEpmtyFiller.json
@@ -0,0 +1,100 @@
+{
+ "EXTCODESIZE_toEpmty" : {
+ "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" : "0",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x64" : "0x087147"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "",
+ "storage": {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x64" : "0x0873ef"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (EXTCODESIZE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) [[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/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json
new file mode 100644
index 000000000..411bf912c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json
@@ -0,0 +1,84 @@
+{
+ "EXTCODESIZE_toNonExistent" : {
+ "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",
+ "0x64" : "0x087147"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x64" : "0x0873ef"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (EXTCODESIZE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) [[100]] (GAS) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert2Filler.json b/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert2Filler.json
new file mode 100644
index 000000000..c59c30353
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert2Filler.json
@@ -0,0 +1,77 @@
+{
+ "TouchToEmptyAccountRevert2" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](CALL 30000 0x1000000000000000000000000000000000000000 0 0 0 0 0) [[1]](CALL 30000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) }",
+ "storage": {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[2]](CALL 30000 0x1000000000000000000000000000000000000000 0 0 0 0 0) [[3]] 1 }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "77400"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert3Filler.json b/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert3Filler.json
new file mode 100644
index 000000000..20f990a8e
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert3Filler.json
@@ -0,0 +1,91 @@
+{
+ "TouchToEmptyAccountRevert3" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](CALL 30000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[1]](CALL 30000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) }",
+ "storage": {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[2]](CALL 30000 0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[3]] 1 }",
+ "storage": {
+ }
+ },
+ "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) }",
+ "storage": {
+ }
+ },
+ "e94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "82400"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevertFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevertFiller.json
new file mode 100644
index 000000000..12214cb3a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevertFiller.json
@@ -0,0 +1,77 @@
+{
+ "TouchToEmptyAccountRevert" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](CALL 30000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 1 }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[1]](CALL 30000 0x1000000000000000000000000000000000000000 0 0 0 0 0) }",
+ "storage": {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "70000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/chfastRevertDepth2Filler.json b/src/GeneralStateTestsFiller/stEIP158Specific/chfastRevertDepth2Filler.json
new file mode 100644
index 000000000..e7a0cd9d9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/chfastRevertDepth2Filler.json
@@ -0,0 +1,103 @@
+{
+ "chfastRevertDepth2" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "a000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00"
+ }
+ },
+ "c000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00"
+ }
+ },
+ "d000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x00",
+ "0x02" : "0x00"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a000000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "{ [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 150000 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[2]] (CALL 150000 0xd000000000000000000000000000000000000000 0 0 0 0 0)}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "{ [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0)}",
+ "nonce" : "",
+ "storage" : {
+ }
+ },
+ "c000000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "{ [[0]] (ADD 1 (SLOAD 0)) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "d000000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "{ [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0) [[2]] (GAS)}",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "In transaction T to A, A call B call C, then A call D calls C, D fails after calling C.",
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "170685"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0x014f",
+ "secretKey" : "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4",
+ "to" : "a000000000000000000000000000000000000000",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.json
new file mode 100644
index 000000000..a1ccce26d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.json
@@ -0,0 +1,113 @@
+{
+ "vitalikTransactionTest" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "storage": {},
+ "code": "0x"
+ },
+ "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109": {
+ "nonce": "0x03",
+ "balance": "0x00",
+ "storage": {},
+ "code": "0x"
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+ "nonce": "0x00",
+ "balance": "0x044dec",
+ "storage": {},
+ "code": "0x"
+ },
+ "51f9d7f98e997bdd6bebde4c2dd27be8c99303aa": {
+ "nonce": "0x01",
+ "balance": "0x00",
+ "storage": {},
+ "code": "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe"
+ },
+ "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": {
+ "nonce": "0x0150",
+ "balance": "0xfffffffffffffbb213",
+ "storage": {},
+ "code": "0x"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "storage": {},
+ "code": "0x"
+ },
+ "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109": {
+ "nonce": "0x02",
+ "balance": "0x00",
+ "storage": {},
+ "code": "0x"
+ },
+ "51f9d7f98e997bdd6bebde4c2dd27be8c99303aa": {
+ "shouldnotexist" : "1"
+ },
+ "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": {
+ "nonce": "0x0150",
+ "storage": {},
+ "code": "0x"
+ }
+ }
+ }
+ ],
+ "pre": {
+ "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": {
+ "nonce": "0x014f",
+ "balance": "0xffffffffffffffffff",
+ "code": "0x",
+ "storage": {}
+ },
+ "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": {
+ "nonce": "0x00",
+ "balance": "0x00",
+ "code": "0x",
+ "storage": {}
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x6000607f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050596100718061006c59396100dd5661005f8061000e60003961006d566000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe5b6000f35b816000f0905060405260006000600060006000604051620249f0f15061000080610108600039610108565b6000f3"
+ ],
+ "gasLimit" : [
+ "0x1fffff"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0x014f",
+ "secretKey" : "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4",
+ "to" : "",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json
new file mode 100644
index 000000000..935000a9d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json
@@ -0,0 +1,86 @@
+{
+ "NonZeroValue_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" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x081c71"
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x081f05"
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 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/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmptyFiller.json
new file mode 100644
index 000000000..f2364f5eb
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmptyFiller.json
@@ -0,0 +1,101 @@
+{
+ "NonZeroValue_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" : "0",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x081c71"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x081f05"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }",
+ "storage": {
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json
new file mode 100644
index 000000000..03a1d9a3b
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json
@@ -0,0 +1,91 @@
+{
+ "NonZeroValue_CALLCODE_ToNonNonZeroBalance" : {
+ "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",
+ "0x64" : "0x085709"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x64" : "0x08599d"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 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/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKeyFiller.json
new file mode 100644
index 000000000..7d351f9ec
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKeyFiller.json
@@ -0,0 +1,100 @@
+{
+ "NonZeroValue_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" : {
+ "balance" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x081c71"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x081f05"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 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/stNonZeroCallsTest/NonZeroValue_CALLFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLFiller.json
new file mode 100644
index 000000000..e43e8b268
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLFiller.json
@@ -0,0 +1,88 @@
+{
+ "CALL_OneVCallSuicide" : {
+ "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" : "0x63",
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x07bac9"
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x01"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x63",
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x07bd5d"
+ }
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x01"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 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/stNonZeroCallsTest/NonZeroValue_CALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToEmptyFiller.json
new file mode 100644
index 000000000..75c05f94e
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToEmptyFiller.json
@@ -0,0 +1,93 @@
+{
+ "NonZeroValue_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" : {
+ "balance" : "0x01"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x07bac9"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x01"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x081f05"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 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/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json
new file mode 100644
index 000000000..233c18bf0
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json
@@ -0,0 +1,91 @@
+{
+ "NonZeroValue_CALL_ToNonNonZeroBalance" : {
+ "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",
+ "0x64" : "0x085709"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "100"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x64" : "0x08599d"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 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/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKeyFiller.json
new file mode 100644
index 000000000..a1beb2cce
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKeyFiller.json
@@ -0,0 +1,100 @@
+{
+ "NonZeroValue_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" : {
+ "balance" : "1",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x07bac9"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x081f05"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000",
+ "nonce" : "0",
+ "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 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/stNonZeroCallsTest/NonZeroValue_DELEGATECALLFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALLFiller.json
new file mode 100644
index 000000000..9307e4494
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALLFiller.json
@@ -0,0 +1,106 @@
+{
+ "NonZeroValue_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" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x0836a0"
+ }
+ },
+ "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x64" : "0"
+ }
+ },
+ "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x083934"
+ }
+ },
+ "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "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/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmptyFiller.json
new file mode 100644
index 000000000..ec40f8ac4
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmptyFiller.json
@@ -0,0 +1,125 @@
+{
+ "NonZeroValue_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" : "0",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x0836a0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x64" : "0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "code" : "0x",
+ "nonce" : "0",
+ "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/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json
new file mode 100644
index 000000000..28bcd1017
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json
@@ -0,0 +1,113 @@
+{
+ "NonZeroValue_DELEGATECALL_ToNonNonZeroBalance" : {
+ "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/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json
new file mode 100644
index 000000000..15d394d29
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json
@@ -0,0 +1,123 @@
+{
+ "NonZeroValue_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" : {
+ "balance" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0x08d5b6",
+ "0x01" : "0x01",
+ "0x64" : "0x0836a0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "storage" : {
+ "0x00" : "0",
+ "0x01" : "0",
+ "0x64" : "0"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Homestead"],
+ "result" : {
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0",
+ "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/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
new file mode 100644
index 000000000..67873da06
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
@@ -0,0 +1,81 @@
+{
+ "NonZeroValue_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" : {
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x697b"
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "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/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json
new file mode 100644
index 000000000..8fca72f18
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json
@@ -0,0 +1,85 @@
+{
+ "NonZeroValue_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" : {
+ "balance" : "0x01"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x01"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "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/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
new file mode 100644
index 000000000..59cde5c1f
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
@@ -0,0 +1,85 @@
+{
+ "NonZeroValue_SUICIDE_ToNonNonZeroBalance" : {
+ "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" : "101"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "101"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "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/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json
new file mode 100644
index 000000000..a5ebc1cb9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json
@@ -0,0 +1,93 @@
+{
+ "NonZeroValue_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" : {
+ "balance" : "0x01",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "shouldnotexist" : "1"
+ },
+ "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x01",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1",
+ "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/stNonZeroCallsTest/NonZeroValue_TransactionCALLFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLFiller.json
new file mode 100644
index 000000000..79d4d257d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLFiller.json
@@ -0,0 +1,81 @@
+{
+ "NonZeroValue_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" : {
+ "balance" : "0x01",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x5208"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a4bdf7"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x01",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x5208"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a4bdf7"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmptyFiller.json
new file mode 100644
index 000000000..0734f5931
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmptyFiller.json
@@ -0,0 +1,72 @@
+{
+ "NonZeroValue_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" : {
+ "balance" : "0x01"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x01"
+ }
+ }
+ }
+ ],
+ "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" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json
new file mode 100644
index 000000000..b68a2e9f3
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json
@@ -0,0 +1,72 @@
+{
+ "NonZeroValue_TransactionCALL_ToNonNonZeroBalance" : {
+ "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" : "101"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "101"
+ }
+ }
+ }
+ ],
+ "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" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
new file mode 100644
index 000000000..3ff6609ed
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
@@ -0,0 +1,79 @@
+{
+ "NonZeroValue_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" : {
+ "balance" : "0x01",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x01",
+ "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" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json
new file mode 100644
index 000000000..beeb489d2
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json
@@ -0,0 +1,81 @@
+{
+ "NonZeroValue_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" : {
+ "balance" : "0x01",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x5758"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a4b8a7"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x01",
+ "storage" : {
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x5758"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a4b8a7"
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x1122334455667788991011121314151617181920"
+ ],
+ "gasLimit" : [
+ "600000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "value" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmptyFiller.json
new file mode 100644
index 000000000..57d1c98c0
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmptyFiller.json
@@ -0,0 +1,72 @@
+{
+ "NonZeroValue_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" : {
+ "balance" : "0x01"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x01"
+ }
+ }
+ }
+ ],
+ "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" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json
new file mode 100644
index 000000000..c862922a5
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json
@@ -0,0 +1,72 @@
+{
+ "NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance" : {
+ "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" : "101"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "101"
+ }
+ }
+ }
+ ],
+ "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" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json
new file mode 100644
index 000000000..e93901566
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json
@@ -0,0 +1,79 @@
+{
+ "NonZeroValue_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" : {
+ "balance" : "0x01",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x01",
+ "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" : [
+ "1"
+ ]
+ }
+ }
+}