1 files changed, 189 insertions, 61 deletions
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert_d0g0v0.json
index db0f5b7b0..4e068d568 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "LoopCallsDepthThenRevert_d0g0v0_EIP150" : {
+    "LoopCallsDepthThenRevert_d0g0v0_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/LoopCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x13da36",
-                    "hash" : "0x7841921a735864ff4a15850037f375180c6b847b71014a32825957053ef71a78",
-                    "mixHash" : "0xfbd3f83bf3d27fcc2b2d177e0da23c8b8d9c2d0e3b985f05576f45ada1f60153",
-                    "nonce" : "0x100588164d5aa8dd",
+                    "hash" : "0xeaecbb831860a0e7df0609b336295c3d13c7565cc3a60d715bac0f301465799e",
+                    "mixHash" : "0x6f03c42cf3a28204da5ba1305bac4f95174b67b14f3810dbd2002f69374110fa",
+                    "nonce" : "0x369509f152441e44",
                     "number" : "0x01",
                     "parentHash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
-                    "receiptTrie" : "0x2bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393a",
-                    "stateRoot" : "0xb3dc40cbc6578476c0343c98288611b5ff1f67e24e038ab3993f35a8df45d944",
+                    "receiptTrie" : "0x80a850ff8b6e63ae8e0a0d87095a604cc2cd8ea0c78962e8f4e31f5ed5352ee7",
+                    "stateRoot" : "0x991ece84ea8e589bced01a297443a1545c971c886f22f27936023066a2241482",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3dc40cbc6578476c0343c98288611b5ff1f67e24e038ab3993f35a8df45d944a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda02bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a0fbd3f83bf3d27fcc2b2d177e0da23c8b8d9c2d0e3b985f05576f45ada1f6015388100588164d5aa8ddf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0991ece84ea8e589bced01a297443a1545c971c886f22f27936023066a2241482a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda080a850ff8b6e63ae8e0a0d87095a604cc2cd8ea0c78962e8f4e31f5ed5352ee7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a06f03c42cf3a28204da5ba1305bac4f95174b67b14f3810dbd2002f69374110fa88369509f152441e44f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7841921a735864ff4a15850037f375180c6b847b71014a32825957053ef71a78",
-        "network" : "EIP150",
+        "lastblockhash" : "0xeaecbb831860a0e7df0609b336295c3d13c7565cc3a60d715bac0f301465799e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824507da36",
                 "code" : "",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert_d0g0v0_EIP158" : {
+    "LoopCallsDepthThenRevert_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsDepthThenRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x13da36",
+                    "hash" : "0xceb8e0cd836d3ad2c2b20e6cd0675c6b25b4600e7bc32f6052f01a342a4b2f5e",
+                    "mixHash" : "0x7e565725511486ca759b830af6f24eee0b160dbf8781e90b9b2b9224da33c15e",
+                    "nonce" : "0xef3fd9eacdbc0263",
+                    "number" : "0x01",
+                    "parentHash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
+                    "receiptTrie" : "0x80a850ff8b6e63ae8e0a0d87095a604cc2cd8ea0c78962e8f4e31f5ed5352ee7",
+                    "stateRoot" : "0x991ece84ea8e589bced01a297443a1545c971c886f22f27936023066a2241482",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0991ece84ea8e589bced01a297443a1545c971c886f22f27936023066a2241482a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda080a850ff8b6e63ae8e0a0d87095a604cc2cd8ea0c78962e8f4e31f5ed5352ee7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a07e565725511486ca759b830af6f24eee0b160dbf8781e90b9b2b9224da33c15e88ef3fd9eacdbc0263f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88",
+                        "s" : "0x13761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xceb8e0cd836d3ad2c2b20e6cd0675c6b25b4600e7bc32f6052f01a342a4b2f5e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824507da36",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600054016000556000600060006000600073b0000000000000000000000000000000000000005af1",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x69"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d49135ca",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600054016000556000600060006000600073a0000000000000000000000000000000000000005af1",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x69"
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600054016000556000600060006000600073b0000000000000000000000000000000000000005af1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600054016000556000600060006000600073a0000000000000000000000000000000000000005af1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "LoopCallsDepthThenRevert_d0g0v0_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/LoopCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x13da36",
-                    "hash" : "0xc5642267d8597a8ee8eb64751c6eb64c65deb0cd4605ebbd8567539f4c93b004",
-                    "mixHash" : "0x02ca97424350fd4badd7cb3a9e3c664a47d99bc47e0214f111ba39e00f6652ba",
-                    "nonce" : "0x401f3a5c6ed4b0e3",
+                    "hash" : "0xfeff37e332c4429d4aaf3dd707fa0f025958bf9c8c11f6f0b1821e6c2c83b4d9",
+                    "mixHash" : "0xe9c9b0388d209e4a3babc930a45e574957ac3b0e1765c4774dbe7c9695885925",
+                    "nonce" : "0x2558840b88b85806",
                     "number" : "0x01",
                     "parentHash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
                     "receiptTrie" : "0x2bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393a",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3dc40cbc6578476c0343c98288611b5ff1f67e24e038ab3993f35a8df45d944a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda02bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a002ca97424350fd4badd7cb3a9e3c664a47d99bc47e0214f111ba39e00f6652ba88401f3a5c6ed4b0e3f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3dc40cbc6578476c0343c98288611b5ff1f67e24e038ab3993f35a8df45d944a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda02bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a0e9c9b0388d209e4a3babc930a45e574957ac3b0e1765c4774dbe7c9695885925882558840b88b85806f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5642267d8597a8ee8eb64751c6eb64c65deb0cd4605ebbd8567539f4c93b004",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfeff37e332c4429d4aaf3dd707fa0f025958bf9c8c11f6f0b1821e6c2c83b4d9",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824507da36",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert_d0g0v0_Frontier" : {
+    "LoopCallsDepthThenRevert_d0g0v0_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/LoopCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x989680",
-                    "hash" : "0xcfb67f4f43956a10a1f895a1aa3c824ddca20bc695377ab91a4063766a220480",
-                    "mixHash" : "0x109f60af327ad42a1840c334b8e88cec44585fb16492f0d44d1a6bbecd0c9164",
-                    "nonce" : "0x0289f161c72a5882",
+                    "gasUsed" : "0x13da36",
+                    "hash" : "0xde06b3e63585e5a1dcd6d5bcadb77676cc887627ac2917e666868943e83a8744",
+                    "mixHash" : "0x3c861b89e2f74ef552b7ed66b5b5f84ad7c949488af67f1bbd3a53a8405f3b8c",
+                    "nonce" : "0x32b49cd81ac043fc",
                     "number" : "0x01",
                     "parentHash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
-                    "receiptTrie" : "0xafd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5e",
-                    "stateRoot" : "0x6d9bc3b558078a8985692a1e4bcbf6adff296281ef23bc560f28b862573bae8d",
+                    "receiptTrie" : "0x2bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393a",
+                    "stateRoot" : "0xb3dc40cbc6578476c0343c98288611b5ff1f67e24e038ab3993f35a8df45d944",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d9bc3b558078a8985692a1e4bcbf6adff296281ef23bc560f28b862573bae8da0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0afd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0109f60af327ad42a1840c334b8e88cec44585fb16492f0d44d1a6bbecd0c9164880289f161c72a5882f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3dc40cbc6578476c0343c98288611b5ff1f67e24e038ab3993f35a8df45d944a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda02bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a03c861b89e2f74ef552b7ed66b5b5f84ad7c949488af67f1bbd3a53a8405f3b8c8832b49cd81ac043fcf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcfb67f4f43956a10a1f895a1aa3c824ddca20bc695377ab91a4063766a220480",
-        "network" : "Frontier",
+        "lastblockhash" : "0xde06b3e63585e5a1dcd6d5bcadb77676cc887627ac2917e666868943e83a8744",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182458c9680",
+                "balance" : "0x456391824507da36",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -319,10 +454,11 @@
                 "code" : "0x6001600054016000556000600060006000600073b0000000000000000000000000000000000000005af1",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x69"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d40c7980",
+                "balance" : "0xe8d49135ca",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -333,6 +469,7 @@
                 "code" : "0x6001600054016000556000600060006000600073a0000000000000000000000000000000000000005af1",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x69"
                 }
             }
         },
