1 files changed, 167 insertions, 48 deletions
diff --git a/BlockchainTests/GeneralStateTests/stRandom/randomStatetest309_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRandom/randomStatetest309_d0g0v0.json
index f86976bbe..51a59ca22 100644
--- a/BlockchainTests/GeneralStateTests/stRandom/randomStatetest309_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRandom/randomStatetest309_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest309_d0g0v0_EIP150" : {
+    "randomStatetest309_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/stRandom/randomStatetest309_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x65e6",
-                    "hash" : "0xb637ca10b334eb1a036a1c470b57bdb83bfa3a10051c11a36b760dd218bfa46c",
-                    "mixHash" : "0x8ace22ba32f813fc90758b96b96f43585aa470ca3eb6272f25b8f8e69a763b02",
-                    "nonce" : "0x55d640c776315337",
+                    "hash" : "0x64a2714d904b54e78144f66847328093b7444c6023b48d2bc49baeeb36b9cf37",
+                    "mixHash" : "0xe714396687f5ca1d75fa18deba553770f1c1f91cc3a748e36d0a880e200afefc",
+                    "nonce" : "0x9363363cff6e8495",
                     "number" : "0x01",
                     "parentHash" : "0x45e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dc",
-                    "receiptTrie" : "0x36f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5",
-                    "stateRoot" : "0x4143c6f7a6b67f932cf7440adb78e471764c3279b1db346c64205d51cb3789f1",
+                    "receiptTrie" : "0x73b81f0731be4634719d24d89319e7f8574720e9c534c401297b27ef3caf75fe",
+                    "stateRoot" : "0x5ae0614fc0aa56590c5a5f5338924562fedf8cbac4e24146a5449e8d8022bdf4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca045e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04143c6f7a6b67f932cf7440adb78e471764c3279b1db346c64205d51cb3789f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa036f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8265e68203e880a08ace22ba32f813fc90758b96b96f43585aa470ca3eb6272f25b8f8e69a763b028855d640c776315337f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca045e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05ae0614fc0aa56590c5a5f5338924562fedf8cbac4e24146a5449e8d8022bdf4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa073b81f0731be4634719d24d89319e7f8574720e9c534c401297b27ef3caf75feb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8265e68203e880a0e714396687f5ca1d75fa18deba553770f1c1f91cc3a748e36d0a880e200afefc889363363cff6e8495f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a074798aa5d9378f349d60f2b5dc8b5295a06cb8a7b2f4db4d04e1d4c629fff71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb637ca10b334eb1a036a1c470b57bdb83bfa3a10051c11a36b760dd218bfa46c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x64a2714d904b54e78144f66847328093b7444c6023b48d2bc49baeeb36b9cf37",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x43454545085a55",
@@ -111,10 +118,10 @@
             }
         }
     },
-    "randomStatetest309_d0g0v0_EIP158" : {
+    "randomStatetest309_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/stRandom/randomStatetest309_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -126,18 +133,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x65e6",
-                    "hash" : "0x0b8dab345aade460b89120ea9be29c2eb59b7b8e28906b47591e4535bcb6fed6",
-                    "mixHash" : "0x1d556a86f125a85717ad0fd82a3ef8ac10e4b90dcf00465a6233e99e0edbea36",
-                    "nonce" : "0x954639d60b246d62",
+                    "hash" : "0x7fbd49cef7d6cfdd5a2c11a636bb71a4b2b79cf2d3af873170edbb99cd65d5e3",
+                    "mixHash" : "0xdf32525508451e174ed16a3463d49d933b3c89459f9731d13585687395307e37",
+                    "nonce" : "0x95cea813f3cd2d7f",
                     "number" : "0x01",
                     "parentHash" : "0x45e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dc",
-                    "receiptTrie" : "0x36f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5",
-                    "stateRoot" : "0x4143c6f7a6b67f932cf7440adb78e471764c3279b1db346c64205d51cb3789f1",
+                    "receiptTrie" : "0x73b81f0731be4634719d24d89319e7f8574720e9c534c401297b27ef3caf75fe",
+                    "stateRoot" : "0x5ae0614fc0aa56590c5a5f5338924562fedf8cbac4e24146a5449e8d8022bdf4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca045e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04143c6f7a6b67f932cf7440adb78e471764c3279b1db346c64205d51cb3789f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa036f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8265e68203e880a01d556a86f125a85717ad0fd82a3ef8ac10e4b90dcf00465a6233e99e0edbea3688954639d60b246d62f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca045e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05ae0614fc0aa56590c5a5f5338924562fedf8cbac4e24146a5449e8d8022bdf4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa073b81f0731be4634719d24d89319e7f8574720e9c534c401297b27ef3caf75feb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8265e68203e880a0df32525508451e174ed16a3463d49d933b3c89459f9731d13585687395307e378895cea813f3cd2d7ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,9 +181,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a074798aa5d9378f349d60f2b5dc8b5295a06cb8a7b2f4db4d04e1d4c629fff71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b8dab345aade460b89120ea9be29c2eb59b7b8e28906b47591e4535bcb6fed6",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7fbd49cef7d6cfdd5a2c11a636bb71a4b2b79cf2d3af873170edbb99cd65d5e3",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x43454545085a55",
@@ -223,10 +237,10 @@
             }
         }
     },
-    "randomStatetest309_d0g0v0_Frontier" : {
+    "randomStatetest309_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/stRandom/randomStatetest309_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,9 +252,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x65e6",
-                    "hash" : "0xcb5ac5b5c8a87f95ac20f7a3c1e026ab22e016fded7e58e27316130b4eba3ffc",
-                    "mixHash" : "0xd4e066267a7ccf42b16de43900532a2f2d4757d0fe052d7cd7aaf603d780a013",
-                    "nonce" : "0xfacdde28b99da9ef",
+                    "hash" : "0x1ae3b070b9cf4522c63b26c58972928123a6eed73e20dff672b7c69863da6ab2",
+                    "mixHash" : "0x54f25e568438a53d3c135cad23228ba9eb12274b40073bd7b56f9c159cf5bd14",
+                    "nonce" : "0xf47f21241ed134b8",
                     "number" : "0x01",
                     "parentHash" : "0x45e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dc",
                     "receiptTrie" : "0x36f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5",
@@ -249,7 +263,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca045e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04143c6f7a6b67f932cf7440adb78e471764c3279b1db346c64205d51cb3789f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa036f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8265e68203e880a0d4e066267a7ccf42b16de43900532a2f2d4757d0fe052d7cd7aaf603d780a01388facdde28b99da9eff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca045e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04143c6f7a6b67f932cf7440adb78e471764c3279b1db346c64205d51cb3789f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa036f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8265e68203e880a054f25e568438a53d3c135cad23228ba9eb12274b40073bd7b56f9c159cf5bd1488f47f21241ed134b8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -286,8 +300,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a074798aa5d9378f349d60f2b5dc8b5295a06cb8a7b2f4db4d04e1d4c629fff71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb5ac5b5c8a87f95ac20f7a3c1e026ab22e016fded7e58e27316130b4eba3ffc",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1ae3b070b9cf4522c63b26c58972928123a6eed73e20dff672b7c69863da6ab2",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -335,10 +349,10 @@
             }
         }
     },
-    "randomStatetest309_d0g0v0_Homestead" : {
+    "randomStatetest309_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/stRandom/randomStatetest309_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -350,9 +364,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x65e6",
-                    "hash" : "0xdc43710ec1f7ffa888bcc043c2b9ef2995afec9214297ce01c53b8b008a6f946",
-                    "mixHash" : "0x65cbcf395df0022944bb82948d1a32b68530e4896d1fe28b56b28fd3b19f1324",
-                    "nonce" : "0xa1d1ce5d91392e44",
+                    "hash" : "0xb9297c7e07e069cf2aef640225ff5c73bf630021d63cd6448692d985839757f7",
+                    "mixHash" : "0xf1ab4187c7dc7e63fa8bc4fe427b2ce5acc62305968b5bb67b21c86e0bd04e7a",
+                    "nonce" : "0x936c03ee2643d76a",
                     "number" : "0x01",
                     "parentHash" : "0x45e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dc",
                     "receiptTrie" : "0x36f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5",
@@ -361,7 +375,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca045e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04143c6f7a6b67f932cf7440adb78e471764c3279b1db346c64205d51cb3789f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa036f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8265e68203e880a065cbcf395df0022944bb82948d1a32b68530e4896d1fe28b56b28fd3b19f132488a1d1ce5d91392e44f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca045e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04143c6f7a6b67f932cf7440adb78e471764c3279b1db346c64205d51cb3789f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa036f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8265e68203e880a0f1ab4187c7dc7e63fa8bc4fe427b2ce5acc62305968b5bb67b21c86e0bd04e7a88936c03ee2643d76af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -398,8 +412,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a074798aa5d9378f349d60f2b5dc8b5295a06cb8a7b2f4db4d04e1d4c629fff71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc43710ec1f7ffa888bcc043c2b9ef2995afec9214297ce01c53b8b008a6f946",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb9297c7e07e069cf2aef640225ff5c73bf630021d63cd6448692d985839757f7",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "randomStatetest309_d0g0v0_Metropolis" : {
+    "randomStatetest309_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/stRandom/randomStatetest309_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,18 +476,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x65e6",
-                    "hash" : "0x0d14ebb8dc90982b95aed21370b579ce4e05ed668af38507bf0bd2ce64a4e3b9",
-                    "mixHash" : "0x2bc71adba0e61801feb9abba94e10772b19b0109297c53f933f2e6397eb74815",
-                    "nonce" : "0x8c0e5b1997d5aeb8",
+                    "hash" : "0x42f80f63e9cfb9bd8274601cad0c4b566b291e62123d160e6ea96ff9e1f74f4f",
+                    "mixHash" : "0x779c6d01210955ee7a47c88e4e653814af582c2a05a82acfb44c0381f289f60e",
+                    "nonce" : "0xb2b2d4ee71287960",
                     "number" : "0x01",
                     "parentHash" : "0x45e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dc",
-                    "receiptTrie" : "0x73b81f0731be4634719d24d89319e7f8574720e9c534c401297b27ef3caf75fe",
-                    "stateRoot" : "0x5ae0614fc0aa56590c5a5f5338924562fedf8cbac4e24146a5449e8d8022bdf4",
+                    "receiptTrie" : "0x36f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5",
+                    "stateRoot" : "0x4143c6f7a6b67f932cf7440adb78e471764c3279b1db346c64205d51cb3789f1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca045e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05ae0614fc0aa56590c5a5f5338924562fedf8cbac4e24146a5449e8d8022bdf4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa073b81f0731be4634719d24d89319e7f8574720e9c534c401297b27ef3caf75feb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8265e68203e880a02bc71adba0e61801feb9abba94e10772b19b0109297c53f933f2e6397eb74815888c0e5b1997d5aeb8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca045e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04143c6f7a6b67f932cf7440adb78e471764c3279b1db346c64205d51cb3789f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa036f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8265e68203e880a0779c6d01210955ee7a47c88e4e653814af582c2a05a82acfb44c0381f289f60e88b2b2d4ee71287960f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -510,16 +524,121 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a074798aa5d9378f349d60f2b5dc8b5295a06cb8a7b2f4db4d04e1d4c629fff71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d14ebb8dc90982b95aed21370b579ce4e05ed668af38507bf0bd2ce64a4e3b9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x42f80f63e9cfb9bd8274601cad0c4b566b291e62123d160e6ea96ff9e1f74f4f",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x43454545085a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f46614",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762137a",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x43454545085a55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest309_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRandom/randomStatetest309_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x65e6",
+                    "hash" : "0xe81eac68973a1689e7d7f9532d1421f3c353d6b27d5bb69668d5c9e9d74275b9",
+                    "mixHash" : "0x3e03619a009cb3e92158d41503f6597d598a5a6c16b7e4fe3637079f244634ed",
+                    "nonce" : "0x9ef9c94ae910a855",
+                    "number" : "0x01",
+                    "parentHash" : "0x45e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dc",
+                    "receiptTrie" : "0x36f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5",
+                    "stateRoot" : "0x4143c6f7a6b67f932cf7440adb78e471764c3279b1db346c64205d51cb3789f1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901fca045e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04143c6f7a6b67f932cf7440adb78e471764c3279b1db346c64205d51cb3789f1a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa036f15733e3ce4ea2a5d83e807dc531cae2af8db75f9ef53ef6f766788310c6f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8265e68203e880a03e03619a009cb3e92158d41503f6597d598a5a6c16b7e4fe3637079f244634ed889ef9c94ae910a855f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "transactions" : [
+                    {
+                        "data" : "0x42",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765",
+                        "s" : "0x78634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdff",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x45e39b1f9de1fffd584e0b7edb92918d9bed7b23dfcfcca41a9cfefaaaee66dc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x74798aa5d9378f349d60f2b5dc8b5295a06cb8a7b2f4db4d04e1d4c629fff71e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a074798aa5d9378f349d60f2b5dc8b5295a06cb8a7b2f4db4d04e1d4c629fff71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe81eac68973a1689e7d7f9532d1421f3c353d6b27d5bb69668d5c9e9d74275b9",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x43454545085a55",