1 files changed, 178 insertions, 59 deletions
diff --git a/BlockchainTests/GeneralStateTests/stRandom/randomStatetest417_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRandom/randomStatetest417_d0g0v0.json
index d5f39777e..8d1308aef 100644
--- a/BlockchainTests/GeneralStateTests/stRandom/randomStatetest417_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRandom/randomStatetest417_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest417_d0g0v0_EIP150" : {
+    "randomStatetest417_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/randomStatetest417_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011f5a",
-                    "hash" : "0x83a69012f488e6f5ed6a7ce1b803d07fdadbe54eb92a91d9909f7b8177bec51f",
-                    "mixHash" : "0xf0dca06c501d22ca1fe8dc58be03000e00df2fc8770ecd76b34a744c1c619738",
-                    "nonce" : "0x19fb9f3fbba16037",
+                    "hash" : "0x37b4e161e157cca728802031b92e5c4f9e9023fdabe777065503cb56ffd759ee",
+                    "mixHash" : "0x65b7b057149e2b4bd136a4393e181b4b61e6e5f7577ef0fa5eb0893064bbbcf9",
+                    "nonce" : "0xa3f7ae51e0b83884",
                     "number" : "0x01",
                     "parentHash" : "0x6d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917",
-                    "receiptTrie" : "0xb03a0ce4de7e2a9c5d1e501b28904ff47d54238f6b679d99f2f26622c317ef32",
-                    "stateRoot" : "0xd0dd15d996604590529d2d0e46fcc62ce2cff94835002e0863240d279754ec3a",
+                    "receiptTrie" : "0xfe12708d092eaab0adf750df9900feddf9a82b89f96f41d71cf690762307244f",
+                    "stateRoot" : "0xe0acb43fd8e308ed056f3a831cd99a99a4f28de0245091c904b49be60bc2c1a0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda06d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d0dd15d996604590529d2d0e46fcc62ce2cff94835002e0863240d279754ec3aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b03a0ce4de7e2a9c5d1e501b28904ff47d54238f6b679d99f2f26622c317ef32b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f5a8203e880a0f0dca06c501d22ca1fe8dc58be03000e00df2fc8770ecd76b34a744c1c6197388819fb9f3fbba16037f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda06d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e0acb43fd8e308ed056f3a831cd99a99a4f28de0245091c904b49be60bc2c1a0a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0fe12708d092eaab0adf750df9900feddf9a82b89f96f41d71cf690762307244fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f5a8203e880a065b7b057149e2b4bd136a4393e181b4b61e6e5f7577ef0fa5eb0893064bbbcf988a3f7ae51e0b83884f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07a19d8d4bbb2fa6d87f512b9baa962b5e31205c33372ab7533ac323be56dba79a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83a69012f488e6f5ed6a7ce1b803d07fdadbe54eb92a91d9909f7b8177bec51f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x37b4e161e157cca728802031b92e5c4f9e9023fdabe777065503cb56ffd759ee",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4343424344444242f26d69",
@@ -111,10 +118,10 @@
             }
         }
     },
-    "randomStatetest417_d0g0v0_EIP158" : {
+    "randomStatetest417_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/randomStatetest417_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -126,9 +133,128 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011f5a",
-                    "hash" : "0x35be51ad017538bc883275b30b3155ee27d9a3f03d34d470cc7192e1be8ba32b",
-                    "mixHash" : "0xfc329287b492ab37bdf1b45c3e5621deb6a4014d48e92c9dbe84fbe811c4d97d",
-                    "nonce" : "0x998d0a5454a55ce2",
+                    "hash" : "0xab9add033985cb7bf0eba5d5efaf1c2b3bfc30571f06669e60cc33b40b534967",
+                    "mixHash" : "0x053821f05bd80a945a0ad095ae87d211c1fbfe7f0670fedd6fc4e34dab70c493",
+                    "nonce" : "0x1270687bf8096b9d",
+                    "number" : "0x01",
+                    "parentHash" : "0x6d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917",
+                    "receiptTrie" : "0xfe12708d092eaab0adf750df9900feddf9a82b89f96f41d71cf690762307244f",
+                    "stateRoot" : "0xe0acb43fd8e308ed056f3a831cd99a99a4f28de0245091c904b49be60bc2c1a0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90268f901fda06d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e0acb43fd8e308ed056f3a831cd99a99a4f28de0245091c904b49be60bc2c1a0a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0fe12708d092eaab0adf750df9900feddf9a82b89f96f41d71cf690762307244fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f5a8203e880a0053821f05bd80a945a0ad095ae87d211c1fbfe7f0670fedd6fc4e34dab70c493881270687bf8096b9df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0x6d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7a19d8d4bbb2fa6d87f512b9baa962b5e31205c33372ab7533ac323be56dba79",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07a19d8d4bbb2fa6d87f512b9baa962b5e31205c33372ab7533ac323be56dba79a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xab9add033985cb7bf0eba5d5efaf1c2b3bfc30571f06669e60cc33b40b534967",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x4343424344444242f26d69",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f51f88",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7615a06",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x4343424344444242f26d69",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest417_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRandom/randomStatetest417_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x011f5a",
+                    "hash" : "0x94bc2e51001203277fdadb514102dd6af790bfe31dc990815c09b838de24a22f",
+                    "mixHash" : "0xf15cca4372834a6f251c4e5ec1822eb4ef2609bb7fc4cc14772be0e7371ce8c9",
+                    "nonce" : "0x9e83e07c8f8fe79b",
                     "number" : "0x01",
                     "parentHash" : "0x6d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917",
                     "receiptTrie" : "0xb03a0ce4de7e2a9c5d1e501b28904ff47d54238f6b679d99f2f26622c317ef32",
@@ -137,7 +263,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda06d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d0dd15d996604590529d2d0e46fcc62ce2cff94835002e0863240d279754ec3aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b03a0ce4de7e2a9c5d1e501b28904ff47d54238f6b679d99f2f26622c317ef32b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f5a8203e880a0fc329287b492ab37bdf1b45c3e5621deb6a4014d48e92c9dbe84fbe811c4d97d88998d0a5454a55ce2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda06d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d0dd15d996604590529d2d0e46fcc62ce2cff94835002e0863240d279754ec3aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b03a0ce4de7e2a9c5d1e501b28904ff47d54238f6b679d99f2f26622c317ef32b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f5a8203e880a0f15cca4372834a6f251c4e5ec1822eb4ef2609bb7fc4cc14772be0e7371ce8c9889e83e07c8f8fe79bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,8 +300,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07a19d8d4bbb2fa6d87f512b9baa962b5e31205c33372ab7533ac323be56dba79a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x35be51ad017538bc883275b30b3155ee27d9a3f03d34d470cc7192e1be8ba32b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x94bc2e51001203277fdadb514102dd6af790bfe31dc990815c09b838de24a22f",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -223,10 +349,10 @@
             }
         }
     },
-    "randomStatetest417_d0g0v0_Frontier" : {
+    "randomStatetest417_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/randomStatetest417_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -237,19 +363,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x011cc6",
-                    "hash" : "0x2a0c20c3038b7c06b9c4b5ebafbfdfe20c4dbd8a4ddda4e88df87e1592cb4ad6",
-                    "mixHash" : "0x6b65e683d46d4d5d1d3f3f0eda55690f86153558cda59c51eafcc828b6197ed3",
-                    "nonce" : "0x4b3054b488d927ee",
+                    "gasUsed" : "0x011f5a",
+                    "hash" : "0x4818848b93eb5d15170c40308913a1261ed5c6bd0dc80d3a4c2edd66f90f15a0",
+                    "mixHash" : "0x6e7128cb8465427ddc7cb649d78b756b24495a49e761e5ffa4f6a03b20006fba",
+                    "nonce" : "0xef542852652ae848",
                     "number" : "0x01",
                     "parentHash" : "0x6d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917",
-                    "receiptTrie" : "0xf88afb893413b76015261459910047963316b3eb097a96dc32aad6fd4f4a6ac0",
-                    "stateRoot" : "0x31bc1b05331e8bb23d18f757c63b3387efb80c9a37781a0aa71b29175aaa0973",
+                    "receiptTrie" : "0xb03a0ce4de7e2a9c5d1e501b28904ff47d54238f6b679d99f2f26622c317ef32",
+                    "stateRoot" : "0xd0dd15d996604590529d2d0e46fcc62ce2cff94835002e0863240d279754ec3a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda06d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a031bc1b05331e8bb23d18f757c63b3387efb80c9a37781a0aa71b29175aaa0973a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f88afb893413b76015261459910047963316b3eb097a96dc32aad6fd4f4a6ac0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011cc68203e880a06b65e683d46d4d5d1d3f3f0eda55690f86153558cda59c51eafcc828b6197ed3884b3054b488d927eef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda06d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d0dd15d996604590529d2d0e46fcc62ce2cff94835002e0863240d279754ec3aa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0b03a0ce4de7e2a9c5d1e501b28904ff47d54238f6b679d99f2f26622c317ef32b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f5a8203e880a06e7128cb8465427ddc7cb649d78b756b24495a49e761e5ffa4f6a03b20006fba88ef542852652ae848f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -286,8 +412,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07a19d8d4bbb2fa6d87f512b9baa962b5e31205c33372ab7533ac323be56dba79a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a0c20c3038b7c06b9c4b5ebafbfdfe20c4dbd8a4ddda4e88df87e1592cb4ad6",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4818848b93eb5d15170c40308913a1261ed5c6bd0dc80d3a4c2edd66f90f15a0",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -297,14 +423,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f51cf4",
+                "balance" : "0x4563918244f51f88",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7615c9a",
+                "balance" : "0x0de0b6b3a7615a06",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,10 +461,10 @@
             }
         }
     },
-    "randomStatetest417_d0g0v0_Homestead" : {
+    "randomStatetest417_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/randomStatetest417_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -350,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011cc6",
-                    "hash" : "0x3bc9b26dbcb01b66b85a032741e3668be029873f1b910d08bfb2d6a8aae01474",
-                    "mixHash" : "0xc28cbdfbc5b8b665e936c523ec4555cee6bfc00b56595ce22c3fdc3a232be4a7",
-                    "nonce" : "0xce989142ff7829a3",
+                    "hash" : "0xdcf93b7632d4d31584997a781100a0169b331340144127d5cd5cc75d1236bfc7",
+                    "mixHash" : "0x4a59b97130230992856cf736a34e345af67fa71ce321463f4b8c56913be91681",
+                    "nonce" : "0x8aa41b1c702eb638",
                     "number" : "0x01",
                     "parentHash" : "0x6d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917",
                     "receiptTrie" : "0xf88afb893413b76015261459910047963316b3eb097a96dc32aad6fd4f4a6ac0",
@@ -361,7 +487,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda06d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a031bc1b05331e8bb23d18f757c63b3387efb80c9a37781a0aa71b29175aaa0973a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f88afb893413b76015261459910047963316b3eb097a96dc32aad6fd4f4a6ac0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011cc68203e880a0c28cbdfbc5b8b665e936c523ec4555cee6bfc00b56595ce22c3fdc3a232be4a788ce989142ff7829a3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda06d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a031bc1b05331e8bb23d18f757c63b3387efb80c9a37781a0aa71b29175aaa0973a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f88afb893413b76015261459910047963316b3eb097a96dc32aad6fd4f4a6ac0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011cc68203e880a04a59b97130230992856cf736a34e345af67fa71ce321463f4b8c56913be91681888aa41b1c702eb638f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -398,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07a19d8d4bbb2fa6d87f512b9baa962b5e31205c33372ab7533ac323be56dba79a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3bc9b26dbcb01b66b85a032741e3668be029873f1b910d08bfb2d6a8aae01474",
-        "network" : "Homestead",
+        "lastblockhash" : "0xdcf93b7632d4d31584997a781100a0169b331340144127d5cd5cc75d1236bfc7",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -447,10 +573,10 @@
             }
         }
     },
-    "randomStatetest417_d0g0v0_Metropolis" : {
+    "randomStatetest417_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/stRandom/randomStatetest417_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -461,19 +587,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x011f5a",
-                    "hash" : "0xeb544de3cb2fc2a4ed5415ef3b468bd49c95c47642d29b3716a36f1498645d16",
-                    "mixHash" : "0xa04a324f03bd7a6019fd7243f6bfde83d74c6152463a3b72b843ff9109653b04",
-                    "nonce" : "0x76aecab333cfbe48",
+                    "gasUsed" : "0x011cc6",
+                    "hash" : "0x7f1ca651cfb5e83e8ec4c6d79ecd6215e4174fe4ac1f6f1d661235a980d5c5e5",
+                    "mixHash" : "0x3390df2a88cf312a587b10149fea4f9259416598bb879551b015b19221829cb4",
+                    "nonce" : "0x2a7979504cac0f73",
                     "number" : "0x01",
                     "parentHash" : "0x6d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917",
-                    "receiptTrie" : "0xfe12708d092eaab0adf750df9900feddf9a82b89f96f41d71cf690762307244f",
-                    "stateRoot" : "0xe0acb43fd8e308ed056f3a831cd99a99a4f28de0245091c904b49be60bc2c1a0",
+                    "receiptTrie" : "0xf88afb893413b76015261459910047963316b3eb097a96dc32aad6fd4f4a6ac0",
+                    "stateRoot" : "0x31bc1b05331e8bb23d18f757c63b3387efb80c9a37781a0aa71b29175aaa0973",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda06d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e0acb43fd8e308ed056f3a831cd99a99a4f28de0245091c904b49be60bc2c1a0a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0fe12708d092eaab0adf750df9900feddf9a82b89f96f41d71cf690762307244fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f5a8203e880a0a04a324f03bd7a6019fd7243f6bfde83d74c6152463a3b72b843ff9109653b048876aecab333cfbe48f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda06d8ce964789b164a69947f3df04765ee3979bc3b7d55a4931b2bc88a0cf7a917a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a031bc1b05331e8bb23d18f757c63b3387efb80c9a37781a0aa71b29175aaa0973a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f88afb893413b76015261459910047963316b3eb097a96dc32aad6fd4f4a6ac0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011cc68203e880a03390df2a88cf312a587b10149fea4f9259416598bb879551b015b19221829cb4882a7979504cac0f73f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -510,16 +636,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a07a19d8d4bbb2fa6d87f512b9baa962b5e31205c33372ab7533ac323be56dba79a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeb544de3cb2fc2a4ed5415ef3b468bd49c95c47642d29b3716a36f1498645d16",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7f1ca651cfb5e83e8ec4c6d79ecd6215e4174fe4ac1f6f1d661235a980d5c5e5",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4343424344444242f26d69",
@@ -528,14 +647,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f51f88",
+                "balance" : "0x4563918244f51cf4",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7615a06",
+                "balance" : "0x0de0b6b3a7615c9a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {