1 files changed, 132 insertions, 45 deletions
diff --git a/BlockchainTests/GeneralStateTests/stTransactionTest/RefundOverflow2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stTransactionTest/RefundOverflow2_d0g0v0.json
index a16fbf4c9..737a44fe0 100644
--- a/BlockchainTests/GeneralStateTests/stTransactionTest/RefundOverflow2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stTransactionTest/RefundOverflow2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RefundOverflow2_d0g0v0_EIP150" : {
+    "RefundOverflow2_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/stTransactionTest/RefundOverflow2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x00",
-                    "hash" : "0x028ebedce47c0b8b7bd9b367d3690509190bc2e13a0d7bef2c22b5398f6e0590",
-                    "mixHash" : "0x8a40b0a106cdde6a892785dc93b74b2de41b22a47b16263ed6b3880c8bdecc54",
-                    "nonce" : "0x9fc6d32b28effcaa",
+                    "hash" : "0x4d7dce033a744aea2743537c1e62d0b0fde39804bca4b6752152c8d42cc0c75c",
+                    "mixHash" : "0xb7ddc231a7d932de194804cf827e38701135940f998bd9df36badb330ca8d10b",
+                    "nonce" : "0x1c03dee553854109",
                     "number" : "0x01",
                     "parentHash" : "0xeb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x25700a879cf655a851392ea5dd7e5e0b8153970f5f16403cf592175149b6b05a",
+                    "stateRoot" : "0xb9e2b5bdf89f5020c172f8719fc668384e661fcf60de665ae46ba6815b14e446",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fff901faa0eb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba025700a879cf655a851392ea5dd7e5e0b8153970f5f16403cf592175149b6b05aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff808203e880a08a40b0a106cdde6a892785dc93b74b2de41b22a47b16263ed6b3880c8bdecc54889fc6d32b28effcaac0c0",
+                "rlp" : "0xf901fff901faa0eb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b9e2b5bdf89f5020c172f8719fc668384e661fcf60de665ae46ba6815b14e446a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff808203e880a0b7ddc231a7d932de194804cf827e38701135940f998bd9df36badb330ca8d10b881c03dee553854109c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba050e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x028ebedce47c0b8b7bd9b367d3690509190bc2e13a0d7bef2c22b5398f6e0590",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4d7dce033a744aea2743537c1e62d0b0fde39804bca4b6752152c8d42cc0c75c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0190",
                 "code" : "",
@@ -79,10 +86,10 @@
             }
         }
     },
-    "RefundOverflow2_d0g0v0_EIP158" : {
+    "RefundOverflow2_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/stTransactionTest/RefundOverflow2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -94,18 +101,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x00",
-                    "hash" : "0xcb216a89715eec46a594aec1f42695d93fbcc86fe7f8850358ec032616841fdd",
-                    "mixHash" : "0xa59c54f3d3dad64581bc103ebf4c27ffc9d454261af18949da56c6b135a41176",
-                    "nonce" : "0x05843a4dc1a0cd41",
+                    "hash" : "0xcf5a72b675c7588965f176b2d0cc894c19cd2d91b19c2523b16240c94a86e2d5",
+                    "mixHash" : "0x90e940d9ad447c9aaf1d7af0725d8d241d4ee514eba5880b1323d36171cbbb60",
+                    "nonce" : "0x60a3ee38ff926227",
                     "number" : "0x01",
                     "parentHash" : "0xeb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x25700a879cf655a851392ea5dd7e5e0b8153970f5f16403cf592175149b6b05a",
+                    "stateRoot" : "0xb9e2b5bdf89f5020c172f8719fc668384e661fcf60de665ae46ba6815b14e446",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fff901faa0eb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba025700a879cf655a851392ea5dd7e5e0b8153970f5f16403cf592175149b6b05aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff808203e880a0a59c54f3d3dad64581bc103ebf4c27ffc9d454261af18949da56c6b135a411768805843a4dc1a0cd41c0c0",
+                "rlp" : "0xf901fff901faa0eb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b9e2b5bdf89f5020c172f8719fc668384e661fcf60de665ae46ba6815b14e446a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff808203e880a090e940d9ad447c9aaf1d7af0725d8d241d4ee514eba5880b1323d36171cbbb608860a3ee38ff926227c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,9 +138,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba050e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb216a89715eec46a594aec1f42695d93fbcc86fe7f8850358ec032616841fdd",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcf5a72b675c7588965f176b2d0cc894c19cd2d91b19c2523b16240c94a86e2d5",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0190",
                 "code" : "",
@@ -159,10 +173,10 @@
             }
         }
     },
-    "RefundOverflow2_d0g0v0_Frontier" : {
+    "RefundOverflow2_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/stTransactionTest/RefundOverflow2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -174,9 +188,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x00",
-                    "hash" : "0x54d698c63393a57d770bfe5c5406d729387b5c9ab63521a140acfda8b5c72c76",
-                    "mixHash" : "0x096d3919b246c45d5356092efaab68ffba1e372cdbc9e7cd293608cf965c77b3",
-                    "nonce" : "0x0c12fcf760ddb63a",
+                    "hash" : "0xd3e5af187d0deba7a8a85ce5eb311bba1fa6f0be528d2387644475ba0a02da6a",
+                    "mixHash" : "0x07df7e54c33eef3169421d8aa972117214ded303f4e1125fbe2409da658270e1",
+                    "nonce" : "0xfacfca04f7d1dd6f",
                     "number" : "0x01",
                     "parentHash" : "0xeb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -185,7 +199,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fff901faa0eb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba025700a879cf655a851392ea5dd7e5e0b8153970f5f16403cf592175149b6b05aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff808203e880a0096d3919b246c45d5356092efaab68ffba1e372cdbc9e7cd293608cf965c77b3880c12fcf760ddb63ac0c0",
+                "rlp" : "0xf901fff901faa0eb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba025700a879cf655a851392ea5dd7e5e0b8153970f5f16403cf592175149b6b05aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff808203e880a007df7e54c33eef3169421d8aa972117214ded303f4e1125fbe2409da658270e188facfca04f7d1dd6fc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -211,8 +225,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba050e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54d698c63393a57d770bfe5c5406d729387b5c9ab63521a140acfda8b5c72c76",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd3e5af187d0deba7a8a85ce5eb311bba1fa6f0be528d2387644475ba0a02da6a",
+        "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0190",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "RefundOverflow2_d0g0v0_Homestead" : {
+    "RefundOverflow2_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/stTransactionTest/RefundOverflow2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -254,9 +268,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x00",
-                    "hash" : "0x95d7581e16ea656cf8f939abfcd0ae010a03567b1f245069d6ba3bbe61fde60a",
-                    "mixHash" : "0xc50e329b59e4ee1e2518e729d4c83daeab8ca422fba25dcca95baa3d5e09af8a",
-                    "nonce" : "0xa582fcecc6b3e58f",
+                    "hash" : "0x5689f9fcd11670142cc72e17e95152271edd76072b5c3c9da017123f6c2cfaf2",
+                    "mixHash" : "0x061041018169fa6b678c644f7601cc740359eda406f380e08c1632791a3d287f",
+                    "nonce" : "0xb90f35bf2b313789",
                     "number" : "0x01",
                     "parentHash" : "0xeb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -265,7 +279,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fff901faa0eb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba025700a879cf655a851392ea5dd7e5e0b8153970f5f16403cf592175149b6b05aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff808203e880a0c50e329b59e4ee1e2518e729d4c83daeab8ca422fba25dcca95baa3d5e09af8a88a582fcecc6b3e58fc0c0",
+                "rlp" : "0xf901fff901faa0eb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba025700a879cf655a851392ea5dd7e5e0b8153970f5f16403cf592175149b6b05aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff808203e880a0061041018169fa6b678c644f7601cc740359eda406f380e08c1632791a3d287f88b90f35bf2b313789c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -291,8 +305,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba050e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95d7581e16ea656cf8f939abfcd0ae010a03567b1f245069d6ba3bbe61fde60a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5689f9fcd11670142cc72e17e95152271edd76072b5c3c9da017123f6c2cfaf2",
+        "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0190",
@@ -319,10 +333,10 @@
             }
         }
     },
-    "RefundOverflow2_d0g0v0_Metropolis" : {
+    "RefundOverflow2_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/stTransactionTest/RefundOverflow2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -334,18 +348,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x00",
-                    "hash" : "0xcbf6ee9a734fc14790180e09a79730820c10955a4250841f5503e9097616d3e3",
-                    "mixHash" : "0x3f5c49eb4c663d1e6c67ee703f1739d3c2e18f3973e36b3a872cf4b94029d77d",
-                    "nonce" : "0x8b42e7b7556b65e7",
+                    "hash" : "0xabb79d2bfb6020ce3f270c8a423c293c006400ee363e9aaee34dfc7d3b1fa75e",
+                    "mixHash" : "0xe88106114c4dabfd73ef0478a80ac91935299cbfadcf081138d28474f0a6445f",
+                    "nonce" : "0x372d8d88533c96a8",
                     "number" : "0x01",
                     "parentHash" : "0xeb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xb9e2b5bdf89f5020c172f8719fc668384e661fcf60de665ae46ba6815b14e446",
+                    "stateRoot" : "0x25700a879cf655a851392ea5dd7e5e0b8153970f5f16403cf592175149b6b05a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fff901faa0eb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b9e2b5bdf89f5020c172f8719fc668384e661fcf60de665ae46ba6815b14e446a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff808203e880a03f5c49eb4c663d1e6c67ee703f1739d3c2e18f3973e36b3a872cf4b94029d77d888b42e7b7556b65e7c0c0",
+                "rlp" : "0xf901fff901faa0eb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba025700a879cf655a851392ea5dd7e5e0b8153970f5f16403cf592175149b6b05aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff808203e880a0e88106114c4dabfd73ef0478a80ac91935299cbfadcf081138d28474f0a6445f88372d8d88533c96a8c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -371,16 +385,89 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba050e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcbf6ee9a734fc14790180e09a79730820c10955a4250841f5503e9097616d3e3",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xabb79d2bfb6020ce3f270c8a423c293c006400ee363e9aaee34dfc7d3b1fa75e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0190",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0190",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RefundOverflow2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stTransactionTest/RefundOverflow2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x61d47b1708cb545119dd3111ce2dc47bd801b2d1061c6e73e31f009e03194217",
+                    "mixHash" : "0x5a45fc366916d1a5a53ad78e94f2c20fb6fbea78a01e48b43de6760c49818aa1",
+                    "nonce" : "0x3572e897442233e8",
+                    "number" : "0x01",
+                    "parentHash" : "0xeb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x25700a879cf655a851392ea5dd7e5e0b8153970f5f16403cf592175149b6b05a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901fff901faa0eb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba025700a879cf655a851392ea5dd7e5e0b8153970f5f16403cf592175149b6b05aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff808203e880a05a45fc366916d1a5a53ad78e94f2c20fb6fbea78a01e48b43de6760c49818aa1883572e897442233e8c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0xeb2d1a89062f8dbbc2efcf205cbd80a160af83cbc54faf0a9ab577368b1f9ec5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba050e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x61d47b1708cb545119dd3111ce2dc47bd801b2d1061c6e73e31f009e03194217",
+        "network" : "Homestead",
+        "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0190",
                 "code" : "",