1 files changed, 187 insertions, 59 deletions
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g1v1.json
index fe190cba2..348f84927 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateOOG_d0g1v1_EIP150" : {
+    "RevertDepthCreateOOG_d0g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01f013",
-                    "hash" : "0xee44bd67a908a06b3bbb7b5e3c59aee46ad4025660031a05814c2d717b55a177",
-                    "mixHash" : "0x27b63cb89572da5327d5a30bc47dec26a3c7198a2d8bbc912535f1f236a3eea9",
-                    "nonce" : "0xc61a7400911830ac",
+                    "hash" : "0xa9448e505e32918341fbbbd31f0c47cd6ae6b47d2c23fdd6a4ee52c726944384",
+                    "mixHash" : "0x774a42c9454863c03eae2ba44b2635ea40cfa26480e3d67a13eacd35792a0f63",
+                    "nonce" : "0xd7cbf4e31a478c62",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befae",
-                    "stateRoot" : "0xc25c95d935ec6586c0a87cfb9e0060fdea473943710acde3bd4445a691123366",
+                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
+                    "stateRoot" : "0x4974535ec7ce793ec8208db3cf2e4efee6f0281802fc051175b85320bf95d018",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491db",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c25c95d935ec6586c0a87cfb9e0060fdea473943710acde3bd4445a691123366a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befaeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a027b63cb89572da5327d5a30bc47dec26a3c7198a2d8bbc912535f1f236a3eea988c61a7400911830acf882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04974535ec7ce793ec8208db3cf2e4efee6f0281802fc051175b85320bf95d018a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0774a42c9454863c03eae2ba44b2635ea40cfa26480e3d67a13eacd35792a0f6388d7cbf4e31a478c62f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee44bd67a908a06b3bbb7b5e3c59aee46ad4025660031a05814c2d717b55a177",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa9448e505e32918341fbbbd31f0c47cd6ae6b47d2c23fdd6a4ee52c726944384",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f013",
                 "code" : "",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g1v1_EIP158" : {
+    "RevertDepthCreateOOG_d0g1v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01f013",
+                    "hash" : "0x669a8d92f814440569d7c3d8bb684a9f0fadeaa646fb9b6d6ed9bc03dc1c1953",
+                    "mixHash" : "0x542a8d0a4b03f3993a3d2e29f33ea39b3f158e3543345adfc2a712883d7af932",
+                    "nonce" : "0xe695e9370d4920f5",
+                    "number" : "0x01",
+                    "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
+                    "stateRoot" : "0x4974535ec7ce793ec8208db3cf2e4efee6f0281802fc051175b85320bf95d018",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491db",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04974535ec7ce793ec8208db3cf2e4efee6f0281802fc051175b85320bf95d018a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0542a8d0a4b03f3993a3d2e29f33ea39b3f158e3543345adfc2a712883d7af93288e695e9370d4920f5f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfa",
+                        "s" : "0x400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74f",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x669a8d92f814440569d7c3d8bb684a9f0fadeaa646fb9b6d6ed9bc03dc1c1953",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5f013",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x04" : "0x0c"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a31fed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateOOG_d0g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01f013",
-                    "hash" : "0xcd2996ab210fdfed4ca13a65277b7429188e3c1f911408066153ff2843b09c7f",
-                    "mixHash" : "0x77eb63be04f59375a897244be50f5df5a43ba9dd0a2571fa4c94bf86ea561bf0",
-                    "nonce" : "0x04b22305a3aa14fb",
+                    "hash" : "0x9be0f3889b06cfd87418e17375bf19ab63aa03da2d6ef759c2f5d605533701e5",
+                    "mixHash" : "0x538e3421f0ad06e8ac027b39d1a11ccc994815dadde67cdc0cd3089bd9e0ab14",
+                    "nonce" : "0x21d04f98ce3c449f",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0x978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befae",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0xd16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491db",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c25c95d935ec6586c0a87cfb9e0060fdea473943710acde3bd4445a691123366a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befaeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a077eb63be04f59375a897244be50f5df5a43ba9dd0a2571fa4c94bf86ea561bf08804b22305a3aa14fbf882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c25c95d935ec6586c0a87cfb9e0060fdea473943710acde3bd4445a691123366a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befaeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0538e3421f0ad06e8ac027b39d1a11ccc994815dadde67cdc0cd3089bd9e0ab148821d04f98ce3c449ff882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd2996ab210fdfed4ca13a65277b7429188e3c1f911408066153ff2843b09c7f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9be0f3889b06cfd87418e17375bf19ab63aa03da2d6ef759c2f5d605533701e5",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f013",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g1v1_Frontier" : {
+    "RevertDepthCreateOOG_d0g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01ed7f",
-                    "hash" : "0x34fd6f5bd7d21990f1224489e52fceffa29d4667bef0c0d4bd85ba19fc0caa5d",
-                    "mixHash" : "0x142deeaae894161c030525ca28e4a27a7c717645ea8ffef9f9c395a99133b8d1",
-                    "nonce" : "0xcee774a6f361e6c8",
+                    "gasUsed" : "0x01f013",
+                    "hash" : "0xf5e7666325ac78572c40ae38342ce781c23f53f87559fec2aa72ad18470ac1ba",
+                    "mixHash" : "0x0986098e23a561053c78fcbeb995376ec2d01387e84eecfbed609cd106a0845a",
+                    "nonce" : "0x814418e25dde2ebe",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0xd482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354",
-                    "stateRoot" : "0x7bbb5431e0c08dc8b31cf9cfe3b7548213147bcca8ef9167795b2dac6a92d55a",
+                    "receiptTrie" : "0x978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befae",
+                    "stateRoot" : "0xc25c95d935ec6586c0a87cfb9e0060fdea473943710acde3bd4445a691123366",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491db",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bbb5431e0c08dc8b31cf9cfe3b7548213147bcca8ef9167795b2dac6a92d55aa0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0d482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0142deeaae894161c030525ca28e4a27a7c717645ea8ffef9f9c395a99133b8d188cee774a6f361e6c8f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c25c95d935ec6586c0a87cfb9e0060fdea473943710acde3bd4445a691123366a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befaeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a00986098e23a561053c78fcbeb995376ec2d01387e84eecfbed609cd106a0845a88814418e25dde2ebef882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -304,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34fd6f5bd7d21990f1224489e52fceffa29d4667bef0c0d4bd85ba19fc0caa5d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf5e7666325ac78572c40ae38342ce781c23f53f87559fec2aa72ad18470ac1ba",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5ed7f",
+                "balance" : "0x4563918244f5f013",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -324,7 +459,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a32281",
+                "balance" : "0xe8d4a31fed",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -362,10 +497,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g1v1_Homestead" : {
+    "RevertDepthCreateOOG_d0g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -377,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01ed7f",
-                    "hash" : "0x74fcb892d972fd61888158b1e32276d4d09510dfc9ce563d68617edab457f27f",
-                    "mixHash" : "0xc5a0a92ac924cfc2aca8e970b396d4a54af6a3024bfdcf0634d6df3a8f06b29c",
-                    "nonce" : "0x199e6560a257e759",
+                    "hash" : "0x838cef3b287d30c2bf5890d78c98283cb17b4a9ad27e5a5183136d5c39ea5fb6",
+                    "mixHash" : "0xc9a12900fefea6f5dbe0bdda19e1adf9241103feef1b8ce99107a15014549d42",
+                    "nonce" : "0x5a1ff4eb7327ae73",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0xd482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354",
@@ -388,7 +523,7 @@
                     "transactionsTrie" : "0xd16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491db",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bbb5431e0c08dc8b31cf9cfe3b7548213147bcca8ef9167795b2dac6a92d55aa0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0d482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0c5a0a92ac924cfc2aca8e970b396d4a54af6a3024bfdcf0634d6df3a8f06b29c88199e6560a257e759f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bbb5431e0c08dc8b31cf9cfe3b7548213147bcca8ef9167795b2dac6a92d55aa0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0d482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0c9a12900fefea6f5dbe0bdda19e1adf9241103feef1b8ce99107a15014549d42885a1ff4eb7327ae73f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -425,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x74fcb892d972fd61888158b1e32276d4d09510dfc9ce563d68617edab457f27f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x838cef3b287d30c2bf5890d78c98283cb17b4a9ad27e5a5183136d5c39ea5fb6",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5ed7f",
@@ -483,10 +618,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g1v1_Metropolis" : {
+    "RevertDepthCreateOOG_d0g1v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -497,19 +632,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01f013",
-                    "hash" : "0x9784c34a84767da56b20709c94d09575e3a7cadc2c458ace2d744fb36a54e3e8",
-                    "mixHash" : "0xe91cea523c554daaa5946e04bb4bd33858874577af7bb258cab222a378ab2362",
-                    "nonce" : "0xced21ea6ce9ecadb",
+                    "gasUsed" : "0x01ed7f",
+                    "hash" : "0x84a8d078206ecb99b3e958d9679effafc96183dae67093ae90d15dca8fd31886",
+                    "mixHash" : "0x05e58421142d88f529dcced7c569eb09d1262f653817a1b0c6267a9c2fa4255b",
+                    "nonce" : "0x9ee33af68657a237",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
-                    "stateRoot" : "0x4974535ec7ce793ec8208db3cf2e4efee6f0281802fc051175b85320bf95d018",
+                    "receiptTrie" : "0xd482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354",
+                    "stateRoot" : "0x7bbb5431e0c08dc8b31cf9cfe3b7548213147bcca8ef9167795b2dac6a92d55a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491db",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04974535ec7ce793ec8208db3cf2e4efee6f0281802fc051175b85320bf95d018a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0e91cea523c554daaa5946e04bb4bd33858874577af7bb258cab222a378ab236288ced21ea6ce9ecadbf882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bbb5431e0c08dc8b31cf9cfe3b7548213147bcca8ef9167795b2dac6a92d55aa0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0d482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a005e58421142d88f529dcced7c569eb09d1262f653817a1b0c6267a9c2fa4255b889ee33af68657a237f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -546,18 +681,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9784c34a84767da56b20709c94d09575e3a7cadc2c458ace2d744fb36a54e3e8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x84a8d078206ecb99b3e958d9679effafc96183dae67093ae90d15dca8fd31886",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5f013",
+                "balance" : "0x4563918244f5ed7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -573,7 +701,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a31fed",
+                "balance" : "0xe8d4a32281",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {