1 files changed, 187 insertions, 60 deletions
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0.json
index 2dfa6335c..1b1f6018e 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "LoopDelegateCallsDepthThenRevert_d0g0v0_EIP150" : {
+    "LoopDelegateCallsDepthThenRevert_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/LoopDelegateCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x13a00e",
-                    "hash" : "0x4b88d2e9b722c4542612439ef4ac53e32e1871ab3699f5dc820b68a8219f3db7",
-                    "mixHash" : "0xff48faea1a480339d61b5ec051e96f7df0b5cbf2e0dbfb125cea2d53d130ef3d",
-                    "nonce" : "0x1db36e8d6a3955da",
+                    "hash" : "0x0509bed2071ddbc6dc06c0ea832e109d1095102e96f8f6a0f31f94eb9d94c542",
+                    "mixHash" : "0xe29657328a658665d76447df7802f4d097c4cac69e66160996ceb403a663c605",
+                    "nonce" : "0x680a2f1e03835b9c",
                     "number" : "0x01",
                     "parentHash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
-                    "receiptTrie" : "0x87312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3",
-                    "stateRoot" : "0x081b1465432f927e25e5e147c7280503b01cdc3f5b6b713365f917072b197aa2",
+                    "receiptTrie" : "0x32379353f2ffb1b0c728e8c7f25c4959de893c529ffdb32f461464ba685e326b",
+                    "stateRoot" : "0xcbacc835a51149abaeec1ecb75b920ad6f8ec58f4a2a9ee781011c2369e39d0e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0081b1465432f927e25e5e147c7280503b01cdc3f5b6b713365f917072b197aa2a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda087312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a0ff48faea1a480339d61b5ec051e96f7df0b5cbf2e0dbfb125cea2d53d130ef3d881db36e8d6a3955daf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cbacc835a51149abaeec1ecb75b920ad6f8ec58f4a2a9ee781011c2369e39d0ea0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda032379353f2ffb1b0c728e8c7f25c4959de893c529ffdb32f461464ba685e326bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a0e29657328a658665d76447df7802f4d097c4cac69e66160996ceb403a663c60588680a2f1e03835b9cf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b88d2e9b722c4542612439ef4ac53e32e1871ab3699f5dc820b68a8219f3db7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0509bed2071ddbc6dc06c0ea832e109d1095102e96f8f6a0f31f94eb9d94c542",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824507a00e",
                 "code" : "",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "LoopDelegateCallsDepthThenRevert_d0g0v0_EIP158" : {
+    "LoopDelegateCallsDepthThenRevert_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -134,9 +141,136 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x13a00e",
-                    "hash" : "0xa9a027d861f8fa80d5934ebb59b21a7cae3784e3c9fab5b02bf787537c13b464",
-                    "mixHash" : "0x4c12e80b0ea3b887674dabea6cd6b242da28ad89b6b84b9df028c2667ce9cfe3",
-                    "nonce" : "0xbb739b8e74f40331",
+                    "hash" : "0x60177b7550887a29210a9d9af085ac9ebd793155d19fe89ef64409741797f620",
+                    "mixHash" : "0x75517b96fd034a33475f0b8cec10c02cc9e0b07c4a185f109fb6b4a53c2e8423",
+                    "nonce" : "0x7d8df40205e6c356",
+                    "number" : "0x01",
+                    "parentHash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
+                    "receiptTrie" : "0x32379353f2ffb1b0c728e8c7f25c4959de893c529ffdb32f461464ba685e326b",
+                    "stateRoot" : "0xcbacc835a51149abaeec1ecb75b920ad6f8ec58f4a2a9ee781011c2369e39d0e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cbacc835a51149abaeec1ecb75b920ad6f8ec58f4a2a9ee781011c2369e39d0ea0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda032379353f2ffb1b0c728e8c7f25c4959de893c529ffdb32f461464ba685e326bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a075517b96fd034a33475f0b8cec10c02cc9e0b07c4a185f109fb6b4a53c2e8423887d8df40205e6c356f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "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" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x60177b7550887a29210a9d9af085ac9ebd793155d19fe89ef64409741797f620",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824507a00e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005401600055600060006000600073b0000000000000000000000000000000000000005af4",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xd2"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4916ff2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005401600055600060006000600073a0000000000000000000000000000000000000005af4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005401600055600060006000600073b0000000000000000000000000000000000000005af4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005401600055600060006000600073a0000000000000000000000000000000000000005af4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "LoopDelegateCallsDepthThenRevert_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x13a00e",
+                    "hash" : "0xc839af1a7d6444d018c0daca86b33e92d28a56666c4357de67cfc278a0d7cdfd",
+                    "mixHash" : "0x3030fc9a28f041b53e4ca76f8e687f7f18e804daad6d97a89b53db8a41675400",
+                    "nonce" : "0xa65e99f56bad0c4a",
                     "number" : "0x01",
                     "parentHash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
                     "receiptTrie" : "0x87312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3",
@@ -145,7 +279,7 @@
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0081b1465432f927e25e5e147c7280503b01cdc3f5b6b713365f917072b197aa2a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda087312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a04c12e80b0ea3b887674dabea6cd6b242da28ad89b6b84b9df028c2667ce9cfe388bb739b8e74f40331f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0081b1465432f927e25e5e147c7280503b01cdc3f5b6b713365f917072b197aa2a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda087312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a03030fc9a28f041b53e4ca76f8e687f7f18e804daad6d97a89b53db8a4167540088a65e99f56bad0c4af862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,8 +316,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9a027d861f8fa80d5934ebb59b21a7cae3784e3c9fab5b02bf787537c13b464",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc839af1a7d6444d018c0daca86b33e92d28a56666c4357de67cfc278a0d7cdfd",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824507a00e",
@@ -239,10 +373,10 @@
             }
         }
     },
-    "LoopDelegateCallsDepthThenRevert_d0g0v0_Frontier" : {
+    "LoopDelegateCallsDepthThenRevert_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/LoopDelegateCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x989680",
-                    "hash" : "0x04040c50c6a7a3492855d69df82155038e550db4df9490f2444b7e9afb62e8db",
-                    "mixHash" : "0xfc76b894ee0ee07f28324c6d5ce24395a92339ac1ece8cc38626b22ca58ad0e3",
-                    "nonce" : "0x471a2aeabb00cd56",
+                    "gasUsed" : "0x13a00e",
+                    "hash" : "0x832935ee4fcba4bb803b3e761a36c62eb91af811f3526e9c507501bc3e6c3df6",
+                    "mixHash" : "0x35dda6e7b00a9e3c4105ac7a66af6a71c876c94a85b6dda403b950f24a38e735",
+                    "nonce" : "0xf6bc5defb6968e54",
                     "number" : "0x01",
                     "parentHash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
-                    "receiptTrie" : "0x272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50",
-                    "stateRoot" : "0x7076212ffc477132c9b41120f22b2b951daa536529346ed02811f68893e6c695",
+                    "receiptTrie" : "0x87312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3",
+                    "stateRoot" : "0x081b1465432f927e25e5e147c7280503b01cdc3f5b6b713365f917072b197aa2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07076212ffc477132c9b41120f22b2b951daa536529346ed02811f68893e6c695a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0fc76b894ee0ee07f28324c6d5ce24395a92339ac1ece8cc38626b22ca58ad0e388471a2aeabb00cd56f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0081b1465432f927e25e5e147c7280503b01cdc3f5b6b713365f917072b197aa2a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda087312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a035dda6e7b00a9e3c4105ac7a66af6a71c876c94a85b6dda403b950f24a38e73588f6bc5defb6968e54f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,11 +436,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04040c50c6a7a3492855d69df82155038e550db4df9490f2444b7e9afb62e8db",
-        "network" : "Frontier",
+        "lastblockhash" : "0x832935ee4fcba4bb803b3e761a36c62eb91af811f3526e9c507501bc3e6c3df6",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182458c9680",
+                "balance" : "0x456391824507a00e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -317,10 +451,11 @@
                 "code" : "0x600160005401600055600060006000600073b0000000000000000000000000000000000000005af4",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0xd2"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d40c7980",
+                "balance" : "0xe8d4916ff2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -358,10 +493,10 @@
             }
         }
     },
-    "LoopDelegateCallsDepthThenRevert_d0g0v0_Homestead" : {
+    "LoopDelegateCallsDepthThenRevert_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/LoopDelegateCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -373,9 +508,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x989680",
-                    "hash" : "0xc155bf2a126127446fd5ac18b3593069ba25cc12d7c190a14e66ae72c6ce3680",
-                    "mixHash" : "0xb9d5e21cf358c1eb594718ebb7d190cf351c8b852bf1f8741a01f2f8aff8d372",
-                    "nonce" : "0x38d4c2b7f01c196d",
+                    "hash" : "0xc8dd0b66af17afb317b1f9e152d511cfcec7ec6deed72009976bd53020caec46",
+                    "mixHash" : "0xccf8a4c6c27b20cbb5b6a00c1d23f73123d9d5755e7533171483776be796e11f",
+                    "nonce" : "0xfd0de846c38ea0cf",
                     "number" : "0x01",
                     "parentHash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
                     "receiptTrie" : "0x272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50",
@@ -384,7 +519,7 @@
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07076212ffc477132c9b41120f22b2b951daa536529346ed02811f68893e6c695a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0b9d5e21cf358c1eb594718ebb7d190cf351c8b852bf1f8741a01f2f8aff8d3728838d4c2b7f01c196df862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07076212ffc477132c9b41120f22b2b951daa536529346ed02811f68893e6c695a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0ccf8a4c6c27b20cbb5b6a00c1d23f73123d9d5755e7533171483776be796e11f88fd0de846c38ea0cff862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -421,8 +556,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc155bf2a126127446fd5ac18b3593069ba25cc12d7c190a14e66ae72c6ce3680",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc8dd0b66af17afb317b1f9e152d511cfcec7ec6deed72009976bd53020caec46",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182458c9680",
@@ -477,10 +612,10 @@
             }
         }
     },
-    "LoopDelegateCallsDepthThenRevert_d0g0v0_Metropolis" : {
+    "LoopDelegateCallsDepthThenRevert_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/LoopDelegateCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -491,19 +626,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x13a00e",
-                    "hash" : "0x697ab6995920f38b463d997a2051be02b0e80cf772a3206ceb59f5feaa640d03",
-                    "mixHash" : "0x1565ba778a50bf5f08778428d70b2b45f9ba2e181ea9a665f61df9f18e65274f",
-                    "nonce" : "0xa2fa7f707d854e2c",
+                    "gasUsed" : "0x989680",
+                    "hash" : "0xec6adb5912c5d641e56d4a3ec1e1cf687760c17505abc9890260e0bff132785b",
+                    "mixHash" : "0xfaed5703bcb1b9910d72182ca46d31aba313cca72fa4af3ac0dd6e39679fad31",
+                    "nonce" : "0xc8fb8570ba5dd1c3",
                     "number" : "0x01",
                     "parentHash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
-                    "receiptTrie" : "0x32379353f2ffb1b0c728e8c7f25c4959de893c529ffdb32f461464ba685e326b",
-                    "stateRoot" : "0xcbacc835a51149abaeec1ecb75b920ad6f8ec58f4a2a9ee781011c2369e39d0e",
+                    "receiptTrie" : "0x272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50",
+                    "stateRoot" : "0x7076212ffc477132c9b41120f22b2b951daa536529346ed02811f68893e6c695",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cbacc835a51149abaeec1ecb75b920ad6f8ec58f4a2a9ee781011c2369e39d0ea0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda032379353f2ffb1b0c728e8c7f25c4959de893c529ffdb32f461464ba685e326bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a01565ba778a50bf5f08778428d70b2b45f9ba2e181ea9a665f61df9f18e65274f88a2fa7f707d854e2cf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07076212ffc477132c9b41120f22b2b951daa536529346ed02811f68893e6c695a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0faed5703bcb1b9910d72182ca46d31aba313cca72fa4af3ac0dd6e39679fad3188c8fb8570ba5dd1c3f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -540,18 +675,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x697ab6995920f38b463d997a2051be02b0e80cf772a3206ceb59f5feaa640d03",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xec6adb5912c5d641e56d4a3ec1e1cf687760c17505abc9890260e0bff132785b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824507a00e",
+                "balance" : "0x45639182458c9680",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -562,11 +690,10 @@
                 "code" : "0x600160005401600055600060006000600073b0000000000000000000000000000000000000005af4",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0xd2"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4916ff2",
+                "balance" : "0xe8d40c7980",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {