Merge pull request #578 from ethereum/moretests

sstore overwrite on init collision. 

10 files changed, 1199 insertions, 0 deletions

diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d0g0v0.json
new file mode 100644
index 000000000..851d704a1
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d0g0v0.json
@@ -0,0 +1,131 @@
+{
+    "InitCollisionNonZeroNonce_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-alpha.7-15+commit.91787f23",
+            "lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d0g0v0Filler.json",
+            "sourceHash" : "649f252b92109300b64781e1e9bca2c8ef7547418b1595c9201322595e6b7e38"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x42ea313842e7a0a0b1279418ba54e2445af72337f1ddbd78fb8312dc5e4575a3",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xb61a7bfa1b64cdd7ef5886a40e6a39f40684cc16cd2c057fef5dc644b506e097",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x79e72a3cd576bdf350dba90dd273c0f8afe3563fee06260c57b1542da5b96377",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0b61a7bfa1b64cdd7ef5886a40e6a39f40684cc16cd2c057fef5dc644b506e097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079e72a3cd576bdf350dba90dd273c0f8afe3563fee06260c57b1542da5b96377a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb61a7bfa1b64cdd7ef5886a40e6a39f40684cc16cd2c057fef5dc644b506e097",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x01a2f9fbee04ba20a3e14acb4f7ffc504f1290626818f075fe72976bdb6c7f1f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001a2f9fbee04ba20a3e14acb4f7ffc504f1290626818f075fe72976bdb6c7f1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x42ea313842e7a0a0b1279418ba54e2445af72337f1ddbd78fb8312dc5e4575a3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x1bc16d674ec80000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d1g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d1g0v0.json
new file mode 100644
index 000000000..9469aae57
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d1g0v0.json
@@ -0,0 +1,131 @@
+{
+    "InitCollisionNonZeroNonce_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-alpha.7-15+commit.91787f23",
+            "lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d1g0v0Filler.json",
+            "sourceHash" : "dcd4c59fa5e1b6d08b3ff9f551026ed2c7ff6c610e777bad110c8f176ba3c55a"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x42ea313842e7a0a0b1279418ba54e2445af72337f1ddbd78fb8312dc5e4575a3",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xb61a7bfa1b64cdd7ef5886a40e6a39f40684cc16cd2c057fef5dc644b506e097",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x79e72a3cd576bdf350dba90dd273c0f8afe3563fee06260c57b1542da5b96377",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0b61a7bfa1b64cdd7ef5886a40e6a39f40684cc16cd2c057fef5dc644b506e097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079e72a3cd576bdf350dba90dd273c0f8afe3563fee06260c57b1542da5b96377a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb61a7bfa1b64cdd7ef5886a40e6a39f40684cc16cd2c057fef5dc644b506e097",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x01a2f9fbee04ba20a3e14acb4f7ffc504f1290626818f075fe72976bdb6c7f1f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001a2f9fbee04ba20a3e14acb4f7ffc504f1290626818f075fe72976bdb6c7f1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x42ea313842e7a0a0b1279418ba54e2445af72337f1ddbd78fb8312dc5e4575a3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x1bc16d674ec80000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d2g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d2g0v0.json
new file mode 100644
index 000000000..6f84eb3f3
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d2g0v0.json
@@ -0,0 +1,131 @@
+{
+    "InitCollisionNonZeroNonce_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-alpha.7-15+commit.91787f23",
+            "lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d2g0v0Filler.json",
+            "sourceHash" : "1bfc23b26d25628fc58378520062bec1b7d66e67f97711b0739ad8150513def7"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x42ea313842e7a0a0b1279418ba54e2445af72337f1ddbd78fb8312dc5e4575a3",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xb61a7bfa1b64cdd7ef5886a40e6a39f40684cc16cd2c057fef5dc644b506e097",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x79e72a3cd576bdf350dba90dd273c0f8afe3563fee06260c57b1542da5b96377",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0b61a7bfa1b64cdd7ef5886a40e6a39f40684cc16cd2c057fef5dc644b506e097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079e72a3cd576bdf350dba90dd273c0f8afe3563fee06260c57b1542da5b96377a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb61a7bfa1b64cdd7ef5886a40e6a39f40684cc16cd2c057fef5dc644b506e097",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x01a2f9fbee04ba20a3e14acb4f7ffc504f1290626818f075fe72976bdb6c7f1f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001a2f9fbee04ba20a3e14acb4f7ffc504f1290626818f075fe72976bdb6c7f1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x42ea313842e7a0a0b1279418ba54e2445af72337f1ddbd78fb8312dc5e4575a3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x1bc16d674ec80000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d3g0v0.json b/BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d3g0v0.json
new file mode 100644
index 000000000..c78d4d05d
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d3g0v0.json
@@ -0,0 +1,131 @@
+{
+    "InitCollisionNonZeroNonce_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-alpha.7-15+commit.91787f23",
+            "lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d3g0v0Filler.json",
+            "sourceHash" : "2f1636ba679acf417fcb73b4511bcb09ec5a2c930223d341498b15a2070f0925"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x42ea313842e7a0a0b1279418ba54e2445af72337f1ddbd78fb8312dc5e4575a3",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xb61a7bfa1b64cdd7ef5886a40e6a39f40684cc16cd2c057fef5dc644b506e097",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x79e72a3cd576bdf350dba90dd273c0f8afe3563fee06260c57b1542da5b96377",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0b61a7bfa1b64cdd7ef5886a40e6a39f40684cc16cd2c057fef5dc644b506e097a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079e72a3cd576bdf350dba90dd273c0f8afe3563fee06260c57b1542da5b96377a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xb61a7bfa1b64cdd7ef5886a40e6a39f40684cc16cd2c057fef5dc644b506e097",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x01a2f9fbee04ba20a3e14acb4f7ffc504f1290626818f075fe72976bdb6c7f1f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001a2f9fbee04ba20a3e14acb4f7ffc504f1290626818f075fe72976bdb6c7f1fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x42ea313842e7a0a0b1279418ba54e2445af72337f1ddbd78fb8312dc5e4575a3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x1bc16d674ec80000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce.json b/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce.json
new file mode 100644
index 000000000..4ceb8f2bd
--- /dev/null
+++ b/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce.json
@@ -0,0 +1,109 @@
+{
+    "InitCollisionNonZeroNonce" : {
+        "_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-alpha.7-15+commit.91787f23",
+            "lllcversion" : "Version: 0.5.0-develop.2018.11.9+commit.9709dfe0.Linux.g++",
+            "source" : "src/GeneralStateTestsFiller/stSStoreTest/InitCollisionNonZeroNonceFiller.json",
+            "sourceHash" : "4918c4e61de66c6332129e96f64f71e4c82eaf51ea343754dc74eeee8fab08e7"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Constantinople" : [
+                {
+                    "hash" : "0x01a2f9fbee04ba20a3e14acb4f7ffc504f1290626818f075fe72976bdb6c7f1f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x01a2f9fbee04ba20a3e14acb4f7ffc504f1290626818f075fe72976bdb6c7f1f",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x01a2f9fbee04ba20a3e14acb4f7ffc504f1290626818f075fe72976bdb6c7f1f",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x01a2f9fbee04ba20a3e14acb4f7ffc504f1290626818f075fe72976bdb6c7f1f",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "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/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d0g0v0Filler.json
new file mode 100644
index 000000000..53c63270d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d0g0v0Filler.json
@@ -0,0 +1,101 @@
+{
+    "InitCollisionNonZeroNonce_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" : "0x60006001556001600155",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f5030b6bfd5d7de4114e3e85487ea2ba7c8cca22825a2a69487131514ec02b3",
+                        "s" : "0x1ec0d8f2feb244e3189dda89b77209c4bd9281b64684306d1e75964f64eebed2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                        "nonce" : "0x01",
+                        "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" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d1g0v0Filler.json
new file mode 100644
index 000000000..728645705
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d1g0v0Filler.json
@@ -0,0 +1,101 @@
+{
+    "InitCollisionNonZeroNonce_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" : "0x6000600a80601260003960006000f55000fe60006001556001600155",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d0831f8efd1a9d5cd8050da23c2910e26621cb342e4a8096190ab94f8623f64",
+                        "s" : "0x5a91d30b389d231625d8eec88a092ba299d05e79e210d0394bdf19995e4b0dba",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                        "nonce" : "0x01",
+                        "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" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d2g0v0Filler.json
new file mode 100644
index 000000000..0b458b760
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d2g0v0Filler.json
@@ -0,0 +1,101 @@
+{
+    "InitCollisionNonZeroNonce_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" : "0x6000600a80601760003960006000f55060006000fd00fe60006001556001600155",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf5379408f87294d459217674dd89ccfed2443eb0accb8fc17a859b42c0057dc9",
+                        "s" : "0x25c20f60737fefd74cc066b6a8e33fda952143b225693f3423088b530ea59cc4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                        "nonce" : "0x01",
+                        "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" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d3g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d3g0v0Filler.json
new file mode 100644
index 000000000..3d737edbd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/InitCollisionNonZeroNonce_d3g0v0Filler.json
@@ -0,0 +1,101 @@
+{
+    "InitCollisionNonZeroNonce_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" : "0x6000600a80603760003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f15000fe60006001556001600155",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a47982892c958bf9ed176a41bad62aa7e949a452caa88acc60c5c3fa16f7762",
+                        "s" : "0x7f5379287ad1a26af3c979e8fb4f7903ca5d348a34ec3ef6eb184636a395db0e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                        "nonce" : "0x01",
+                        "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" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdea0000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xfc597da4849c0d854629216d9e297bbca7bb4616" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stSStoreTest/InitCollisionNonZeroNonceFiller.json b/src/GeneralStateTestsFiller/stSStoreTest/InitCollisionNonZeroNonceFiller.json
new file mode 100644
index 000000000..0985e8d25
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stSStoreTest/InitCollisionNonZeroNonceFiller.json
@@ -0,0 +1,162 @@
+{
+    "InitCollisionNonZeroNonce" : {
+	"_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" : "1",
+			"storage" : {
+			    "0x01" : "0x01"
+		        }
+		    }
+                }
+            },
+	    {
+		"//comment" : "Collision on create2",
+                "indexes" : {
+                    "data" : [1],
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+			"nonce" : "1",
+			"storage" : {
+			    "0x01" : "0x01"
+		        }
+		    },
+		    "fc597da4849c0d854629216d9e297bbca7bb4616" : {
+			"nonce" : "1",
+			"storage" : {
+			    "0x01" : "0x01"
+		        }
+		    }
+                }
+            },
+	    {
+		"//comment" : "Collision on create2 and REVERT",
+                "indexes" : {
+                    "data" : [2],
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+			"nonce" : "1",
+			"storage" : {
+			    "0x01" : "0x01"
+		        }
+		    },
+		    "fc597da4849c0d854629216d9e297bbca7bb4616" : {
+			"nonce" : "1",
+			"storage" : {
+			    "0x01" : "0x01"
+		        }
+		    }
+                }
+            },
+	    {
+		"//comment" : "Collision on create2 and OOG",
+                "indexes" : {
+                    "data" : [3],
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+			"nonce" : "1",
+			"storage" : {
+			    "0x01" : "0x01"
+		        }
+		    },
+		    "fc597da4849c0d854629216d9e297bbca7bb4616" : {
+			"nonce" : "1",
+			"storage" : {
+			    "0x01" : "0x01"
+		        }
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+	    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+		"//comment" : "transaction create account",
+                "balance" : "",
+                "code" : "",
+                "nonce" : "1",
+                "storage" : {
+        		    "0x01" : "0x01"
+                }
+            },
+	    "fc597da4849c0d854629216d9e297bbca7bb4616" : {
+		"//comment" : "Create2 account",
+                "balance" : "",
+                "code" : "",
+                "nonce" : "1",
+                "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" : "1",
+                "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"
+            ]
+        }
+    }
+}