Merge pull request #495 from ethereum/create2

create2 OOG tests
author: winsvega <winsvega@mail.ru> 2018-09-04 00:18:58 +0800
committer: GitHub <noreply@github.com> 2018-09-04 00:18:58 +0800
commit: 9679eb690a57692df82d2851d53cf41796a3b672 (patch)
tree: ddbc9825a529d13a7ecebed1606012f8ad33b778
parent: 55946c752613a5392c6b347d0a74956ffb361bd7 (diff)
parent: c6ea53a574a8a7716b4109f3afeb2580a914c2b4 (diff)
download: dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.tar
dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.tar.gz
dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.tar.bz2
dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.tar.lz
dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.tar.xz
dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.tar.zst
dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.zip
48 files changed, 3081 insertions, 42 deletions
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g0v0.json
new file mode 100644
index 000000000..5b1f56a4f
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g0v0.json
@@ -0,0 +1,112 @@
+{
+    "Create2OOGafterInitCodeReturndata2_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g0v0Filler.json",
+            "sourceHash" : "5335a4bdbb73e2b6d0929371ee209691092617d3c5c7e4840fc2cefed6f41fa8"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd2f0",
+                    "hash" : "0x1edbb6f47c3364da3d96644f69c59e6b61feeab00014e4b8c77145c62fcd3bcf",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x2464adde1f3005641dc9eed6222ebb4bdf7f558c752829664d09dd2fd34ccf07",
+                    "receiptTrie" : "0xa0012fbba7ac8349cb3a08fc9718afc72efcd07c28df76cdc294f15c233f5003",
+                    "stateRoot" : "0x2dd9c4faaff93f62aa9ede1be095c606dae4fedad43ec663435baad751f4eab1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a02464adde1f3005641dc9eed6222ebb4bdf7f558c752829664d09dd2fd34ccf07a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02dd9c4faaff93f62aa9ede1be095c606dae4fedad43ec663435baad751f4eab1a0d1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fca0a0012fbba7ac8349cb3a08fc9718afc72efcd07c28df76cdc294f15c233f5003b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d2f08203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f861f85f800182d2f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba09f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdba02631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x2464adde1f3005641dc9eed6222ebb4bdf7f558c752829664d09dd2fd34ccf07",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4b08ccd5faadbfbd46f2009f3d4b06ee0a4b4457478106fe1b3cd1449f5852d5",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b08ccd5faadbfbd46f2009f3d4b06ee0a4b4457478106fe1b3cd1449f5852d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1edbb6f47c3364da3d96644f69c59e6b61feeab00014e4b8c77145c62fcd3bcf",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd2f0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43d10",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x02"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g1v0.json b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g1v0.json
new file mode 100644
index 000000000..e8d73c8e2
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g1v0.json
@@ -0,0 +1,119 @@
+{
+    "Create2OOGafterInitCodeReturndata2_d0g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g1v0Filler.json",
+            "sourceHash" : "ff43c6a816a00bba8e0ba5ac8753fec67d33a1716b0f03951441dd2e44e34cbf"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xfa46",
+                    "hash" : "0x946b4879efd586acc3f4bf8c219b467d3a2e2863e5af4740d61a15f952fcab9d",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x2464adde1f3005641dc9eed6222ebb4bdf7f558c752829664d09dd2fd34ccf07",
+                    "receiptTrie" : "0xdc679a54b72a61a79bb0d6d0274f48bb0f7dad83a7804101ebe60e280a6a3a17",
+                    "stateRoot" : "0xfa11e48ecdfec4719b8f2af85c0d87e1273b2d78f44f831ed8d39f11090a52f8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0b1473e7c89a58aba867501ee4abd101e6c011850cd4ac489716505eb21e5db4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a02464adde1f3005641dc9eed6222ebb4bdf7f558c752829664d09dd2fd34ccf07a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa11e48ecdfec4719b8f2af85c0d87e1273b2d78f44f831ed8d39f11090a52f8a00b1473e7c89a58aba867501ee4abd101e6c011850cd4ac489716505eb21e5db4a0dc679a54b72a61a79bb0d6d0274f48bb0f7dad83a7804101ebe60e280a6a3a17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082fa468203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f862f86080018301731894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0f7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8a02c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x017318",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8",
+                        "s" : "0x2c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x2464adde1f3005641dc9eed6222ebb4bdf7f558c752829664d09dd2fd34ccf07",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4b08ccd5faadbfbd46f2009f3d4b06ee0a4b4457478106fe1b3cd1449f5852d5",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b08ccd5faadbfbd46f2009f3d4b06ee0a4b4457478106fe1b3cd1449f5852d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x946b4879efd586acc3f4bf8c219b467d3a2e2863e5af4740d61a15f952fcab9d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cfa46",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6878b140f875209c82ab4d5f083b55947299ef6b" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a415ba",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556000600060003e600051600255",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x02" : "0x6460016001556000526005601bf3"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata3_d0g0v0.json
new file mode 100644
index 000000000..722c87ac2
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata3_d0g0v0.json
@@ -0,0 +1,126 @@
+{
+    "Create2OOGafterInitCodeReturndata3_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata3_d0g0v0Filler.json",
+            "sourceHash" : "b2b0bb7c9196a00945a9fbe83226cea7a9268d1e4241ed31a0b85701b52fc965"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd6d8",
+                    "hash" : "0xb1cb2c227601284253660647530281e7f33e18858d337d7b9871389616e42ad6",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e7918478e8430657b4cd3a63176ba816b1f0ac2637b07929e9372b383c37340",
+                    "receiptTrie" : "0xb243137394e58a80308b9d4a47f7c6186dc2bb5619f108404e51a55f6e15cfd3",
+                    "stateRoot" : "0x0209598b07ad37ad881a1959e578342d94384a4527b2effd6ed341a2901b1c57",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x14d1cdc2285a6a3617bb02e1925a02cd387fca88aba3bde3fce0be7b5f9f7a9a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a07e7918478e8430657b4cd3a63176ba816b1f0ac2637b07929e9372b383c37340a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00209598b07ad37ad881a1959e578342d94384a4527b2effd6ed341a2901b1c57a014d1cdc2285a6a3617bb02e1925a02cd387fca88aba3bde3fce0be7b5f9f7a9aa0b243137394e58a80308b9d4a47f7c6186dc2bb5619f108404e51a55f6e15cfd3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d6d88203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f861f85f800182d6d894c94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca01d6efce2f712996f1a4ebb5315dbb02a98ccecf4b0110d1dab7e12f5b44dc1c1a06b42d9ac73e294a17d3d3b7189bbac673674c1bb27c934f4d8fff368eb8dfc39c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd6d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d6efce2f712996f1a4ebb5315dbb02a98ccecf4b0110d1dab7e12f5b44dc1c1",
+                        "s" : "0x6b42d9ac73e294a17d3d3b7189bbac673674c1bb27c934f4d8fff368eb8dfc39",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e7918478e8430657b4cd3a63176ba816b1f0ac2637b07929e9372b383c37340",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7d15c55a27ca505b6bc837b35925aa54785e41f2959519c116f79e9070931577",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d15c55a27ca505b6bc837b35925aa54785e41f2959519c116f79e9070931577a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb1cb2c227601284253660647530281e7f33e18858d337d7b9871389616e42ad6",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd6d8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43928",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af2506020600060003e600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af2506020600060003e600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndataSize_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndataSize_d0g0v0.json
new file mode 100644
index 000000000..5c7d8e1ff
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndataSize_d0g0v0.json
@@ -0,0 +1,110 @@
+{
+    "Create2OOGafterInitCodeReturndataSize_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndataSize_d0g0v0Filler.json",
+            "sourceHash" : "01423d67767859fd7f8cd63274f71998f1e6b5724d6c69404ceaec848c428a12"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd700",
+                    "hash" : "0x01e3de057bc3c5eff99b54c3189b8377d2fd53ca302e51d9b4f021df2b6c9153",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x3ea2a82658202aa7d7d609ae5fe48f20d9660a2081cc640398725f1740510af8",
+                    "receiptTrie" : "0xfcdac727dc260882d90dc117234fe2e3c5c08b0353b7aa256bb73ef2a9f50eb3",
+                    "stateRoot" : "0xbca1bff58cb7b20dd616ee04db81681540ba10027d7d640415fa650ae3e35004",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x38fb65926470d792dd2742e0d2323ad32fc3f334c32ff4d5c55d6832029b8f22",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a03ea2a82658202aa7d7d609ae5fe48f20d9660a2081cc640398725f1740510af8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bca1bff58cb7b20dd616ee04db81681540ba10027d7d640415fa650ae3e35004a038fb65926470d792dd2742e0d2323ad32fc3f334c32ff4d5c55d6832029b8f22a0fcdac727dc260882d90dc117234fe2e3c5c08b0353b7aa256bb73ef2a9f50eb3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d7008203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f861f85f800182d70e94b94f5374fce5edbc8e2a8697c15331677e6ebf0b01801ba07529ad747ccaac2ef9598a125b4d41f3e2f487ae4636838e8b37ee24b97d5e3aa02441844ea0a26e310920f6130502d08e27d0fe7c0c7afc6eda91daf762a3fcc5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd70e",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7529ad747ccaac2ef9598a125b4d41f3e2f487ae4636838e8b37ee24b97d5e3a",
+                        "s" : "0x2441844ea0a26e310920f6130502d08e27d0fe7c0c7afc6eda91daf762a3fcc5",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3ea2a82658202aa7d7d609ae5fe48f20d9660a2081cc640398725f1740510af8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x184df7e44723f03f657a3367158eb8d5063b2dd0bb366aea8f4a3e8253e27490",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0184df7e44723f03f657a3367158eb8d5063b2dd0bb366aea8f4a3e8253e27490a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x01e3de057bc3c5eff99b54c3189b8377d2fd53ca302e51d9b4f021df2b6c9153",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd700",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a438ff",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x726960016001556001600255600052600a6016f360005260006013600d6000f5503d60020a",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x726960016001556001600255600052600a6016f360005260006013600d6000f5503d60020a",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g0v0.json
new file mode 100644
index 000000000..72ead13e5
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g0v0.json
@@ -0,0 +1,114 @@
+{
+    "Create2OOGafterInitCodeReturndata_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g0v0Filler.json",
+            "sourceHash" : "b70f689b4b56148882d5d6a7aab395e8bfb708541e8e34fca498a5a2d8871e11"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd2f0",
+                    "hash" : "0x3b54f22cde5f6f3613d651266470d53ef947a6d108b6d78f28911631f29fda7d",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xbb7490a693a4fdfb85d94cf26ea83038ae16f18c305b34b525d504daa2c0ee47",
+                    "receiptTrie" : "0xa0012fbba7ac8349cb3a08fc9718afc72efcd07c28df76cdc294f15c233f5003",
+                    "stateRoot" : "0xe7af9d25577d175f69116c6efdebbdb488414e709ed8a553c1f98c77b006577a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0bb7490a693a4fdfb85d94cf26ea83038ae16f18c305b34b525d504daa2c0ee47a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7af9d25577d175f69116c6efdebbdb488414e709ed8a553c1f98c77b006577aa0d1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fca0a0012fbba7ac8349cb3a08fc9718afc72efcd07c28df76cdc294f15c233f5003b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d2f08203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f861f85f800182d2f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba09f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdba02631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbb7490a693a4fdfb85d94cf26ea83038ae16f18c305b34b525d504daa2c0ee47",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb29a266269f01f9e6d41cd275a47ba87e08f0d9eae22b306d5d5c2ce03392a2d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29a266269f01f9e6d41cd275a47ba87e08f0d9eae22b306d5d5c2ce03392a2da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3b54f22cde5f6f3613d651266470d53ef947a6d108b6d78f28911631f29fda7d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd2f0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43d10",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g1v0.json b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g1v0.json
new file mode 100644
index 000000000..d9e45ba0b
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g1v0.json
@@ -0,0 +1,114 @@
+{
+    "Create2OOGafterInitCodeReturndata_d0g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g1v0Filler.json",
+            "sourceHash" : "a1f569b573ba9bd63372e49af4eeafecf15cea467a3fbd8cb1bb967a126cf8d3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x017318",
+                    "hash" : "0xfbf28909effa3038c4c352aafe8c189e8007157a0a454c80723df2ded40c8cb4",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xbb7490a693a4fdfb85d94cf26ea83038ae16f18c305b34b525d504daa2c0ee47",
+                    "receiptTrie" : "0x1bdcd930b7fdc5c12eb348343be4e7b6b5d1024f01ce0aa853862491e8095d8b",
+                    "stateRoot" : "0x876a27bdc94748b148db023bea0d4c1305e920843affd7da50d96eac2f02bf04",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0b1473e7c89a58aba867501ee4abd101e6c011850cd4ac489716505eb21e5db4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0bb7490a693a4fdfb85d94cf26ea83038ae16f18c305b34b525d504daa2c0ee47a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0876a27bdc94748b148db023bea0d4c1305e920843affd7da50d96eac2f02bf04a00b1473e7c89a58aba867501ee4abd101e6c011850cd4ac489716505eb21e5db4a01bdcd930b7fdc5c12eb348343be4e7b6b5d1024f01ce0aa853862491e8095d8bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830173188203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f862f86080018301731894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0f7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8a02c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x017318",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8",
+                        "s" : "0x2c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbb7490a693a4fdfb85d94cf26ea83038ae16f18c305b34b525d504daa2c0ee47",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb29a266269f01f9e6d41cd275a47ba87e08f0d9eae22b306d5d5c2ce03392a2d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29a266269f01f9e6d41cd275a47ba87e08f0d9eae22b306d5d5c2ce03392a2da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfbf28909effa3038c4c352aafe8c189e8007157a0a454c80723df2ded40c8cb4",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d7318",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a39ce8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert2_d0g0v0.json
new file mode 100644
index 000000000..b93ab7cd2
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert2_d0g0v0.json
@@ -0,0 +1,126 @@
+{
+    "Create2OOGafterInitCodeRevert2_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert2_d0g0v0Filler.json",
+            "sourceHash" : "b334790ebcd151a77abad2393bdeecc324808f78317b4e85f27fcd5bdaa82ef9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xe950",
+                    "hash" : "0x4d70317b66a80c2a1b3f12b83cc5e6de4d8de6f667afeba4b41e53c42d1b00f3",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x63f62b336d425afe94288a9eac99affeee2cffa92b8559bca7147b68799e4d31",
+                    "receiptTrie" : "0x97e0a291745986aac8d93f48554a9be7453ec98677e344d255d013922f6c997b",
+                    "stateRoot" : "0x3e83d8e83646e4a2cdcc903d26a8c8e02aee94bb097a1e22086f71491488ee16",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x89ff2c528ea36a7d98b3b8689c69e5f33b60d27295c6e60e6a53e56219deba5f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a063f62b336d425afe94288a9eac99affeee2cffa92b8559bca7147b68799e4d31a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e83d8e83646e4a2cdcc903d26a8c8e02aee94bb097a1e22086f71491488ee16a089ff2c528ea36a7d98b3b8689c69e5f33b60d27295c6e60e6a53e56219deba5fa097e0a291745986aac8d93f48554a9be7453ec98677e344d255d013922f6c997bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082e9508203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f862f8608001830124f894c94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0b524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0a0264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0",
+                        "s" : "0x264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x63f62b336d425afe94288a9eac99affeee2cffa92b8559bca7147b68799e4d31",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1c91775af33734b5a79cdf6357d5558bb2a17331eca37e2691d79bd6a06ce140",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c91775af33734b5a79cdf6357d5558bb2a17331eca37e2691d79bd6a06ce140a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4d70317b66a80c2a1b3f12b83cc5e6de4d8de6f667afeba4b41e53c42d1b00f3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62ce950",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a426b0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f55060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6180e8f150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x6460016001556000526005601bf3"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f55060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6180e8f150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert_d0g0v0.json
new file mode 100644
index 000000000..3638c702a
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert_d0g0v0.json
@@ -0,0 +1,126 @@
+{
+    "Create2OOGafterInitCodeRevert_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert_d0g0v0Filler.json",
+            "sourceHash" : "e214c8ba10a010d1870fdaa01ba2456c1deb6004500d22ed810a7016c6db9f86"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xe988",
+                    "hash" : "0x7a784e08e4c86a214eb67625dced6222d0fe5ee7acc2ae4c9eca27490c6e452c",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x4e83141e7e38cb01061f0ce7e13507a47ff7302bf2b5eee1e524b50209993897",
+                    "receiptTrie" : "0x56b3857906fda3c0ef470f463432a09c34edde138227de4962315352ea995ab4",
+                    "stateRoot" : "0xde8dfae2af63d2266083e0c9e6e6093f5a80a2d67a3b3680e5d29b1ad8430bb3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x89ff2c528ea36a7d98b3b8689c69e5f33b60d27295c6e60e6a53e56219deba5f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a04e83141e7e38cb01061f0ce7e13507a47ff7302bf2b5eee1e524b50209993897a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de8dfae2af63d2266083e0c9e6e6093f5a80a2d67a3b3680e5d29b1ad8430bb3a089ff2c528ea36a7d98b3b8689c69e5f33b60d27295c6e60e6a53e56219deba5fa056b3857906fda3c0ef470f463432a09c34edde138227de4962315352ea995ab4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082e9888203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f862f8608001830124f894c94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0b524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0a0264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0",
+                        "s" : "0x264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x4e83141e7e38cb01061f0ce7e13507a47ff7302bf2b5eee1e524b50209993897",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd0c9abbd269d3baacef8c2984f46e34368aa74129d89125a878e5ac5e0fb45e3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0c9abbd269d3baacef8c2984f46e34368aa74129d89125a878e5ac5e0fb45e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7a784e08e4c86a214eb67625dced6222d0fe5ee7acc2ae4c9eca27490c6e452c",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62ce988",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a42678",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f55060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x6460016001556000526005601bf3"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f55060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g0v0.json
new file mode 100644
index 000000000..2bab0714e
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g0v0.json
@@ -0,0 +1,110 @@
+{
+    "Create2OOGafterInitCode_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g0v0Filler.json",
+            "sourceHash" : "8acf2a1a3c01d96ea3245a5165bea4eff337f1024c4e3608c6d37d582ffe9dde"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd2e1",
+                    "hash" : "0x33025538cc6f7ef396bf10c7de75dcd6bc5afa103adca61930d3c4dfdd091aee",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x2db37e1a677b7a4522dc881acd8dfe8a39855b862928269765989f932446ad3e",
+                    "receiptTrie" : "0x110b62833b86036581842d44edc4a99ad928c179ced08d46b0507706d26892dd",
+                    "stateRoot" : "0x0deff20aadc4326d1c9cbdee9552947643076f2ba42b24b3b05c03b1a915700d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a02db37e1a677b7a4522dc881acd8dfe8a39855b862928269765989f932446ad3ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00deff20aadc4326d1c9cbdee9552947643076f2ba42b24b3b05c03b1a915700da0d1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fca0110b62833b86036581842d44edc4a99ad928c179ced08d46b0507706d26892ddb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d2e18203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f861f85f800182d2f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba09f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdba02631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x2db37e1a677b7a4522dc881acd8dfe8a39855b862928269765989f932446ad3e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x603f2826901298cdcf88615b903de5748a0dc81ebc9e1347583d4bde86751895",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0603f2826901298cdcf88615b903de5748a0dc81ebc9e1347583d4bde86751895a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x33025538cc6f7ef396bf10c7de75dcd6bc5afa103adca61930d3c4dfdd091aee",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd2e1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43d1f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g1v0.json b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g1v0.json
new file mode 100644
index 000000000..645d6510d
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g1v0.json
@@ -0,0 +1,117 @@
+{
+    "Create2OOGafterInitCode_d0g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g1v0Filler.json",
+            "sourceHash" : "b8de92ff3e86df6d67759ee91ecd3cc51ccbd3148dc15c94e77411f2ef160791"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd31a",
+                    "hash" : "0x632001a72b911512818219197ab60cdad81b3c0210345c17786542ffaf90a3e1",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x2db37e1a677b7a4522dc881acd8dfe8a39855b862928269765989f932446ad3e",
+                    "receiptTrie" : "0x80dc0c3f462081fdd9566fc7edca39546ef378768518fa1693c9138f548d1718",
+                    "stateRoot" : "0xfc735dd3d0e3037f674bb7d90a8dc04d93edef50481e7ed4db13aae0e5cea31d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7f2716334b77b355ef783bd0ce224487d5263ef2543943a70bf14fe9312ca1fe",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a02db37e1a677b7a4522dc881acd8dfe8a39855b862928269765989f932446ad3ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc735dd3d0e3037f674bb7d90a8dc04d93edef50481e7ed4db13aae0e5cea31da07f2716334b77b355ef783bd0ce224487d5263ef2543943a70bf14fe9312ca1fea080dc0c3f462081fdd9566fc7edca39546ef378768518fa1693c9138f548d1718b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d31a8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f861f85f800182d6d894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca01ac3db0be170248eaae3abf06ff4580c0c841cd68d355341f97760e56c052ac4a023c43abdaef05f0c4758a428f523a194a32e5d75a50752057a302fc67c2cb100c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd6d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ac3db0be170248eaae3abf06ff4580c0c841cd68d355341f97760e56c052ac4",
+                        "s" : "0x23c43abdaef05f0c4758a428f523a194a32e5d75a50752057a302fc67c2cb100",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x2db37e1a677b7a4522dc881acd8dfe8a39855b862928269765989f932446ad3e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x603f2826901298cdcf88615b903de5748a0dc81ebc9e1347583d4bde86751895",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0603f2826901298cdcf88615b903de5748a0dc81ebc9e1347583d4bde86751895a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x632001a72b911512818219197ab60cdad81b3c0210345c17786542ffaf90a3e1",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd31a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6878b140f875209c82ab4d5f083b55947299ef6b" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43ce6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d0g0v0.json
index b05763349..0d2948eb8 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d0g0v0.json
@@ -2,7 +2,7 @@
     "create2InitCodes_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.a168110a.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d0g0v0Filler.json",
             "sourceHash" : "bdcf21a21335a0f29a27ece2de5d016cf371563106ad14ca75aa008d7a95b9e8"
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d1g0v0.json
index 2f2e0efff..0bbb77f59 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d1g0v0.json
@@ -2,10 +2,10 @@
     "create2InitCodes_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.a168110a.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d1g0v0Filler.json",
-            "sourceHash" : "8a597c65809663a06845d0f6b2e5096d4edefb9ac9a56073597edf5873df9142"
+            "sourceHash" : "1770beeda1164e54fde00d6c761aad50fc486acd5268276fb136397361e8bdba"
         },
         "blocks" : [
             {
@@ -15,19 +15,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0xff386c1651c734a3015af552fb35436d47735cba76b7c4130c937630bf48c043",
+                    "gasUsed" : "0x06081f",
+                    "hash" : "0x754054fbd96c6248d6a3bc86b46bf57e6b58a62440d57665a3c321c8118098ee",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xb449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831",
+                    "receiptTrie" : "0xcafed7036ec1b96b7af953fb3cbf4be86ce7607d2d0f78ce7bb453f06938bcce",
+                    "stateRoot" : "0x14a3f109cc57f3f91ec3c0562a6b2ae739bf455e25cd2fb0567045098f1a9c26",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d985c7b8b6fcafb57a0510bc5b6b4604bb4d64437f3dfdfad93b425bae69879",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05d985c7b8b6fcafb57a0510bc5b6b4604bb4d64437f3dfdfad93b425bae69879a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f85ff85d800183061a8080019160566000536000600160006000f56000551ca062c17d31db4c0d74dd74cb3812d660f8de932bd9cd66e3ca96c6a08697ffae6aa0511e009de702bbd7f51501936d5a1f3ee4a86ac9dfbd1e320a7c57980d0d811dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014a3f109cc57f3f91ec3c0562a6b2ae739bf455e25cd2fb0567045098f1a9c26a05d985c7b8b6fcafb57a0510bc5b6b4604bb4d64437f3dfdfad93b425bae69879a0cafed7036ec1b96b7af953fb3cbf4be86ce7607d2d0f78ce7bb453f06938bcceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306081f8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f85ff85d800183061a8080019160566000536000600160006000f56000551ca062c17d31db4c0d74dd74cb3812d660f8de932bd9cd66e3ca96c6a08697ffae6aa0511e009de702bbd7f51501936d5a1f3ee4a86ac9dfbd1e320a7c57980d0d811dc0",
                 "transactions" : [
                     {
                         "data" : "0x60566000536000600160006000f5600055",
@@ -64,18 +64,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff386c1651c734a3015af552fb35436d47735cba76b7c4130c937630bf48c043",
+        "lastblockhash" : "0x754054fbd96c6248d6a3bc86b46bf57e6b58a62440d57665a3c321c8118098ee",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af6321a80",
+                "balance" : "0x29a2241af632081f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75de580",
+                "balance" : "0x0de0b6b3a75df7e0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d2g0v0.json
index 88267daca..5f92fb652 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d2g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d2g0v0.json
@@ -2,10 +2,10 @@
     "create2InitCodes_d2g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.a168110a.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d2g0v0Filler.json",
-            "sourceHash" : "056a747a816e3fa8a686e78cca09ca3cc2314e7587d8d70abf7679e364b64b11"
+            "sourceHash" : "134d4ce7ec17200f1e126cbe20661da090813c151505aeedc477d467640c75df"
         },
         "blocks" : [
             {
@@ -15,19 +15,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0x7578b8a4b7a709abdf9b966fa1052f36874acb5498a3688f3f3cb43eeb793072",
+                    "gasUsed" : "0x06081f",
+                    "hash" : "0x17d54ee17d381b474b3112dbad6b88a8d0d7463396e5c30c298885e9bce1776c",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xb449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831",
+                    "receiptTrie" : "0xcafed7036ec1b96b7af953fb3cbf4be86ce7607d2d0f78ce7bb453f06938bcce",
+                    "stateRoot" : "0x14a3f109cc57f3f91ec3c0562a6b2ae739bf455e25cd2fb0567045098f1a9c26",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x556cc48f5f5f7107039c36be401b8bc7186d3d25764cd9986f670c52049c3072",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0556cc48f5f5f7107039c36be401b8bc7186d3d25764cd9986f670c52049c3072a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f85ff85d800183061a8080019160016000536000600160006000f56000551ca0a133d89850f959103302492adc8d60c9ddeb00bded36cc0599cba28722832483a009e9c22fea47230f5a492ab9ca72bac4e9362e9bef5b859c1938029f95440a2bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014a3f109cc57f3f91ec3c0562a6b2ae739bf455e25cd2fb0567045098f1a9c26a0556cc48f5f5f7107039c36be401b8bc7186d3d25764cd9986f670c52049c3072a0cafed7036ec1b96b7af953fb3cbf4be86ce7607d2d0f78ce7bb453f06938bcceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306081f8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f85ff85d800183061a8080019160016000536000600160006000f56000551ca0a133d89850f959103302492adc8d60c9ddeb00bded36cc0599cba28722832483a009e9c22fea47230f5a492ab9ca72bac4e9362e9bef5b859c1938029f95440a2bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016000536000600160006000f5600055",
@@ -64,18 +64,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7578b8a4b7a709abdf9b966fa1052f36874acb5498a3688f3f3cb43eeb793072",
+        "lastblockhash" : "0x17d54ee17d381b474b3112dbad6b88a8d0d7463396e5c30c298885e9bce1776c",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af6321a80",
+                "balance" : "0x29a2241af632081f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75de580",
+                "balance" : "0x0de0b6b3a75df7e0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d3g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d3g0v0.json
index 63c82a7be..de830a444 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d3g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d3g0v0.json
@@ -2,10 +2,10 @@
     "create2InitCodes_d3g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.a168110a.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d3g0v0Filler.json",
-            "sourceHash" : "34892b332d56e1d1c7f92c8d6962eee5b3edb738c3d576160e69f6f13b35ec91"
+            "sourceHash" : "29fc97fa633bd37a918c27023a6e9717070fb315994ea2374d27ddf3c8724c8e"
         },
         "blocks" : [
             {
@@ -15,19 +15,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0x6f069bbf6e47b34a9504e7039540e7db836a5ab0d57cd847e1e467ce75ce5eca",
+                    "gasUsed" : "0x06081f",
+                    "hash" : "0xcd1538560f644cc8a0b4de649aeb2eac69246da2ed3f4d77acde39f04e1d4e29",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xb449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831",
+                    "receiptTrie" : "0xcafed7036ec1b96b7af953fb3cbf4be86ce7607d2d0f78ce7bb453f06938bcce",
+                    "stateRoot" : "0x14a3f109cc57f3f91ec3c0562a6b2ae739bf455e25cd2fb0567045098f1a9c26",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x14f8931cc5949e54df74b07499234cf7e6015e1fca7b4f10379b3e20ad072ec6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a014f8931cc5949e54df74b07499234cf7e6015e1fca7b4f10379b3e20ad072ec6a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f85ff85d800183061a8080019160f46000536000600160006000f56000551ba06d9ee5e43807bf2cd4742d689b0d4d413a6d5fd89fcf3c35fe73c4e65fe46482a07f0861d3a9053df1b2d461fba1ebc41a75aee8b116230db06348e44899d8bcd9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014a3f109cc57f3f91ec3c0562a6b2ae739bf455e25cd2fb0567045098f1a9c26a014f8931cc5949e54df74b07499234cf7e6015e1fca7b4f10379b3e20ad072ec6a0cafed7036ec1b96b7af953fb3cbf4be86ce7607d2d0f78ce7bb453f06938bcceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306081f8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f85ff85d800183061a8080019160f46000536000600160006000f56000551ba06d9ee5e43807bf2cd4742d689b0d4d413a6d5fd89fcf3c35fe73c4e65fe46482a07f0861d3a9053df1b2d461fba1ebc41a75aee8b116230db06348e44899d8bcd9c0",
                 "transactions" : [
                     {
                         "data" : "0x60f46000536000600160006000f5600055",
@@ -64,18 +64,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f069bbf6e47b34a9504e7039540e7db836a5ab0d57cd847e1e467ce75ce5eca",
+        "lastblockhash" : "0xcd1538560f644cc8a0b4de649aeb2eac69246da2ed3f4d77acde39f04e1d4e29",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af6321a80",
+                "balance" : "0x29a2241af632081f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75de580",
+                "balance" : "0x0de0b6b3a75df7e0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d4g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d4g0v0.json
index 341cee282..c735d40f6 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d4g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d4g0v0.json
@@ -2,7 +2,7 @@
     "create2InitCodes_d4g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.a168110a.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d4g0v0Filler.json",
             "sourceHash" : "8dcc7518643d3ff99ba04bb0e41c9c0b866461e1a6085bb7c5dcd26954689552"
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d5g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d5g0v0.json
index 0a1456d23..08fed89e2 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d5g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d5g0v0.json
@@ -2,7 +2,7 @@
     "create2InitCodes_d5g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.a168110a.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d5g0v0Filler.json",
             "sourceHash" : "741cd6454fa87d10bf76c0441ab783e8e9aba23368fc5581371e5c89fc6a7bfc"
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d6g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d6g0v0.json
index 284f8978d..abe479744 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d6g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d6g0v0.json
@@ -2,7 +2,7 @@
     "create2InitCodes_d6g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.a168110a.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d6g0v0Filler.json",
             "sourceHash" : "93196a838799a5ad484559e0c32fdd0d1998612c7d530551bf1ed99f717f195b"
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d7g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d7g0v0.json
index efa5c0903..2cbb89fd0 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d7g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d7g0v0.json
@@ -2,7 +2,7 @@
     "create2InitCodes_d7g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.a168110a.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d7g0v0Filler.json",
             "sourceHash" : "dd382082f4b463060560012d972052ee3131ba9aaf706b03de3155170b1d0ca2"
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d8g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d8g0v0.json
index a2840f71c..a1018ede0 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d8g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2InitCodes_d8g0v0.json
@@ -2,7 +2,7 @@
     "create2InitCodes_d8g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.a168110a.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d8g0v0Filler.json",
             "sourceHash" : "b9cf8ec382861af3fbf308a3747e108ccbb9f997cf1a2b4f03e62fda0e2d0e16"
diff --git a/GeneralStateTests/stCreate2/Create2OOGafterInitCode.json b/GeneralStateTests/stCreate2/Create2OOGafterInitCode.json
new file mode 100644
index 000000000..c9388eb6a
--- /dev/null
+++ b/GeneralStateTests/stCreate2/Create2OOGafterInitCode.json
@@ -0,0 +1,73 @@
+{
+    "Create2OOGafterInitCode" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeFiller.json",
+            "sourceHash" : "617c76b7b992c6427b950db904d54773eeff3a8d4dc8a166ca5f12c287af048a"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Constantinople" : [
+                {
+                    "hash" : "0x96e70977c90ade6ab47dad6a6cff69cfe8dcab0d8adde263075906ee4ce6d180",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x4bd881923eb0eb02a044d6ebd7ec9d538c1a76a89a4c47aea310375a7f4ac8ac",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x"
+            ],
+            "gasLimit" : [
+                "0xd2f0",
+                "0xd6d8"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
+\ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata.json b/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata.json
new file mode 100644
index 000000000..9a8d03be7
--- /dev/null
+++ b/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata.json
@@ -0,0 +1,75 @@
+{
+    "Create2OOGafterInitCodeReturndata" : {
+        "_info" : {
+            "comment" : "Call RETURNDATASIZE and RETURNDATACOPY (BufferOverrun) after CREATE2 deploy a contract",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndataFiller.json",
+            "sourceHash" : "807a2d1ee4d41de1a52de87f9188aa25999a8a54ee9abed72d0aac7ac1bdca96"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Constantinople" : [
+                {
+                    "hash" : "0x1fb745ccfea62e0fcaa0b852b5d7b1fd56d7eb0b6f0de4d95d7efbd23ab6d228",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x69cc6c91c5fde00ea5f89cf8ca9a4cecdebdc1b753810568ce1a62cc45a9791e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x"
+            ],
+            "gasLimit" : [
+                "0xd2f0",
+                "0x017318"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
+\ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2.json b/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2.json
new file mode 100644
index 000000000..1f55e2f8e
--- /dev/null
+++ b/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2.json
@@ -0,0 +1,74 @@
+{
+    "Create2OOGafterInitCodeReturndata2" : {
+        "_info" : {
+            "comment" : "Call RETURNDATASIZE and RETURNDATACOPY after CREATE2 deploy a contract. correct returndata copy.",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndata2Filler.json",
+            "sourceHash" : "92d5096dcc0db5b424d74d92c22102ca3c9a7a6ba3a55b7e9a587b800cc906c0"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Constantinople" : [
+                {
+                    "hash" : "0xb5bdbbecf4df65330dae6feaec59651f683dc07dcc3ea222a13949ed92fad9e7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x65a64088d4c6f6fd0f714769d96f3da4d3312830e967cea6f3ec8ffd7da4e614",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x02"
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x"
+            ],
+            "gasLimit" : [
+                "0xd2f0",
+                "0x017318"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
+\ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata3.json b/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata3.json
new file mode 100644
index 000000000..7466f8d32
--- /dev/null
+++ b/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata3.json
@@ -0,0 +1,71 @@
+{
+    "Create2OOGafterInitCodeReturndata3" : {
+        "_info" : {
+            "comment" : "Calls a contract that runs CREATE2 which deploy a code. then OOG happens upon deployment of the actual code. check the RETURN data buffer in initial contract",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndata3Filler.json",
+            "sourceHash" : "0b7f26e7d074e43f68939958560f5e0039219cb06b53262af06d8f45fcfbbf13"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Constantinople" : [
+                {
+                    "hash" : "0x31a8cd57d531e89f6f7a8899b56a721ad1c58ed337c7c1ca457def608eb364bd",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af2506020600060003e600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x"
+            ],
+            "gasLimit" : [
+                "0xd6d8"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
+\ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndataSize.json b/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndataSize.json
new file mode 100644
index 000000000..eb19a8731
--- /dev/null
+++ b/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndataSize.json
@@ -0,0 +1,63 @@
+{
+    "Create2OOGafterInitCodeReturndataSize" : {
+        "_info" : {
+            "comment" : "Calls a contract that runs CREATE2 which deploy a code. then OOG happens upon deployment of the actual code. check the RETURNDATASIZE after create. fails with OOG if RETURNDATASIZE != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndataSizeFiller.json",
+            "sourceHash" : "98fa3da5f00592ce31b98e1c2bec8f4da65112d92ae5fc494d344f786de13e13"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Constantinople" : [
+                {
+                    "hash" : "0x9cf79b5bfc300fdfa91d033cd6f47bee3147cf82fe6a12a9ff47a8b0bc796759",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x726960016001556001600255600052600a6016f360005260006013600d6000f5503d60020a",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x"
+            ],
+            "gasLimit" : [
+                "0xd70e"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0x01"
+            ]
+        }
+    }
+}
+\ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert.json b/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert.json
new file mode 100644
index 000000000..c761c7abd
--- /dev/null
+++ b/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert.json
@@ -0,0 +1,71 @@
+{
+    "Create2OOGafterInitCodeRevert" : {
+        "_info" : {
+            "comment" : "Calls a contract that runs CREATE2 which deploy a code. then after deployment and exiting from CREATE a REVERT is called. check the REVERT data in this case equal to RETURN value of CREATE",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeRevertFiller.json",
+            "sourceHash" : "322b6599fbb154316afcebcdfa7c2a336f46d2699dd61fc163416b66806f7b75"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Constantinople" : [
+                {
+                    "hash" : "0xc07567e7eac6634ae46171eeeaeb9abd01058e2a1fd7fe1526aada0ed9d2f14e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f55060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x"
+            ],
+            "gasLimit" : [
+                "0x0124f8"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
+\ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert2.json b/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert2.json
new file mode 100644
index 000000000..f9bbbd73f
--- /dev/null
+++ b/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert2.json
@@ -0,0 +1,71 @@
+{
+    "Create2OOGafterInitCodeRevert2" : {
+        "_info" : {
+            "comment" : "Calls a contract that runs CREATE2 which deploy a code. then after deployment and exiting from CREATE a REVERT is called. check the REVERT data in this case equal to RETURN value of CREATE2. CREATE2 fails due to the deployment cost.",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeRevert2Filler.json",
+            "sourceHash" : "636e318ef28963716d83e98286c58198823e7b366747351364d6055549fe40b4"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Constantinople" : [
+                {
+                    "hash" : "0x58fb1c46e315bb745384cfd8def8755a07ea80530c0dff613761e0bbbde736ca",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f55060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6180e8f150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x"
+            ],
+            "gasLimit" : [
+                "0x0124f8"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
+\ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/create2InitCodes.json b/GeneralStateTests/stCreate2/create2InitCodes.json
index 2b532e61c..285a6c6ea 100644
--- a/GeneralStateTests/stCreate2/create2InitCodes.json
+++ b/GeneralStateTests/stCreate2/create2InitCodes.json
@@ -2,10 +2,10 @@
     "create2InitCodes" : {
         "_info" : {
             "comment" : "testing different byte opcodes inside create2 init code",
-            "filledwith" : "testeth 1.5.0.dev2+commit.a168110a.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.61415d73.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCreate2/create2InitCodesFiller.json",
-            "sourceHash" : "3f81ff640203dd5948c68d0db0c54546ebbe77adbdff8e564d5a3968a6d9de64"
+            "sourceHash" : "05f6d0f7d8e839ac1b52fb0782e584036a244ab4c8b10908e7cb0f3dd0708ffa"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,7 +27,7 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0xd23f64cc62b526648cf76a5dc8205c7814fb2fa17a03475fa07b979bd25e00a1",
+                    "hash" : "0x704f486f5c5c6aa1678170c5fbf531000dafe05c726d6962bb3e432a9c2a3cca",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -36,7 +36,7 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0xd23f64cc62b526648cf76a5dc8205c7814fb2fa17a03475fa07b979bd25e00a1",
+                    "hash" : "0x704f486f5c5c6aa1678170c5fbf531000dafe05c726d6962bb3e432a9c2a3cca",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -45,7 +45,7 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0xd23f64cc62b526648cf76a5dc8205c7814fb2fa17a03475fa07b979bd25e00a1",
+                    "hash" : "0x704f486f5c5c6aa1678170c5fbf531000dafe05c726d6962bb3e432a9c2a3cca",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g0v0Filler.json
new file mode 100644
index 000000000..53725b5db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g0v0Filler.json
@@ -0,0 +1,78 @@
+{
+    "Create2OOGafterInitCodeReturndata2_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x01" : "0x02"
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "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" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g1v0Filler.json
new file mode 100644
index 000000000..00677cd5d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata2_d0g1v0Filler.json
@@ -0,0 +1,79 @@
+{
+    "Create2OOGafterInitCodeReturndata2_d0g1v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x017318",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8",
+                        "s" : "0x2c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6878b140f875209c82ab4d5f083b55947299ef6b" : {
+                        "code" : "0x6001600155"
+                    },
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x02" : "0x6460016001556000526005601bf3"
+                        }
+                    }
+                }
+            }
+        ],
+        "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" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata3_d0g0v0Filler.json
new file mode 100644
index 000000000..7f6ff80e1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata3_d0g0v0Filler.json
@@ -0,0 +1,85 @@
+{
+    "Create2OOGafterInitCodeReturndata3_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd6d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d6efce2f712996f1a4ebb5315dbb02a98ccecf4b0110d1dab7e12f5b44dc1c1",
+                        "s" : "0x6b42d9ac73e294a17d3d3b7189bbac673674c1bb27c934f4d8fff368eb8dfc39",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "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" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af2506020600060003e600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndataSize_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndataSize_d0g0v0Filler.json
new file mode 100644
index 000000000..a0afa25e7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndataSize_d0g0v0Filler.json
@@ -0,0 +1,75 @@
+{
+    "Create2OOGafterInitCodeReturndataSize_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd70e",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7529ad747ccaac2ef9598a125b4d41f3e2f487ae4636838e8b37ee24b97d5e3a",
+                        "s" : "0x2441844ea0a26e310920f6130502d08e27d0fe7c0c7afc6eda91daf762a3fcc5",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x01"
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "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" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x726960016001556001600255600052600a6016f360005260006013600d6000f5503d60020a",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g0v0Filler.json
new file mode 100644
index 000000000..4a96cb7f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g0v0Filler.json
@@ -0,0 +1,80 @@
+{
+    "Create2OOGafterInitCodeReturndata_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "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" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g1v0Filler.json
new file mode 100644
index 000000000..f21a7bbd4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeReturndata_d0g1v0Filler.json
@@ -0,0 +1,80 @@
+{
+    "Create2OOGafterInitCodeReturndata_d0g1v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x017318",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8",
+                        "s" : "0x2c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "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" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert2_d0g0v0Filler.json
new file mode 100644
index 000000000..447010d82
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert2_d0g0v0Filler.json
@@ -0,0 +1,85 @@
+{
+    "Create2OOGafterInitCodeRevert2_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0",
+                        "s" : "0x264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x01" : "0x6460016001556000526005601bf3"
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "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" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f55060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6180e8f150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert_d0g0v0Filler.json
new file mode 100644
index 000000000..6790585ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCodeRevert_d0g0v0Filler.json
@@ -0,0 +1,85 @@
+{
+    "Create2OOGafterInitCodeRevert_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0",
+                        "s" : "0x264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x01" : "0x6460016001556000526005601bf3"
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "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" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f55060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g0v0Filler.json
new file mode 100644
index 000000000..86ac52dac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g0v0Filler.json
@@ -0,0 +1,76 @@
+{
+    "Create2OOGafterInitCode_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6878b140f875209c82ab4d5f083b55947299ef6b" : {
+                    },
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
+        "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" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g1v0Filler.json
new file mode 100644
index 000000000..0be9df858
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/Create2OOGafterInitCode_d0g1v0Filler.json
@@ -0,0 +1,77 @@
+{
+    "Create2OOGafterInitCode_d0g1v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd6d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ac3db0be170248eaae3abf06ff4580c0c841cd68d355341f97760e56c052ac4",
+                        "s" : "0x23c43abdaef05f0c4758a428f523a194a32e5d75a50752057a302fc67c2cb100",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6878b140f875209c82ab4d5f083b55947299ef6b" : {
+                        "code" : "0x6001600155"
+                    },
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
+        "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" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
+\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d1g0v0Filler.json
index 4d190eafd..8c1df23c9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d1g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d1g0v0Filler.json
@@ -30,6 +30,8 @@
                 "network" : "Constantinople",
                 "result" : {
                     "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x02"
                     },
                     "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0x01"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d2g0v0Filler.json
index 3abdb1be5..d95fc1323 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d2g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d2g0v0Filler.json
@@ -30,6 +30,8 @@
                 "network" : "Constantinople",
                 "result" : {
                     "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x02"
                     },
                     "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0x01"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d3g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d3g0v0Filler.json
index d90a5353a..9e70026bc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d3g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2InitCodes_d3g0v0Filler.json
@@ -30,6 +30,8 @@
                 "network" : "Constantinople",
                 "result" : {
                     "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x02"
                     },
                     "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0x01"
diff --git a/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeFiller.json b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeFiller.json
new file mode 100644
index 000000000..a21584552
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeFiller.json
@@ -0,0 +1,83 @@
+{
+    "Create2OOGafterInitCode" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "storage" : {
+		            "0x01" : "0"
+		        }
+		    },
+		    "0x6878b140f875209c82ab4d5f083b55947299ef6b" : {
+		        "shouldnotexist" : "1"
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "storage" : {
+		            "0x01" : "0"
+		        }
+		    },
+		    "0x6878b140f875209c82ab4d5f083b55947299ef6b" : {
+		        "code" : "0x6001600155"
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"//code" : "(SSTORE 1 1) RETURN",
+		"code" : "{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }",
+		"storage": {
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "54000", "55000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndata2Filler.json b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndata2Filler.json
new file mode 100644
index 000000000..1f32e73ed
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndata2Filler.json
@@ -0,0 +1,90 @@
+{
+    "Create2OOGafterInitCodeReturndata2" : {
+	"_info" :{
+	    "comment" : "Call RETURNDATASIZE and RETURNDATACOPY after CREATE2 deploy a contract. correct returndata copy."
+	},
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "storage" : {
+		            "0x01" : "2",
+			    "0x02" : "0"
+		        }
+		    },
+		    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+		        "shouldnotexist" : "1"
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "storage" : {
+		            "0x01" : "0",
+			    "0x02" : "0x6460016001556000526005601bf3"
+		        }
+		    },
+		    "6878b140f875209c82ab4d5f083b55947299ef6b" : {
+		        "code" : "0x6001600155"
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"//code" : "(SSTORE 1 1) RETURN",
+		"code" : "{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) [[ 1 ]] (RETURNDATASIZE) (RETURNDATACOPY 0 0 0) [[ 2 ]] (MLOAD 0) }",
+		"storage": {
+		    "0x01" : "0x01",
+		    "0x01" : "0x02"
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "54000", "95000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndata3Filler.json b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndata3Filler.json
new file mode 100644
index 000000000..22b2b8a30
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndata3Filler.json
@@ -0,0 +1,76 @@
+{
+    "Create2OOGafterInitCodeReturndata3" : {
+	"_info" : {
+	    "comment" : "Calls a contract that runs CREATE2 which deploy a code. then OOG happens upon deployment of the actual code. check the RETURN data buffer in initial contract"
+	},
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "storage" : {
+                                "0x01" : "0x01"
+                         }
+		    },
+		    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+		        "shouldnotexist" : "1"
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ (CALLCODE (GAS) 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 32) (RETURNDATACOPY 0 0 32) [[ 1 ]] (MLOAD 0) }",
+		"storage": {
+		    "0x01" : "0x01"
+		}
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"//code" : "(SSTORE 1 1) RETURN",
+		"code" : "{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }",
+		"storage": {
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "55000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndataFiller.json b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndataFiller.json
new file mode 100644
index 000000000..b3c74a10f
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndataFiller.json
@@ -0,0 +1,71 @@
+{
+    "Create2OOGafterInitCodeReturndata" : {
+	"_info" :{
+	    "comment" : "Call RETURNDATASIZE and RETURNDATACOPY (BufferOverrun) after CREATE2 deploy a contract"
+	},
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "storage" : {
+		            "0x01" : "1",
+			    "0x02" : "1"
+		        }
+		    },
+		    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+		        "shouldnotexist" : "1"
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"//code" : "(SSTORE 1 1) RETURN",
+		"code" : "{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) [[ 1 ]] (RETURNDATASIZE) (RETURNDATACOPY 0 0 32) [[ 2 ]] (MLOAD 0) }",
+		"storage": {
+		    "0x01" : "1",
+		    "0x02" : "1"
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "54000", "95000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndataSizeFiller.json b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndataSizeFiller.json
new file mode 100644
index 000000000..a84ee329a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeReturndataSizeFiller.json
@@ -0,0 +1,67 @@
+{
+    "Create2OOGafterInitCodeReturndataSize" : {
+	"_info" : {
+	    "comment" : "Calls a contract that runs CREATE2 which deploy a code. then OOG happens upon deployment of the actual code. check the RETURNDATASIZE after create. fails with OOG if RETURNDATASIZE != 0"
+	},
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "balance" : "1"
+		    },
+		    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+			"shouldnotexist" : "1"
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"//code" : "{ (MSTORE 0 0x60016001556001600255) (RETURN 22 10) }",
+		"//code" : "{ (SSTORE 1 1) (SSTORE 2 1) } ",
+		"code" : "{ (MSTORE 0 0x6960016001556001600255600052600a6016f3) (CREATE2 0 13 19 0) (EXP 2 (RETURNDATASIZE)) }",
+		"storage": {
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "55054"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeRevert2Filler.json b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeRevert2Filler.json
new file mode 100644
index 000000000..4b7ba7a62
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeRevert2Filler.json
@@ -0,0 +1,76 @@
+{
+    "Create2OOGafterInitCodeRevert2" : {
+	"_info" : {
+	    "comment" : "Calls a contract that runs CREATE2 which deploy a code. then after deployment and exiting from CREATE a REVERT is called. check the REVERT data in this case equal to RETURN value of CREATE2. CREATE2 fails due to the deployment cost."
+	},
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "storage" : {
+                                "0x01" : "0x6460016001556000526005601bf3"
+                         }
+		    },
+		    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+		        "shouldnotexist" : "1"
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ (CALL 33000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 32) [[ 1 ]] (MLOAD 0) }",
+		"storage": {
+		    "0x01" : "0x01"
+		}
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"//code" : "(SSTORE 1 1) RETURN",
+		"code" : "{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) (REVERT 0 32) }",
+		"storage": {
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "75000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeRevertFiller.json b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeRevertFiller.json
new file mode 100644
index 000000000..87fc3697b
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/Create2OOGafterInitCodeRevertFiller.json
@@ -0,0 +1,76 @@
+{
+    "Create2OOGafterInitCodeRevert" : {
+	"_info" : {
+	    "comment" : "Calls a contract that runs CREATE2 which deploy a code. then after deployment and exiting from CREATE a REVERT is called. check the REVERT data in this case equal to RETURN value of CREATE"
+	},
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "storage" : {
+                                "0x01" : "0x6460016001556000526005601bf3"
+                         }
+		    },
+		    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+		        "shouldnotexist" : "1"
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ (CALL (GAS) 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 32) [[ 1 ]] (MLOAD 0) }",
+		"storage": {
+		    "0x01" : "0x01"
+		}
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"//code" : "(SSTORE 1 1) RETURN",
+		"code" : "{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) (REVERT 0 32) }",
+		"storage": {
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "75000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2InitCodesFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2InitCodesFiller.json
index fb8031b85..5325911cc 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2InitCodesFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2InitCodesFiller.json
@@ -42,7 +42,8 @@
                 "network" : [">=Constantinople"],
                 "result" : {
                     "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                        "shouldnotexist" : "1"
+                        "balance" : "1",
+			"nonce" : "2"
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "1"
author	winsvega <winsvega@mail.ru>	2018-09-04 00:18:58 +0800
committer	GitHub <noreply@github.com>	2018-09-04 00:18:58 +0800
commit	9679eb690a57692df82d2851d53cf41796a3b672 (patch)
tree	ddbc9825a529d13a7ecebed1606012f8ad33b778
parent	55946c752613a5392c6b347d0a74956ffb361bd7 (diff)
parent	c6ea53a574a8a7716b4109f3afeb2580a914c2b4 (diff)
download	dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.tar dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.tar.gz dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.tar.bz2 dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.tar.lz dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.tar.xz dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.tar.zst dexon-tests-9679eb690a57692df82d2851d53cf41796a3b672.zip