aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d0g0v0.json134
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d10g0v0.json126
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d11g0v0.json142
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d12g0v0.json133
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d13g0v0.json140
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d14g0v0.json126
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d15g0v0.json140
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d1g0v0.json141
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d2g0v0.json126
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d3g0v0.json141
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d4g0v0.json135
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d5g0v0.json142
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d6g0v0.json126
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d7g0v0.json142
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d8g0v0.json135
-rw-r--r--BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d9g0v0.json142
-rw-r--r--GeneralStateTests/stSStoreTest/InitCollision.json82
-rw-r--r--GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode.json221
-rw-r--r--Retesteth/eth/config5
-rw-r--r--Retesteth/eth/eth.sh2
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d0g0v0Filler.json88
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d10g0v0Filler.json89
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d11g0v0Filler.json89
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d12g0v0Filler.json89
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d13g0v0Filler.json89
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d14g0v0Filler.json89
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d15g0v0Filler.json89
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d1g0v0Filler.json88
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d2g0v0Filler.json89
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d3g0v0Filler.json88
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d4g0v0Filler.json94
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d5g0v0Filler.json94
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d6g0v0Filler.json89
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d7g0v0Filler.json94
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d8g0v0Filler.json89
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d9g0v0Filler.json89
-rw-r--r--src/GeneralStateTestsFiller/stSStoreTest/InitCollisionFiller.json162
-rw-r--r--src/GeneralStateTestsFiller/stSStoreTest/sstore_changeFromExternalCallInInitCodeFiller.json161
38 files changed, 4240 insertions, 0 deletions
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d0g0v0.json
new file mode 100644
index 000000000..de14805a3
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d0g0v0.json
@@ -0,0 +1,134 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d0g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d0g0v0Filler.json",
+ "sourceHash" : "60a49a517db27e6a56fb628b6fa898b2bde47d169c87efc57704dbec9c1dfc5d"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x01256b",
+ "hash" : "0x01952fc8c814dd27d495b4721a34450fe3f4e1c00e23db8bab4cdca0b8a82dfd",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0x8f5da2f4770a77bb8a233ff3e6b97f1af20099cffbaebf944f8be8e71993b9a5",
+ "stateRoot" : "0xe80005b3cc513b0fa924488ca22e2a3a23d299b511c8ca60889c2c5473458e83",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0xa9ae0c7080687b751d9f53af251da34c6c42291f781a1028fa5007e238325cc7",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf90270f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e80005b3cc513b0fa924488ca22e2a3a23d299b511c8ca60889c2c5473458e83a0a9ae0c7080687b751d9f53af251da34c6c42291f781a1028fa5007e238325cc7a08f5da2f4770a77bb8a233ff3e6b97f1af20099cffbaebf944f8be8e71993b9a5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301256b8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f872f870800183030d408080a46000600060006000600073bea0000000000000000000000000000000000000620186a0f11ca09ba7a5865675b95cea42b6fa8749c159392d6b6d7985a9a5aa4994d2543cb61fa07de3ce4419caca5b30de3363f6cb8da0a101355835c22bcec079302f62907816c0",
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073bea0000000000000000000000000000000000000620186a0f1",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x9ba7a5865675b95cea42b6fa8749c159392d6b6d7985a9a5aa4994d2543cb61f",
+ "s" : "0x7de3ce4419caca5b30de3363f6cb8da0a101355835c22bcec079302f62907816",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0x01952fc8c814dd27d495b4721a34450fe3f4e1c00e23db8bab4cdca0b8a82dfd",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ec9256b",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a3ea95",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d10g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d10g0v0.json
new file mode 100644
index 000000000..dd3ac62a8
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d10g0v0.json
@@ -0,0 +1,126 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d10g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d10g0v0Filler.json",
+ "sourceHash" : "dabf4ae36d3719b04461a41ad2a37a742b16c2bad5ca53a940543928fd5d0cbe"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x01f40c",
+ "hash" : "0xb71379c13001b4f28c7b8ad75be67debaac8a354de625e0f889b8c66eb64db5f",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0xaaf7a87c0b73c976655b2e510416b949fe6e055ad6b10c66d8605f50562018da",
+ "stateRoot" : "0x2b802b91784aa4699b2d61adc41041366e3fddd38bc8b689d425be968de3a827",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0x3c75224d9d8fa1c0755317be089f72e345856aa5c90463a917e65830b25d565d",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf90286f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b802b91784aa4699b2d61adc41041366e3fddd38bc8b689d425be968de3a827a03c75224d9d8fa1c0755317be089f72e345856aa5c90463a917e65830b25d565da0aaf7a87c0b73c976655b2e510416b949fe6e055ad6b10c66d8605f50562018dab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f40c8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f888f886800183030d408080b8396000602280601760003960006000f55060006000fd00fe600060006000600073bea0000000000000000000000000000000000000620186a0f41ba084cb057d2be4676937446d0e47a393c70c7a9a625d58799b58a7e7302256e8caa026f48ac41f00cb034e68dbaa66ee3dcd2f5d8cfd788a1abc647795f220a28f08c0",
+ "transactions" : [
+ {
+ "data" : "0x6000602280601760003960006000f55060006000fd00fe600060006000600073bea0000000000000000000000000000000000000620186a0f4",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x84cb057d2be4676937446d0e47a393c70c7a9a625d58799b58a7e7302256e8ca",
+ "s" : "0x26f48ac41f00cb034e68dbaa66ee3dcd2f5d8cfd788a1abc647795f220a28f08",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0xb71379c13001b4f28c7b8ad75be67debaac8a354de625e0f889b8c66eb64db5f",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ec9f40c",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a31bf4",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d11g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d11g0v0.json
new file mode 100644
index 000000000..004aa145c
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d11g0v0.json
@@ -0,0 +1,142 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d11g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d11g0v0Filler.json",
+ "sourceHash" : "e2889e0d8d05d265807f4b6f81a7df1ad0074ef01285a9f71726646760d64f66"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x0308f6",
+ "hash" : "0xb294dbc9a4c59192eec49c8c5e41c250cfb712dff8345bde907956ae1fd991a5",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0xe721a3bf96b8cd568b7fb84af40c253a4dc2bd413409ac02f38d54d2761a8c9f",
+ "stateRoot" : "0x445d9b4d08f54779596c5ba6c755e3d201533ad5f89a5b58f6138cc4f116f249",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0x6e3c78ffabdc636bceb28164b86b359fc74834ed1feb4880d80634ca9633e91c",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf902a6f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445d9b4d08f54779596c5ba6c755e3d201533ad5f89a5b58f6138cc4f116f249a06e3c78ffabdc636bceb28164b86b359fc74834ed1feb4880d80634ca9633e91ca0e721a3bf96b8cd568b7fb84af40c253a4dc2bd413409ac02f38d54d2761a8c9fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830308f68203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f8a8f8a6800183030d408080b8596000602280603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe600060006000600073bea0000000000000000000000000000000000000620186a0f41ba023a0cb31ed9b90170fdb5db4330bd60ae08ff96e5613a27c175fe944f1eebfc0a0343bcb9c683cc71bf0cfdc82a9b95edfa70dd2e9d801634a0ce2105d37632172c0",
+ "transactions" : [
+ {
+ "data" : "0x6000602280603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe600060006000600073bea0000000000000000000000000000000000000620186a0f4",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x23a0cb31ed9b90170fdb5db4330bd60ae08ff96e5613a27c175fe944f1eebfc0",
+ "s" : "0x343bcb9c683cc71bf0cfdc82a9b95edfa70dd2e9d801634a0ce2105d37632172",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0xb294dbc9a4c59192eec49c8c5e41c250cfb712dff8345bde907956ae1fd991a5",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ecb08f6",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x02",
+ "storage" : {
+ }
+ },
+ "0x89a71b556f957d1ba09e53b89236f4724b2e497a" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a2070a",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d12g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d12g0v0.json
new file mode 100644
index 000000000..22df5e617
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d12g0v0.json
@@ -0,0 +1,133 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d12g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d12g0v0Filler.json",
+ "sourceHash" : "655ad5be3459cc4f71c7608ca5bfcabcf1cfef862b29d0a004cd309f235be70f"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x025bfe",
+ "hash" : "0x3cb62f4f9f229a982808827f897f706f099aed1a1816a9916abf306a02d12de6",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0x6952c0fd606a5c9ca460a97e43ed587037b801811841f6887244c2b6bb28d9a6",
+ "stateRoot" : "0x0b787d5eb01919d2ded2fe090d6beb04a18913f3c133c64bd1aa6510b8989ca3",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0x828867a47f9d207c30ce2ecaab16ad1e2fd4a9a3fbeecbbfd9ec6c42ff68e700",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf9026ef901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b787d5eb01919d2ded2fe090d6beb04a18913f3c133c64bd1aa6510b8989ca3a0828867a47f9d207c30ce2ecaab16ad1e2fd4a9a3fbeecbbfd9ec6c42ff68e700a06952c0fd606a5c9ca460a97e43ed587037b801811841f6887244c2b6bb28d9a6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083025bfe8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f870f86e800183030d408080a2600060006000600073bea0000000000000000000000000000000000000620186a0fa1ca0dca89c51acc3b3f65eb9c8ff361c4b87526a23988bcb2b94d400caa8ebdaa115a0326a15f82b3def62c0b609a53f8af1ea8b0062d606db73bd0299bc6f62155a3ec0",
+ "transactions" : [
+ {
+ "data" : "0x600060006000600073bea0000000000000000000000000000000000000620186a0fa",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xdca89c51acc3b3f65eb9c8ff361c4b87526a23988bcb2b94d400caa8ebdaa115",
+ "s" : "0x326a15f82b3def62c0b609a53f8af1ea8b0062d606db73bd0299bc6f62155a3e",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0x3cb62f4f9f229a982808827f897f706f099aed1a1816a9916abf306a02d12de6",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674eca5bfe",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a2b402",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d13g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d13g0v0.json
new file mode 100644
index 000000000..9fcabec95
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d13g0v0.json
@@ -0,0 +1,140 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d13g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d13g0v0Filler.json",
+ "sourceHash" : "025c8e885efe6f6c7718af7d8a84811604724f4414b20cdc4f4d92c830bcf6ec"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x02dcb8",
+ "hash" : "0x5ee3784fa7a9bf8070fb06951e02036d4717535e1fcee78261cb4f008c29c9f6",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0xc4f6c4c0a5376bb587f58e1c7523bc5842a5accd7eb2f76de5fa6fd0d8bc4dd0",
+ "stateRoot" : "0xefa3638fdcab2fe21704394cba859fbe0e23892e74e7b9558e9e9d165df6aefe",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0xd6fabdf8a308fbddc48249439b8dc0769cb5af89853118265c424f11e8a7d847",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf90280f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0efa3638fdcab2fe21704394cba859fbe0e23892e74e7b9558e9e9d165df6aefea0d6fabdf8a308fbddc48249439b8dc0769cb5af89853118265c424f11e8a7d847a0c4f6c4c0a5376bb587f58e1c7523bc5842a5accd7eb2f76de5fa6fd0d8bc4dd0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302dcb88203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f882f880800183030d408080b46000602280601260003960006000f55000fe600060006000600073bea0000000000000000000000000000000000000620186a0fa1ca0ce360547ea358af7b86d7ec5d2a46479851336d37037bda29c102927ee630ab2a06c5adf68b360513e1d3819296d1a9e4574b226c305340a4ea797de56f5b30c40c0",
+ "transactions" : [
+ {
+ "data" : "0x6000602280601260003960006000f55000fe600060006000600073bea0000000000000000000000000000000000000620186a0fa",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xce360547ea358af7b86d7ec5d2a46479851336d37037bda29c102927ee630ab2",
+ "s" : "0x6c5adf68b360513e1d3819296d1a9e4574b226c305340a4ea797de56f5b30c40",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0x5ee3784fa7a9bf8070fb06951e02036d4717535e1fcee78261cb4f008c29c9f6",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ecadcb8",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x02",
+ "storage" : {
+ }
+ },
+ "0x7918b124e137b03c627421ba8a891b2179853b03" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a23348",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d14g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d14g0v0.json
new file mode 100644
index 000000000..b0d5323d5
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d14g0v0.json
@@ -0,0 +1,126 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d14g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d14g0v0Filler.json",
+ "sourceHash" : "3ab2feab2c319cd5eb3341eb4cdacd1b91c2fec2dfea5f510ee9d09d638883fc"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x02dd92",
+ "hash" : "0x87f2032a3930376787821320d80c2bea58d122f608cfb8354e22efdb3bc09d98",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0x6ccbd7a726625c5278c3355096ce0912bf42b90b5f7dcf14a741744004cca925",
+ "stateRoot" : "0x5c6bab7a93d8bc1e5e0ecb5ff0efce9f40bddd1fe3a8b59d00eb93987fea92cc",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0xe37fb75e6af6efc4d406ceed4557ee36696af44a5a79c11ffb5a88542a9986dd",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf90286f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05c6bab7a93d8bc1e5e0ecb5ff0efce9f40bddd1fe3a8b59d00eb93987fea92cca0e37fb75e6af6efc4d406ceed4557ee36696af44a5a79c11ffb5a88542a9986dda06ccbd7a726625c5278c3355096ce0912bf42b90b5f7dcf14a741744004cca925b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302dd928203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f888f886800183030d408080b8396000602280601760003960006000f55060006000fd00fe600060006000600073bea0000000000000000000000000000000000000620186a0fa1ca0cfdf43b24779145c758e8ff42fb908569b71d461487c74f758fea6b8ca38fd4fa02985239d71d6a98585673da441d6a8cf57b6d31e22b5f532fcd8e0b634874a64c0",
+ "transactions" : [
+ {
+ "data" : "0x6000602280601760003960006000f55060006000fd00fe600060006000600073bea0000000000000000000000000000000000000620186a0fa",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xcfdf43b24779145c758e8ff42fb908569b71d461487c74f758fea6b8ca38fd4f",
+ "s" : "0x2985239d71d6a98585673da441d6a8cf57b6d31e22b5f532fcd8e0b634874a64",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0x87f2032a3930376787821320d80c2bea58d122f608cfb8354e22efdb3bc09d98",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ecadd92",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a2326e",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d15g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d15g0v0.json
new file mode 100644
index 000000000..816f7b266
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d15g0v0.json
@@ -0,0 +1,140 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d15g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d15g0v0Filler.json",
+ "sourceHash" : "558e0e7f3447f042bc4e23f3ff61dc9cd7816030106e5fd615d846e3ad70373f"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x030c9c",
+ "hash" : "0x25ae1530888928b728bd72b0b611e71e0b91f5465c90b6a9374ebbaf5f3e31a5",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0xf1a337f78567c39d175a6b0e974124973867012ec9ecc468132ae4d82f86a1dd",
+ "stateRoot" : "0x76ef4c7e6f888238ffa5404ea103fe6a79ce4f01f19f536ec11d0e568ca7ce0e",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0xf322bfab1a62d6bf22a74567fa183469c2088f6e010c8e7dd6917689758bba9a",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf902a6f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076ef4c7e6f888238ffa5404ea103fe6a79ce4f01f19f536ec11d0e568ca7ce0ea0f322bfab1a62d6bf22a74567fa183469c2088f6e010c8e7dd6917689758bba9aa0f1a337f78567c39d175a6b0e974124973867012ec9ecc468132ae4d82f86a1ddb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083030c9c8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f8a8f8a6800183030d408080b8596000602280603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe600060006000600073bea0000000000000000000000000000000000000620186a0fa1ba042f93d594239d78dced5b08686b1d334b633177709edc0e337ed41a42aee1414a039b630ecf6c3d067a75971052c1fa708e47e4612519c48aceb222271bfaaebbbc0",
+ "transactions" : [
+ {
+ "data" : "0x6000602280603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe600060006000600073bea0000000000000000000000000000000000000620186a0fa",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x42f93d594239d78dced5b08686b1d334b633177709edc0e337ed41a42aee1414",
+ "s" : "0x39b630ecf6c3d067a75971052c1fa708e47e4612519c48aceb222271bfaaebbb",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0x25ae1530888928b728bd72b0b611e71e0b91f5465c90b6a9374ebbaf5f3e31a5",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ecb0c9c",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x02",
+ "storage" : {
+ }
+ },
+ "0x7918b124e137b03c627421ba8a891b2179853b03" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a20364",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d1g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d1g0v0.json
new file mode 100644
index 000000000..666a62fb8
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d1g0v0.json
@@ -0,0 +1,141 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d1g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d1g0v0Filler.json",
+ "sourceHash" : "2efa66114f975d908a3c6ec14c9e61a57643a977ea42ba235dbf6b04c9c9f331"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x01a625",
+ "hash" : "0xed2ae7f27bfc57d01be8930ac151a72ac6e48be5cd106ba8e9875b9435b024fd",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0x731b3e44636849fda9c11d2ddd1f62b9ea02c1ebfc0fb9a03caec3d31daf7805",
+ "stateRoot" : "0x2f79f88518dd01ac6999748e827c01b1ef22970bb9532f35ad2ae3e48d2f0cc7",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0xe094b3329a8e3ea1524576595e248f2d29ce1b6d6ece8f409239bfecf7e69d6e",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf90282f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f79f88518dd01ac6999748e827c01b1ef22970bb9532f35ad2ae3e48d2f0cc7a0e094b3329a8e3ea1524576595e248f2d29ce1b6d6ece8f409239bfecf7e69d6ea0731b3e44636849fda9c11d2ddd1f62b9ea02c1ebfc0fb9a03caec3d31daf7805b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301a6258203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f884f882800183030d408080b66000602480601260003960006000f55000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f11ca029b4cfbf06761f2622a12b7064bf1d77177ecb44108e35d540cad115dcd8557aa0554dc0ca17b7cb80e35b327d7f6ddb13124ac31f76c3fc05e9f4a606a80fc2c9c0",
+ "transactions" : [
+ {
+ "data" : "0x6000602480601260003960006000f55000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f1",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x29b4cfbf06761f2622a12b7064bf1d77177ecb44108e35d540cad115dcd8557a",
+ "s" : "0x554dc0ca17b7cb80e35b327d7f6ddb13124ac31f76c3fc05e9f4a606a80fc2c9",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0xed2ae7f27bfc57d01be8930ac151a72ac6e48be5cd106ba8e9875b9435b024fd",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ec9a625",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x02",
+ "storage" : {
+ }
+ },
+ "0x9587a55fef89ea818feab34c1811f2429ea421a4" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a369db",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d2g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d2g0v0.json
new file mode 100644
index 000000000..fb7a18ccf
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d2g0v0.json
@@ -0,0 +1,126 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d2g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d2g0v0Filler.json",
+ "sourceHash" : "f36ea3a9479e9523dee2f67a79cf32f548ef96ac4eb244d9d29d291864f2e7ef"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x01b9bf",
+ "hash" : "0x0cb451a316967b0989f3da9d1ebad055c27849e614507ccb22637d3bd476929c",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0xd675aad23a0eed77b9edc93705c36675112edcfed658374d04cfff9fe57f4778",
+ "stateRoot" : "0x1fca0310c5716bde4e00e912c8ff6f8db9f5fc7d91647b4ff832a513f8b344e4",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0xd763fc0cdbf5a4a33cb2b0c2a9407822f91f3ff73aa96fd45ff1d0972a3dfeac",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf90288f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fca0310c5716bde4e00e912c8ff6f8db9f5fc7d91647b4ff832a513f8b344e4a0d763fc0cdbf5a4a33cb2b0c2a9407822f91f3ff73aa96fd45ff1d0972a3dfeaca0d675aad23a0eed77b9edc93705c36675112edcfed658374d04cfff9fe57f4778b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301b9bf8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f88af888800183030d408080b83b6000602480601760003960006000f55060006000fd00fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f11ba05eb346d9c1f480d98538b8dbc2513bb9862828a52fe43482d90f738d30d6b248a051f223030afdb61017eec50513434f9f34ee3bad3f328a88ce0e59a1975892b0c0",
+ "transactions" : [
+ {
+ "data" : "0x6000602480601760003960006000f55060006000fd00fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f1",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x5eb346d9c1f480d98538b8dbc2513bb9862828a52fe43482d90f738d30d6b248",
+ "s" : "0x51f223030afdb61017eec50513434f9f34ee3bad3f328a88ce0e59a1975892b0",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0x0cb451a316967b0989f3da9d1ebad055c27849e614507ccb22637d3bd476929c",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ec9b9bf",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a35641",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d3g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d3g0v0.json
new file mode 100644
index 000000000..073854cef
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d3g0v0.json
@@ -0,0 +1,141 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d3g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d3g0v0Filler.json",
+ "sourceHash" : "76aaa593b242c2a79419f192b6180a3eeb44dac183a16a434e0e0fabca52d08a"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x02f54d",
+ "hash" : "0xb91f8a84ffd46178b8dc1821e266877cadc5fe7c5f5120ca1516c455a62a6016",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0x0c06502aaae1409e541e0d8289e9496397cbb678c2e9a9ae7032eed30cfb1597",
+ "stateRoot" : "0x1728411fc460cb9432059f68b0aa72a01c3247a4ced0199fd3535a0bcbf85da8",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0xa022b41e79cd686abd340823f75ee00081e69724ffcaa9015d153744c99b856d",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf902a8f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01728411fc460cb9432059f68b0aa72a01c3247a4ced0199fd3535a0bcbf85da8a0a022b41e79cd686abd340823f75ee00081e69724ffcaa9015d153744c99b856da00c06502aaae1409e541e0d8289e9496397cbb678c2e9a9ae7032eed30cfb1597b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302f54d8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f8aaf8a8800183030d408080b85b6000602480603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f11ca0a7e6b7c70bf8515ed5670b62acb81b09e3a1287e6e92cbe1b0d202f9881857b2a06b70914eec9dd3257d901d0badc240316f2452e094754354a5a8cc7eec9808b7c0",
+ "transactions" : [
+ {
+ "data" : "0x6000602480603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f1",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xa7e6b7c70bf8515ed5670b62acb81b09e3a1287e6e92cbe1b0d202f9881857b2",
+ "s" : "0x6b70914eec9dd3257d901d0badc240316f2452e094754354a5a8cc7eec9808b7",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0xb91f8a84ffd46178b8dc1821e266877cadc5fe7c5f5120ca1516c455a62a6016",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ecaf54d",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x02",
+ "storage" : {
+ }
+ },
+ "0x9587a55fef89ea818feab34c1811f2429ea421a4" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a21ab3",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d4g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d4g0v0.json
new file mode 100644
index 000000000..fc268dbcc
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d4g0v0.json
@@ -0,0 +1,135 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d4g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d4g0v0Filler.json",
+ "sourceHash" : "5cc3f4ff924ba65cd2aa5d5663f31d0ccc265278c8f5566eab3d37791aded8cc"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x0172c3",
+ "hash" : "0x6df01175e4b1e39ae3c4d03c900776898bd8d5c05053dade296a1d30e0ce52cb",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0xe55e2a3e90d05fac38b429985d6a922c4508e64f8012f86d3d5d4467596d56ad",
+ "stateRoot" : "0x31025d936d40dbd8b08c1e98d8e98ebdc6a6e58d2b20aaad7af420dad6e04f64",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0x9b96fdf861a94eb6daa39698d1c2d6f84159a2bc71171978788e84868606a35d",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf90270f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031025d936d40dbd8b08c1e98d8e98ebdc6a6e58d2b20aaad7af420dad6e04f64a09b96fdf861a94eb6daa39698d1c2d6f84159a2bc71171978788e84868606a35da0e55e2a3e90d05fac38b429985d6a922c4508e64f8012f86d3d5d4467596d56adb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830172c38203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f872f870800183030d408080a46000600060006000600073bea0000000000000000000000000000000000000620186a0f21ca07ab7f8a1ab8b255be26fcc015ac2dd4e8579fdbb93055f65cba27cd897b4f0ffa0769a83f5cc478176c5d6f2ae9d155fb2f8f613a4dbfb848ce5a35bffe745a664c0",
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073bea0000000000000000000000000000000000000620186a0f2",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x7ab7f8a1ab8b255be26fcc015ac2dd4e8579fdbb93055f65cba27cd897b4f0ff",
+ "s" : "0x769a83f5cc478176c5d6f2ae9d155fb2f8f613a4dbfb848ce5a35bffe745a664",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0x6df01175e4b1e39ae3c4d03c900776898bd8d5c05053dade296a1d30e0ce52cb",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ec972c3",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a39d3d",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d5g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d5g0v0.json
new file mode 100644
index 000000000..bdb36a2fc
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d5g0v0.json
@@ -0,0 +1,142 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d5g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d5g0v0Filler.json",
+ "sourceHash" : "af7d863d0b8e6b29b3e4b888b597e231dd25629fbb26ba785e491698acb80fcc"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x01f37d",
+ "hash" : "0x2c00c23c42243dec94661949ffbeb62c0b6da6f0fe663cec7af05abce674fc45",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0xb098d96796b71c22a89c95b28ec957d1553195e81670ec42a2e818ae5fa115ec",
+ "stateRoot" : "0x3287680486a8f3ae0648d731d26e0d52ede95516e05d85d1ba6d09146f4cbd34",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0xf94203598502d41b462faeb298f00dee6934fbe0a892481263b9be808554e398",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf90282f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03287680486a8f3ae0648d731d26e0d52ede95516e05d85d1ba6d09146f4cbd34a0f94203598502d41b462faeb298f00dee6934fbe0a892481263b9be808554e398a0b098d96796b71c22a89c95b28ec957d1553195e81670ec42a2e818ae5fa115ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f37d8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f884f882800183030d408080b66000602480601260003960006000f55000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f21ba0a20c81fa4cc5f239dadcba456837780a1b0313786761136201d3b1b68fb87f9ca05596b158c762dd66f4ae23c9b42ac9d86cc16bdea1c46b2decfc2669d3619102c0",
+ "transactions" : [
+ {
+ "data" : "0x6000602480601260003960006000f55000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f2",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xa20c81fa4cc5f239dadcba456837780a1b0313786761136201d3b1b68fb87f9c",
+ "s" : "0x5596b158c762dd66f4ae23c9b42ac9d86cc16bdea1c46b2decfc2669d3619102",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0x2c00c23c42243dec94661949ffbeb62c0b6da6f0fe663cec7af05abce674fc45",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ec9f37d",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x02",
+ "storage" : {
+ }
+ },
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a31c83",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d6g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d6g0v0.json
new file mode 100644
index 000000000..767c8dbb7
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d6g0v0.json
@@ -0,0 +1,126 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d6g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d6g0v0Filler.json",
+ "sourceHash" : "e9a22716bba4c4e2d4d5718069227f4425b6b9613f1b816347dde76383e0eb7e"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x01f457",
+ "hash" : "0xceae15a0832aaaf8b9e6ff7c758c376f153e511ec140b0a9a2248cad8222819e",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0xb8c1012aa9130fa944b2ebfae4a0d1b072fb86fba416427e0dfe6080ef282436",
+ "stateRoot" : "0xd4af32ea0fb15befa5dd03c2891511273ec4d60519c310cb4c8d4e5562c0a9b3",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0x0368fdf39cb842dc321dcfcc1daf14a202894253a6fe37b88faa7e8af467d1c8",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf90288f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4af32ea0fb15befa5dd03c2891511273ec4d60519c310cb4c8d4e5562c0a9b3a00368fdf39cb842dc321dcfcc1daf14a202894253a6fe37b88faa7e8af467d1c8a0b8c1012aa9130fa944b2ebfae4a0d1b072fb86fba416427e0dfe6080ef282436b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f4578203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f88af888800183030d408080b83b6000602480601760003960006000f55060006000fd00fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f21ca007e8c1075e1e3a5ddf44c7cf2ffd36bec516afa3027e61166666d252a143bf63a007cc15a64d272568dab48d263c838d28cc4615a9ae0f9f054919019870ffb3dfc0",
+ "transactions" : [
+ {
+ "data" : "0x6000602480601760003960006000f55060006000fd00fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f2",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x07e8c1075e1e3a5ddf44c7cf2ffd36bec516afa3027e61166666d252a143bf63",
+ "s" : "0x07cc15a64d272568dab48d263c838d28cc4615a9ae0f9f054919019870ffb3df",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0xceae15a0832aaaf8b9e6ff7c758c376f153e511ec140b0a9a2248cad8222819e",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ec9f457",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a31ba9",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d7g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d7g0v0.json
new file mode 100644
index 000000000..fb81211c1
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d7g0v0.json
@@ -0,0 +1,142 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d7g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d7g0v0Filler.json",
+ "sourceHash" : "bd4df647dd8f97c4547a0f6d8e1bab779ff28110c7b4d5933c4834cbc6f443f2"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x0308f7",
+ "hash" : "0x2984d14aab90d9d808fa82d716a15d48b0892c51885c19de8bfb45a0147bfd6f",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0x6a4aa115d6d08d6fe4a8a51150e17ed0c35d1905fe09c4c430e4cb4c3b4126fd",
+ "stateRoot" : "0xcf8b3b64b19d9d77856a4599e2d00d0243597dd927ad705c2ff8461ccd2f07dc",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0x3b15f3ebfadca32bf26798e48611f6df2eb0b35e3055aa103beede920aafb5a0",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf902a8f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf8b3b64b19d9d77856a4599e2d00d0243597dd927ad705c2ff8461ccd2f07dca03b15f3ebfadca32bf26798e48611f6df2eb0b35e3055aa103beede920aafb5a0a06a4aa115d6d08d6fe4a8a51150e17ed0c35d1905fe09c4c430e4cb4c3b4126fdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830308f78203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f8aaf8a8800183030d408080b85b6000602480603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f21ba0ab629d1a45b9cb618ba859dc411cddbdafba45a2918899cf678566c25a35dc91a0219d638720085c990264889a866db601f7e6507048dfd6a110f71c1bd1dbb58dc0",
+ "transactions" : [
+ {
+ "data" : "0x6000602480603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f2",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xab629d1a45b9cb618ba859dc411cddbdafba45a2918899cf678566c25a35dc91",
+ "s" : "0x219d638720085c990264889a866db601f7e6507048dfd6a110f71c1bd1dbb58d",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0x2984d14aab90d9d808fa82d716a15d48b0892c51885c19de8bfb45a0147bfd6f",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ecb08f7",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x02",
+ "storage" : {
+ }
+ },
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a20709",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d8g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d8g0v0.json
new file mode 100644
index 000000000..5618b7414
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d8g0v0.json
@@ -0,0 +1,135 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d8g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d8g0v0Filler.json",
+ "sourceHash" : "53597cb70c5644246f2a989ce5b216c2db45bdc6f5781e50579c7f71fe1e1e06"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x017278",
+ "hash" : "0xf36a027b09c359990d248e0e525e5225e12dabc38c90449d547c48701db12bfe",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0x3e66ddd0c4954d2475a3e9037c305e27d5b182f1321d19210589092a238f7f86",
+ "stateRoot" : "0xf74b0cd41fc6ff69211e3d6cb7f8dcacb70b2a2636d4efd6bf69ffdd104b0c37",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0x5ceb4482679e39cec2d988a6d4bda73fbe92288fcea94e6d5c1a6433efd0c2c9",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf9026ef901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f74b0cd41fc6ff69211e3d6cb7f8dcacb70b2a2636d4efd6bf69ffdd104b0c37a05ceb4482679e39cec2d988a6d4bda73fbe92288fcea94e6d5c1a6433efd0c2c9a03e66ddd0c4954d2475a3e9037c305e27d5b182f1321d19210589092a238f7f86b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830172788203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f870f86e800183030d408080a2600060006000600073bea0000000000000000000000000000000000000620186a0f41ca03aa1b899bcd94185fdf23e146ad8298e3330810517a57d7a9b1392ff3318529ca01065903fdab02dc38052569cc80278a5e1d636925a0ed63d78bac0967ae0cef4c0",
+ "transactions" : [
+ {
+ "data" : "0x600060006000600073bea0000000000000000000000000000000000000620186a0f4",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x3aa1b899bcd94185fdf23e146ad8298e3330810517a57d7a9b1392ff3318529c",
+ "s" : "0x1065903fdab02dc38052569cc80278a5e1d636925a0ed63d78bac0967ae0cef4",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0xf36a027b09c359990d248e0e525e5225e12dabc38c90449d547c48701db12bfe",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ec97278",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a39d88",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d9g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d9g0v0.json
new file mode 100644
index 000000000..cfb94b15f
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d9g0v0.json
@@ -0,0 +1,142 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d9g0v0_Constantinople" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d9g0v0Filler.json",
+ "sourceHash" : "877a95be12e26482fee8e44f66fc1fc6bf02d934333f6dd6dd030cb5b0d63149"
+ },
+ "blocks" : [
+ {
+ "blockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x01f332",
+ "hash" : "0xe5b6eaf366ee6b2d593a6c7185fe2e61cd0a94c621442dc89cb538988580a186",
+ "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "nonce" : "0x0000000000000000",
+ "number" : "0x01",
+ "parentHash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "receiptTrie" : "0x27baa32da802320c28eef4a6600230b0eb6e4ca00e4e45f9189004a2ced6f505",
+ "stateRoot" : "0xe7c095922e24b025093c5b19f4953fb958544d961d9e7453c0ffbabda3466197",
+ "timestamp" : "0x03e8",
+ "transactionsTrie" : "0xa1b2c67271ab4dc84bb45380be403caad8743703b911510b7b4baa778f8442ad",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "rlp" : "0xf90280f901f8a02598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7c095922e24b025093c5b19f4953fb958544d961d9e7453c0ffbabda3466197a0a1b2c67271ab4dc84bb45380be403caad8743703b911510b7b4baa778f8442ada027baa32da802320c28eef4a6600230b0eb6e4ca00e4e45f9189004a2ced6f505b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f3328203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f882f880800183030d408080b46000602280601260003960006000f55000fe600060006000600073bea0000000000000000000000000000000000000620186a0f41ca03693e149cc47ffbef2caaee2186489bf85bef2d2ed8b8e5f7bc3f39d8cacf2c8a0115242de02b66e36213217ae4968e7c8a331df3f8f02a173d0eecf635a915311c0",
+ "transactions" : [
+ {
+ "data" : "0x6000602280601260003960006000f55000fe600060006000600073bea0000000000000000000000000000000000000620186a0f4",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x3693e149cc47ffbef2caaee2186489bf85bef2d2ed8b8e5f7bc3f39d8cacf2c8",
+ "s" : "0x115242de02b66e36213217ae4968e7c8a331df3f8f02a173d0eecf635a915311",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0x00",
+ "hash" : "0x2598923c4cfa9bdc4c511a5705503158de8de39fe9bea0196b90bcfe271c680c",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0x00",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0x1150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01150a9145044889dcab22f3fdfa5ed0826e2b708b96768679929b34d571a4ae8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+ "lastblockhash" : "0xe5b6eaf366ee6b2d593a6c7185fe2e61cd0a94c621442dc89cb538988580a186",
+ "network" : "Constantinople",
+ "postState" : {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x1bc16d674ec9f332",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x02",
+ "storage" : {
+ }
+ },
+ "0x89a71b556f957d1ba09e53b89236f4724b2e497a" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a31cce",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stSStoreTest/InitCollision.json b/GeneralStateTests/stSStoreTest/InitCollision.json
new file mode 100644
index 000000000..35f533c45
--- /dev/null
+++ b/GeneralStateTests/stSStoreTest/InitCollision.json
@@ -0,0 +1,82 @@
+{
+ "InitCollision" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/GeneralStateTestsFiller/stSStoreTest/InitCollisionFiller.json",
+ "sourceHash" : "89813ef3c9a96fc2c208361508c21064c6c5a316fa7858515f40b455daed0bc7"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x020000",
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Constantinople" : [
+ {
+ "hash" : "0x26067c3f3f9f8ae914339879cef816f17a622fc53124051ae1ae2186a9b0acf7",
+ "indexes" : {
+ "data" : 3,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ]
+ },
+ "pre" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x60006001556001600155",
+ "0x6000600a80601260003960006000f55000fe60006001556001600155",
+ "0x6000600a80601760003960006000f55060006000fd00fe60006001556001600155",
+ "0x6000600a80603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe60006001556001600155"
+ ],
+ "gasLimit" : [
+ "0x030d40"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0x00"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode.json b/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode.json
new file mode 100644
index 000000000..60c0801fd
--- /dev/null
+++ b/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode.json
@@ -0,0 +1,221 @@
+{
+ "sstore_changeFromExternalCallInInitCode" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again ",
+ "filledwith" : "testeth 1.5.0.dev2-76+commit.2fd57400.dirty",
+ "lllcversion" : "Version: 0.5.0-develop.2018.10.24+commit.01566c2e.Linux.g++",
+ "source" : "src/GeneralStateTestsFiller/stSStoreTest/sstore_changeFromExternalCallInInitCodeFiller.json",
+ "sourceHash" : "72938f8674e3a0a0b551f297df485bd0b4fcdae1bc9108e6db5cfb85a5696177"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x020000",
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Constantinople" : [
+ {
+ "hash" : "0x0285a3673f155d246d0ae643a28200f5160df6dc7e39132f351fafa8ad0412be",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0xbcaf501a4f6faafd4912c749c889b648fe0851f1738d959d30289f626491b77a",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0x2c4ce208cf16d2f1cda7e6273feebf1477460d991a5134498b1669bc5df1a818",
+ "indexes" : {
+ "data" : 2,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0x151f3ab03117e9411ab00dc626a0cc35d7a0ea9fd99369d82841038da7d10e46",
+ "indexes" : {
+ "data" : 3,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0xb7e81f4a40e3af5e23debae929af425a00b299a5bd76d27e12505c9cf39e65e8",
+ "indexes" : {
+ "data" : 4,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0xb5970f78bfb7482d9639c7a8fc887fcdc66d67dcae4e4f34570b0d53c217bb91",
+ "indexes" : {
+ "data" : 5,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0x10ac9c8dd25d4bc83b7dc29a88056514c85db5b1f4702dbfb32ee67fd843c424",
+ "indexes" : {
+ "data" : 6,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0x1840d66417857858b048e65742b1c3d320d0de1c2f131bf7ff2bb28fd46ba50d",
+ "indexes" : {
+ "data" : 7,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0x91db41dac401b888d43c31c58518f09f37a5f80e790565d08335f7a0f23dd21a",
+ "indexes" : {
+ "data" : 8,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0x2419728ac1fe1410207b46fa14ef00ecba54fc6b45da93314f73f818f961d036",
+ "indexes" : {
+ "data" : 9,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0x4099b8274c2e6f82495460e98fde7ff761df169d028607f7acdb902819bd28a9",
+ "indexes" : {
+ "data" : 10,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0xfbd2489392fe7d126e15508ae4f38699a5da9a7408eba109ea55b6f04788939a",
+ "indexes" : {
+ "data" : 11,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0x83ee8440914702312d0fa08c8746af97ca0d205c8d4aa30fc6166de2afda8b68",
+ "indexes" : {
+ "data" : 12,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0xa484731e5025cdc83abce920e8743b2dd05f410c28a6193db08748b0b9992cbb",
+ "indexes" : {
+ "data" : 13,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0x3dd425279fd3b3241afcab39ac233d5be3a18c09a4c616ab88bdd3879c35bfdb",
+ "indexes" : {
+ "data" : 14,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0x0c1cdba1e1d34d1a9a54a60da42dd447944a74c924a8fab10fdf564f75979171",
+ "indexes" : {
+ "data" : 15,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ]
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x6000600060006000600073bea0000000000000000000000000000000000000620186a0f1",
+ "0x6000602480601260003960006000f55000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f1",
+ "0x6000602480601760003960006000f55060006000fd00fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f1",
+ "0x6000602480603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f1",
+ "0x6000600060006000600073bea0000000000000000000000000000000000000620186a0f2",
+ "0x6000602480601260003960006000f55000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f2",
+ "0x6000602480601760003960006000f55060006000fd00fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f2",
+ "0x6000602480603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f2",
+ "0x600060006000600073bea0000000000000000000000000000000000000620186a0f4",
+ "0x6000602280601260003960006000f55000fe600060006000600073bea0000000000000000000000000000000000000620186a0f4",
+ "0x6000602280601760003960006000f55060006000fd00fe600060006000600073bea0000000000000000000000000000000000000620186a0f4",
+ "0x6000602280603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe600060006000600073bea0000000000000000000000000000000000000620186a0f4",
+ "0x600060006000600073bea0000000000000000000000000000000000000620186a0fa",
+ "0x6000602280601260003960006000f55000fe600060006000600073bea0000000000000000000000000000000000000620186a0fa",
+ "0x6000602280601760003960006000f55060006000fd00fe600060006000600073bea0000000000000000000000000000000000000620186a0fa",
+ "0x6000602280603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe600060006000600073bea0000000000000000000000000000000000000620186a0fa"
+ ],
+ "gasLimit" : [
+ "0x030d40"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0x00"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/Retesteth/eth/config b/Retesteth/eth/config
new file mode 100644
index 000000000..211eea22f
--- /dev/null
+++ b/Retesteth/eth/config
@@ -0,0 +1,5 @@
+{
+ "name" : "CPP Client",
+ "socketType" : "ipc",
+ "socketAddress" : "local"
+}
diff --git a/Retesteth/eth/eth.sh b/Retesteth/eth/eth.sh
new file mode 100644
index 000000000..a822578d7
--- /dev/null
+++ b/Retesteth/eth/eth.sh
@@ -0,0 +1,2 @@
+echo "Starting $1 $2"
+eth --test --db-path $1 --ipcpath $2 --log-verbosity 4
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d0g0v0Filler.json
new file mode 100644
index 000000000..762d65b13
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d0g0v0Filler.json
@@ -0,0 +1,88 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d0g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073bea0000000000000000000000000000000000000620186a0f1",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x9ba7a5865675b95cea42b6fa8749c159392d6b6d7985a9a5aa4994d2543cb61f",
+ "s" : "0x7de3ce4419caca5b30de3363f6cb8da0a101355835c22bcec079302f62907816",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d10g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d10g0v0Filler.json
new file mode 100644
index 000000000..455ea1c6b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d10g0v0Filler.json
@@ -0,0 +1,89 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d10g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000602280601760003960006000f55060006000fd00fe600060006000600073bea0000000000000000000000000000000000000620186a0f4",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x84cb057d2be4676937446d0e47a393c70c7a9a625d58799b58a7e7302256e8ca",
+ "s" : "0x26f48ac41f00cb034e68dbaa66ee3dcd2f5d8cfd788a1abc647795f220a28f08",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d11g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d11g0v0Filler.json
new file mode 100644
index 000000000..3038c510e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d11g0v0Filler.json
@@ -0,0 +1,89 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d11g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000602280603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe600060006000600073bea0000000000000000000000000000000000000620186a0f4",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x23a0cb31ed9b90170fdb5db4330bd60ae08ff96e5613a27c175fe944f1eebfc0",
+ "s" : "0x343bcb9c683cc71bf0cfdc82a9b95edfa70dd2e9d801634a0ce2105d37632172",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d12g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d12g0v0Filler.json
new file mode 100644
index 000000000..847a96602
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d12g0v0Filler.json
@@ -0,0 +1,89 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d12g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x600060006000600073bea0000000000000000000000000000000000000620186a0fa",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xdca89c51acc3b3f65eb9c8ff361c4b87526a23988bcb2b94d400caa8ebdaa115",
+ "s" : "0x326a15f82b3def62c0b609a53f8af1ea8b0062d606db73bd0299bc6f62155a3e",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d13g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d13g0v0Filler.json
new file mode 100644
index 000000000..e022d3969
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d13g0v0Filler.json
@@ -0,0 +1,89 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d13g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000602280601260003960006000f55000fe600060006000600073bea0000000000000000000000000000000000000620186a0fa",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xce360547ea358af7b86d7ec5d2a46479851336d37037bda29c102927ee630ab2",
+ "s" : "0x6c5adf68b360513e1d3819296d1a9e4574b226c305340a4ea797de56f5b30c40",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d14g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d14g0v0Filler.json
new file mode 100644
index 000000000..599be8811
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d14g0v0Filler.json
@@ -0,0 +1,89 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d14g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000602280601760003960006000f55060006000fd00fe600060006000600073bea0000000000000000000000000000000000000620186a0fa",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xcfdf43b24779145c758e8ff42fb908569b71d461487c74f758fea6b8ca38fd4f",
+ "s" : "0x2985239d71d6a98585673da441d6a8cf57b6d31e22b5f532fcd8e0b634874a64",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d15g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d15g0v0Filler.json
new file mode 100644
index 000000000..fda6d9a50
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d15g0v0Filler.json
@@ -0,0 +1,89 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d15g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000602280603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe600060006000600073bea0000000000000000000000000000000000000620186a0fa",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x42f93d594239d78dced5b08686b1d334b633177709edc0e337ed41a42aee1414",
+ "s" : "0x39b630ecf6c3d067a75971052c1fa708e47e4612519c48aceb222271bfaaebbb",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d1g0v0Filler.json
new file mode 100644
index 000000000..81da6cd5d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d1g0v0Filler.json
@@ -0,0 +1,88 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d1g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000602480601260003960006000f55000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f1",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x29b4cfbf06761f2622a12b7064bf1d77177ecb44108e35d540cad115dcd8557a",
+ "s" : "0x554dc0ca17b7cb80e35b327d7f6ddb13124ac31f76c3fc05e9f4a606a80fc2c9",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d2g0v0Filler.json
new file mode 100644
index 000000000..c46d8e3e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d2g0v0Filler.json
@@ -0,0 +1,89 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d2g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000602480601760003960006000f55060006000fd00fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f1",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x5eb346d9c1f480d98538b8dbc2513bb9862828a52fe43482d90f738d30d6b248",
+ "s" : "0x51f223030afdb61017eec50513434f9f34ee3bad3f328a88ce0e59a1975892b0",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d3g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d3g0v0Filler.json
new file mode 100644
index 000000000..8727bd6df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d3g0v0Filler.json
@@ -0,0 +1,88 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d3g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000602480603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f1",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xa7e6b7c70bf8515ed5670b62acb81b09e3a1287e6e92cbe1b0d202f9881857b2",
+ "s" : "0x6b70914eec9dd3257d901d0badc240316f2452e094754354a5a8cc7eec9808b7",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d4g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d4g0v0Filler.json
new file mode 100644
index 000000000..0a1d559b3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d4g0v0Filler.json
@@ -0,0 +1,94 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d4g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073bea0000000000000000000000000000000000000620186a0f2",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x7ab7f8a1ab8b255be26fcc015ac2dd4e8579fdbb93055f65cba27cd897b4f0ff",
+ "s" : "0x769a83f5cc478176c5d6f2ae9d155fb2f8f613a4dbfb848ce5a35bffe745a664",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "0x01",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d5g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d5g0v0Filler.json
new file mode 100644
index 000000000..54f7a013c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d5g0v0Filler.json
@@ -0,0 +1,94 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d5g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000602480601260003960006000f55000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f2",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xa20c81fa4cc5f239dadcba456837780a1b0313786761136201d3b1b68fb87f9c",
+ "s" : "0x5596b158c762dd66f4ae23c9b42ac9d86cc16bdea1c46b2decfc2669d3619102",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ "nonce" : "0x01",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d6g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d6g0v0Filler.json
new file mode 100644
index 000000000..0e8f6b4bf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d6g0v0Filler.json
@@ -0,0 +1,89 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d6g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000602480601760003960006000f55060006000fd00fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f2",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x07e8c1075e1e3a5ddf44c7cf2ffd36bec516afa3027e61166666d252a143bf63",
+ "s" : "0x07cc15a64d272568dab48d263c838d28cc4615a9ae0f9f054919019870ffb3df",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d7g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d7g0v0Filler.json
new file mode 100644
index 000000000..00b6e1de3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d7g0v0Filler.json
@@ -0,0 +1,94 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d7g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000602480603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f2",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xab629d1a45b9cb618ba859dc411cddbdafba45a2918899cf678566c25a35dc91",
+ "s" : "0x219d638720085c990264889a866db601f7e6507048dfd6a110f71c1bd1dbb58d",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ "nonce" : "0x01",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d8g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d8g0v0Filler.json
new file mode 100644
index 000000000..24cd395bf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d8g0v0Filler.json
@@ -0,0 +1,89 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d8g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x600060006000600073bea0000000000000000000000000000000000000620186a0f4",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x3aa1b899bcd94185fdf23e146ad8298e3330810517a57d7a9b1392ff3318529c",
+ "s" : "0x1065903fdab02dc38052569cc80278a5e1d636925a0ed63d78bac0967ae0cef4",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d9g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d9g0v0Filler.json
new file mode 100644
index 000000000..ab739789a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_changeFromExternalCallInInitCode_d9g0v0Filler.json
@@ -0,0 +1,89 @@
+{
+ "sstore_changeFromExternalCallInInitCode_d9g0v0" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x989680",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000602280601260003960006000f55000fe600060006000600073bea0000000000000000000000000000000000000620186a0f4",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x3693e149cc47ffbef2caaee2186489bf85bef2d2ed8b8e5f7bc3f39d8cacf2c8",
+ "s" : "0x115242de02b66e36213217ae4968e7c8a331df3f8f02a173d0eecf635a915311",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x989680",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xbea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x600060015560016001556001600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "0xdea0000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stSStoreTest/InitCollisionFiller.json b/src/GeneralStateTestsFiller/stSStoreTest/InitCollisionFiller.json
new file mode 100644
index 000000000..e67122f88
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stSStoreTest/InitCollisionFiller.json
@@ -0,0 +1,162 @@
+{
+ "InitCollision" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x020000",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "//comment" : "Collision on transaction create",
+ "indexes" : {
+ "data" : [0],
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "fc597da4849c0d854629216d9e297bbca7bb4616" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "//comment" : "Collision on create2",
+ "indexes" : {
+ "data" : [1],
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "2",
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ },
+ "fc597da4849c0d854629216d9e297bbca7bb4616" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "//comment" : "Collision on create2 and REVERT",
+ "indexes" : {
+ "data" : [2],
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "fc597da4849c0d854629216d9e297bbca7bb4616" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "//comment" : "Collision on create2 and OOG",
+ "indexes" : {
+ "data" : [3],
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "2",
+ "storage" : {
+ "0x01" : "0x00"
+ }
+ },
+ "fc597da4849c0d854629216d9e297bbca7bb4616" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "//comment" : "transaction create account",
+ "balance" : "",
+ "code" : "",
+ "nonce" : "",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "fc597da4849c0d854629216d9e297bbca7bb4616" : {
+ "//comment" : "Create2 account",
+ "balance" : "",
+ "code" : "",
+ "nonce" : "",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "dea0000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "{ [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0 [[1]] 1 }",
+ "nonce" : "",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "{ (SSTORE 1 0) (SSTORE 1 1) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (SSTORE 1 0) (SSTORE 1 1) ) 0) 0) (STOP) ) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (SSTORE 1 0) (SSTORE 1 1) ) 0) 0) (REVERT 0 0) (STOP) ) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (SSTORE 1 0) (SSTORE 1 1) ) 0) 0) (CALL 200000 0xdea0000000000000000000000000000000000000 0 0 0 0 0) (STOP) ) }"
+ ],
+ "gasLimit" : [
+ "200000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stSStoreTest/sstore_changeFromExternalCallInInitCodeFiller.json b/src/GeneralStateTestsFiller/stSStoreTest/sstore_changeFromExternalCallInInitCodeFiller.json
new file mode 100644
index 000000000..811b63b25
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stSStoreTest/sstore_changeFromExternalCallInInitCodeFiller.json
@@ -0,0 +1,161 @@
+{
+ "sstore_changeFromExternalCallInInitCode" : {
+ "_info" : {
+ "comment" : "account already has storage X. create -> in init code change that account's storage -> 0 -> change it to X again "
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x020000",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "//comment" : "call ",
+ "indexes" : {
+ "data" : [0, 1, 3],
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "bea0000000000000000000000000000000000000" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "//comment" : "call + revert",
+ "indexes" : {
+ "data" : [2, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16],
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "bea0000000000000000000000000000000000000" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x01"
+ }
+ },
+ "6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ "shouldnotexist" : "1"
+ }
+ }
+ },
+ {
+ "//comment" : "callcode",
+ "indexes" : {
+ "data" : [4],
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "bea0000000000000000000000000000000000000" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x01"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "//comment" : "callcode + create2",
+ "indexes" : {
+ "data" : [5, 7],
+ "gas" : 0,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "bea0000000000000000000000000000000000000" : {
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x00",
+ "0x01" : "0x01"
+ }
+ },
+ "6602cfc925be62bf18470598a98f72812a1ebef2" : {
+ "nonce" : "1",
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "bea0000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "{ (SSTORE 1 0) (SSTORE 1 1) (SSTORE 0 1) }",
+ "nonce" : "",
+ "storage" : {
+ "0x01" : "0x01"
+ }
+ },
+ "dea0000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "{ [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0 [[1]] 1 }",
+ "nonce" : "",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "{ (CALL 100000 0xbea0000000000000000000000000000000000000 0 0 0 0 0) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (CALL 100000 0xbea0000000000000000000000000000000000000 0 0 0 0 0) ) 0) 0) (STOP) ) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (CALL 100000 0xbea0000000000000000000000000000000000000 0 0 0 0 0) ) 0) 0) (REVERT 0 0) (STOP) ) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (CALL 100000 0xbea0000000000000000000000000000000000000 0 0 0 0 0) ) 0) 0) (CALL 200000 0xdea0000000000000000000000000000000000000 0 0 0 0 0) (STOP) ) }",
+ "{ (CALLCODE 100000 0xbea0000000000000000000000000000000000000 0 0 0 0 0) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (CALLCODE 100000 0xbea0000000000000000000000000000000000000 0 0 0 0 0) ) 0) 0) (STOP) ) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (CALLCODE 100000 0xbea0000000000000000000000000000000000000 0 0 0 0 0) ) 0) 0) (REVERT 0 0) (STOP) ) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (CALLCODE 100000 0xbea0000000000000000000000000000000000000 0 0 0 0 0) ) 0) 0) (CALL 200000 0xdea0000000000000000000000000000000000000 0 0 0 0 0) (STOP) ) }",
+ "{ (DELEGATECALL 100000 0xbea0000000000000000000000000000000000000 0 0 0 0) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (DELEGATECALL 100000 0xbea0000000000000000000000000000000000000 0 0 0 0) ) 0) 0) (STOP) ) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (DELEGATECALL 100000 0xbea0000000000000000000000000000000000000 0 0 0 0) ) 0) 0) (REVERT 0 0) (STOP) ) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (DELEGATECALL 100000 0xbea0000000000000000000000000000000000000 0 0 0 0) ) 0) 0) (CALL 200000 0xdea0000000000000000000000000000000000000 0 0 0 0 0) (STOP) ) }",
+ "{ (STATICCALL 100000 0xbea0000000000000000000000000000000000000 0 0 0 0) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (STATICCALL 100000 0xbea0000000000000000000000000000000000000 0 0 0 0) ) 0) 0) (STOP) ) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (STATICCALL 100000 0xbea0000000000000000000000000000000000000 0 0 0 0) ) 0) 0) (REVERT 0 0) (STOP) ) }",
+ "{ (seq (CREATE2 0 0 (lll (seq (STATICCALL 100000 0xbea0000000000000000000000000000000000000 0 0 0 0) ) 0) 0) (CALL 200000 0xdea0000000000000000000000000000000000000 0 0 0 0 0) (STOP) ) }"
+ ],
+ "gasLimit" : [
+ "200000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 17:21:10 +0800