@@ -360,10 +497,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert_d0g0v0_Homestead" : {
+    "LoopCallsDepthThenRevert_d0g0v0_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/LoopCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -375,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x989680",
-                    "hash" : "0xbf09cf94c596ddd8b26b3959f1659841538a0e1d7ced80abec592142e3e81eef",
-                    "mixHash" : "0xfd5b7c8d2a7277d3422d867a911b711e94bfe6b3c8ebd6bb5fb6c8d7cdae3eb6",
-                    "nonce" : "0x3260aea4c64ce959",
+                    "hash" : "0xa4bd5815cc2fff1e8320946269fadd115f693f1b0360df025038ebbf957c3c73",
+                    "mixHash" : "0xc9b46db49546c338b3180d4dfe511210f4e5aee39954402814ff3c05a06fc900",
+                    "nonce" : "0xe7f69b963132085e",
                     "number" : "0x01",
                     "parentHash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
                     "receiptTrie" : "0xafd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5e",
@@ -386,7 +523,7 @@
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d9bc3b558078a8985692a1e4bcbf6adff296281ef23bc560f28b862573bae8da0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0afd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0fd5b7c8d2a7277d3422d867a911b711e94bfe6b3c8ebd6bb5fb6c8d7cdae3eb6883260aea4c64ce959f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d9bc3b558078a8985692a1e4bcbf6adff296281ef23bc560f28b862573bae8da0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0afd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0c9b46db49546c338b3180d4dfe511210f4e5aee39954402814ff3c05a06fc90088e7f69b963132085ef862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf09cf94c596ddd8b26b3959f1659841538a0e1d7ced80abec592142e3e81eef",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa4bd5815cc2fff1e8320946269fadd115f693f1b0360df025038ebbf957c3c73",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182458c9680",
@@ -479,10 +616,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert_d0g0v0_Metropolis" : {
+    "LoopCallsDepthThenRevert_d0g0v0_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/LoopCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -493,19 +630,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x13da36",
-                    "hash" : "0x493562455cd431526da3929d508f5e32effba77b30de19d99a99577536fadd71",
-                    "mixHash" : "0xe0f62a4cf27807264921a4486a6cc9dbc0764554a69bf2b5ed099d5610c1c8c6",
-                    "nonce" : "0xb112a2df643ec29f",
+                    "gasUsed" : "0x989680",
+                    "hash" : "0xcccef5768a116ac1a62e6f882f16585ab8eaddc7e1618518980a930886049808",
+                    "mixHash" : "0xd0b1ccd55b14499595caa9cf51131e0e113bc1400421b4853748c983e3bf2311",
+                    "nonce" : "0xdaff819009b3dbcc",
                     "number" : "0x01",
                     "parentHash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
-                    "receiptTrie" : "0x80a850ff8b6e63ae8e0a0d87095a604cc2cd8ea0c78962e8f4e31f5ed5352ee7",
-                    "stateRoot" : "0x991ece84ea8e589bced01a297443a1545c971c886f22f27936023066a2241482",
+                    "receiptTrie" : "0xafd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5e",
+                    "stateRoot" : "0x6d9bc3b558078a8985692a1e4bcbf6adff296281ef23bc560f28b862573bae8d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0991ece84ea8e589bced01a297443a1545c971c886f22f27936023066a2241482a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda080a850ff8b6e63ae8e0a0d87095a604cc2cd8ea0c78962e8f4e31f5ed5352ee7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a0e0f62a4cf27807264921a4486a6cc9dbc0764554a69bf2b5ed099d5610c1c8c688b112a2df643ec29ff862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d9bc3b558078a8985692a1e4bcbf6adff296281ef23bc560f28b862573bae8da0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0afd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0d0b1ccd55b14499595caa9cf51131e0e113bc1400421b4853748c983e3bf231188daff819009b3dbccf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -542,18 +679,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x493562455cd431526da3929d508f5e32effba77b30de19d99a99577536fadd71",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xcccef5768a116ac1a62e6f882f16585ab8eaddc7e1618518980a930886049808",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824507da36",
+                "balance" : "0x45639182458c9680",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -564,11 +694,10 @@
                 "code" : "0x6001600054016000556000600060006000600073b0000000000000000000000000000000000000005af1",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x69"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49135ca",
+                "balance" : "0xe8d40c7980",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -579,7 +708,6 @@
                 "code" : "0x6001600054016000556000600060006000600073a0000000000000000000000000000000000000005af1",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x69"
                 }
             }
         },