1 files changed, 179 insertions, 59 deletions
diff --git a/BlockchainTests/GeneralStateTests/stRandom/randomStatetest228_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRandom/randomStatetest228_d0g0v0.json
index bb9719a31..fbc59f395 100644
--- a/BlockchainTests/GeneralStateTests/stRandom/randomStatetest228_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRandom/randomStatetest228_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest228_d0g0v0_EIP150" : {
+    "randomStatetest228_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/randomStatetest228_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa400",
-                    "hash" : "0x5cf09c847261884231f2f8f2f672cffe38378c5a563a1f7e04114f0e34ccbc7c",
-                    "mixHash" : "0xce88554f6f0d32eabd91255654772842a5a25f84184303f48406d48ea8cee647",
-                    "nonce" : "0xe4cf0888d571a17f",
+                    "hash" : "0x980d10e468591f02656096e11894c04a89e44035b371e49d53f83dbf01c3f940",
+                    "mixHash" : "0xd999f9c622ebc5e8aaaf705e451984901599c2f688baf3c3371dfe9741666f83",
+                    "nonce" : "0xddf8c56dfaa4551a",
                     "number" : "0x01",
                     "parentHash" : "0x7cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0",
-                    "receiptTrie" : "0x2733182d1a2450f267c83335fc9cf88cba5fac70bb34f273c2f221d08b7d2904",
-                    "stateRoot" : "0x454d636c8d7bda0a9d69e7d157f926a4886bbaebd54b2bca843cf99c51ab799e",
+                    "receiptTrie" : "0xa82f3c72a9fbd8c9a643330d6e9ed7b8046da2d887f51fdec3afa4ba7a0f5a6c",
+                    "stateRoot" : "0xfb8215ae2c94f57466564288b59fe0cabd23a2f6b993f3519f945daf5ca27db4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca07cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0454d636c8d7bda0a9d69e7d157f926a4886bbaebd54b2bca843cf99c51ab799ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02733182d1a2450f267c83335fc9cf88cba5fac70bb34f273c2f221d08b7d2904b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4008203e880a0ce88554f6f0d32eabd91255654772842a5a25f84184303f48406d48ea8cee64788e4cf0888d571a17ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca07cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fb8215ae2c94f57466564288b59fe0cabd23a2f6b993f3519f945daf5ca27db4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a82f3c72a9fbd8c9a643330d6e9ed7b8046da2d887f51fdec3afa4ba7a0f5a6cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4008203e880a0d999f9c622ebc5e8aaaf705e451984901599c2f688baf3c3371dfe9741666f8388ddf8c56dfaa4551af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c85ba8e237f0a2e964b38f17563c9dcd4da89fd5bf1b17be601ac54a8862dda1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5cf09c847261884231f2f8f2f672cffe38378c5a563a1f7e04114f0e34ccbc7c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x980d10e468591f02656096e11894c04a89e44035b371e49d53f83dbf01c3f940",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x41434543454541443b5455",
@@ -112,10 +119,130 @@
             }
         }
     },
-    "randomStatetest228_d0g0v0_EIP158" : {
+    "randomStatetest228_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRandom/randomStatetest228_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xa400",
+                    "hash" : "0xde8580abc64d1b80b4aeed166d7e09347ff42d993135de9dbca7c0fc322c3c14",
+                    "mixHash" : "0xbf8cdc9110038d41629c1019d8fb03ddbcabc91e884a647a1eeb01dd7e5fce16",
+                    "nonce" : "0xd7f25a7112cd4a7e",
+                    "number" : "0x01",
+                    "parentHash" : "0x7cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0",
+                    "receiptTrie" : "0xa82f3c72a9fbd8c9a643330d6e9ed7b8046da2d887f51fdec3afa4ba7a0f5a6c",
+                    "stateRoot" : "0xfb8215ae2c94f57466564288b59fe0cabd23a2f6b993f3519f945daf5ca27db4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901fca07cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fb8215ae2c94f57466564288b59fe0cabd23a2f6b993f3519f945daf5ca27db4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a82f3c72a9fbd8c9a643330d6e9ed7b8046da2d887f51fdec3afa4ba7a0f5a6cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4008203e880a0bf8cdc9110038d41629c1019d8fb03ddbcabc91e884a647a1eeb01dd7e5fce1688d7f25a7112cd4a7ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0x7cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc85ba8e237f0a2e964b38f17563c9dcd4da89fd5bf1b17be601ac54a8862dda1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c85ba8e237f0a2e964b38f17563c9dcd4da89fd5bf1b17be601ac54a8862dda1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xde8580abc64d1b80b4aeed166d7e09347ff42d993135de9dbca7c0fc322c3c14",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x41434543454541443b5455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5"
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f4a42e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d560",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x41434543454541443b5455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest228_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/randomStatetest228_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,9 +254,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa400",
-                    "hash" : "0x0a8c1863c8d4af26bf4b5d56355b269f7df81cfad0e941b3ac0ee76b512ebbe7",
-                    "mixHash" : "0x6501f490433259fe9644b67b730402d76369a04fa13489cdc1e73a344f5e7e4d",
-                    "nonce" : "0x9cdd5fd93d78535b",
+                    "hash" : "0x1677251a1bc80dfa584779c6d58bd48304f808d8ccaead0f92ce0f4df5f811f5",
+                    "mixHash" : "0x90da675b64fe82d04aec293879a53bca5fc017611cc3d78fe3f4d071e02553d3",
+                    "nonce" : "0xe7e7dd936568e8da",
                     "number" : "0x01",
                     "parentHash" : "0x7cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0",
                     "receiptTrie" : "0x2733182d1a2450f267c83335fc9cf88cba5fac70bb34f273c2f221d08b7d2904",
@@ -138,7 +265,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca07cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0454d636c8d7bda0a9d69e7d157f926a4886bbaebd54b2bca843cf99c51ab799ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02733182d1a2450f267c83335fc9cf88cba5fac70bb34f273c2f221d08b7d2904b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4008203e880a06501f490433259fe9644b67b730402d76369a04fa13489cdc1e73a344f5e7e4d889cdd5fd93d78535bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca07cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0454d636c8d7bda0a9d69e7d157f926a4886bbaebd54b2bca843cf99c51ab799ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02733182d1a2450f267c83335fc9cf88cba5fac70bb34f273c2f221d08b7d2904b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4008203e880a090da675b64fe82d04aec293879a53bca5fc017611cc3d78fe3f4d071e02553d388e7e7dd936568e8daf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c85ba8e237f0a2e964b38f17563c9dcd4da89fd5bf1b17be601ac54a8862dda1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0a8c1863c8d4af26bf4b5d56355b269f7df81cfad0e941b3ac0ee76b512ebbe7",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1677251a1bc80dfa584779c6d58bd48304f808d8ccaead0f92ce0f4df5f811f5",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -225,10 +352,10 @@
             }
         }
     },
-    "randomStatetest228_d0g0v0_Frontier" : {
+    "randomStatetest228_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/randomStatetest228_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,19 +366,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa0c2",
-                    "hash" : "0xb930f6c39e56ff26bc7356677de8c963220c7184de2f80f35c52b6b7962104b7",
-                    "mixHash" : "0x7fade636b363e465001e63ee4cc9fc089005efd19511d6979d88f10ec96d6c1a",
-                    "nonce" : "0xdfd223f83923e336",
+                    "gasUsed" : "0xa400",
+                    "hash" : "0x77b30022e8846dbce01ad43d7a056a0b41df349749b771f5cf171f4d61da01c7",
+                    "mixHash" : "0x0ca4f67c779e96c317d1aca36541d0207a54f757a71c59cb5725e645652fe0de",
+                    "nonce" : "0x922a8f9baddc39c0",
                     "number" : "0x01",
                     "parentHash" : "0x7cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0",
-                    "receiptTrie" : "0x650f5efae76d8b51ed198933e62bcba1368707aa2abcebde58283559ad19e105",
-                    "stateRoot" : "0x11123d34b41e7a0c50aeb89f95cef8148f6d5338161eb89a8797284cb1cf4dba",
+                    "receiptTrie" : "0x2733182d1a2450f267c83335fc9cf88cba5fac70bb34f273c2f221d08b7d2904",
+                    "stateRoot" : "0x454d636c8d7bda0a9d69e7d157f926a4886bbaebd54b2bca843cf99c51ab799e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca07cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a011123d34b41e7a0c50aeb89f95cef8148f6d5338161eb89a8797284cb1cf4dbaa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0650f5efae76d8b51ed198933e62bcba1368707aa2abcebde58283559ad19e105b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0c28203e880a07fade636b363e465001e63ee4cc9fc089005efd19511d6979d88f10ec96d6c1a88dfd223f83923e336f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca07cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0454d636c8d7bda0a9d69e7d157f926a4886bbaebd54b2bca843cf99c51ab799ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02733182d1a2450f267c83335fc9cf88cba5fac70bb34f273c2f221d08b7d2904b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4008203e880a00ca4f67c779e96c317d1aca36541d0207a54f757a71c59cb5725e645652fe0de88922a8f9baddc39c0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -288,8 +415,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c85ba8e237f0a2e964b38f17563c9dcd4da89fd5bf1b17be601ac54a8862dda1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb930f6c39e56ff26bc7356677de8c963220c7184de2f80f35c52b6b7962104b7",
-        "network" : "Frontier",
+        "lastblockhash" : "0x77b30022e8846dbce01ad43d7a056a0b41df349749b771f5cf171f4d61da01c7",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -300,14 +427,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a0f0",
+                "balance" : "0x4563918244f4a42e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d89e",
+                "balance" : "0x0de0b6b3a761d560",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -338,10 +465,10 @@
             }
         }
     },
-    "randomStatetest228_d0g0v0_Homestead" : {
+    "randomStatetest228_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/randomStatetest228_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -353,9 +480,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0c2",
-                    "hash" : "0x5bdc06f0d9af465699642312d93a2ce409efd3c1ea3b6d48bf9e15613b7bbe6b",
-                    "mixHash" : "0xf5636c03183ee28aa372bf22304e9c2fb06104d3fe1497c613a00db3db7720ce",
-                    "nonce" : "0x64411a9037a8dc4c",
+                    "hash" : "0x937ed127f36ea9856fd7093c5f32a4345b45d680fd81e1262b38cd47eb43d584",
+                    "mixHash" : "0x5f95d56fc24b80054a8e842bb795bcba5e5b15f4c56ac92010fd49b1280aae3b",
+                    "nonce" : "0x1a45c74dc52461d2",
                     "number" : "0x01",
                     "parentHash" : "0x7cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0",
                     "receiptTrie" : "0x650f5efae76d8b51ed198933e62bcba1368707aa2abcebde58283559ad19e105",
@@ -364,7 +491,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca07cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a011123d34b41e7a0c50aeb89f95cef8148f6d5338161eb89a8797284cb1cf4dbaa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0650f5efae76d8b51ed198933e62bcba1368707aa2abcebde58283559ad19e105b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0c28203e880a0f5636c03183ee28aa372bf22304e9c2fb06104d3fe1497c613a00db3db7720ce8864411a9037a8dc4cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca07cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a011123d34b41e7a0c50aeb89f95cef8148f6d5338161eb89a8797284cb1cf4dbaa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0650f5efae76d8b51ed198933e62bcba1368707aa2abcebde58283559ad19e105b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0c28203e880a05f95d56fc24b80054a8e842bb795bcba5e5b15f4c56ac92010fd49b1280aae3b881a45c74dc52461d2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -401,8 +528,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c85ba8e237f0a2e964b38f17563c9dcd4da89fd5bf1b17be601ac54a8862dda1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5bdc06f0d9af465699642312d93a2ce409efd3c1ea3b6d48bf9e15613b7bbe6b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x937ed127f36ea9856fd7093c5f32a4345b45d680fd81e1262b38cd47eb43d584",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -451,10 +578,10 @@
             }
         }
     },
-    "randomStatetest228_d0g0v0_Metropolis" : {
+    "randomStatetest228_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/randomStatetest228_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -465,19 +592,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa400",
-                    "hash" : "0x6a75944701aa6861d7342b83a05fa2a20b05fdac2b72d5555304c2d190c77349",
-                    "mixHash" : "0x1833f08731668f27d0c0f1cfc38ac0747859113c2d7f23a1694338daadd51671",
-                    "nonce" : "0xa5f3db22f85eecc5",
+                    "gasUsed" : "0xa0c2",
+                    "hash" : "0xe198e5d091ee435ebf557bf14b0a25a80b5b9840b10f41808a6a7c43cf7b6537",
+                    "mixHash" : "0x1aac7c96847b3ffcb35d6333ce878ff95bb30dd4c7d5e4281fb9703ee72478e7",
+                    "nonce" : "0x9dfe69646c52e4ce",
                     "number" : "0x01",
                     "parentHash" : "0x7cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0",
-                    "receiptTrie" : "0xa82f3c72a9fbd8c9a643330d6e9ed7b8046da2d887f51fdec3afa4ba7a0f5a6c",
-                    "stateRoot" : "0xfb8215ae2c94f57466564288b59fe0cabd23a2f6b993f3519f945daf5ca27db4",
+                    "receiptTrie" : "0x650f5efae76d8b51ed198933e62bcba1368707aa2abcebde58283559ad19e105",
+                    "stateRoot" : "0x11123d34b41e7a0c50aeb89f95cef8148f6d5338161eb89a8797284cb1cf4dba",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca07cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fb8215ae2c94f57466564288b59fe0cabd23a2f6b993f3519f945daf5ca27db4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a82f3c72a9fbd8c9a643330d6e9ed7b8046da2d887f51fdec3afa4ba7a0f5a6cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4008203e880a01833f08731668f27d0c0f1cfc38ac0747859113c2d7f23a1694338daadd5167188a5f3db22f85eecc5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca07cdc0116a82e3be386f7b1c586ee9061a39fec06dc59c7440b5f05cd9b86f6f0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a011123d34b41e7a0c50aeb89f95cef8148f6d5338161eb89a8797284cb1cf4dbaa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0650f5efae76d8b51ed198933e62bcba1368707aa2abcebde58283559ad19e105b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0c28203e880a01aac7c96847b3ffcb35d6333ce878ff95bb30dd4c7d5e4281fb9703ee72478e7889dfe69646c52e4cef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -514,16 +641,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c85ba8e237f0a2e964b38f17563c9dcd4da89fd5bf1b17be601ac54a8862dda1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a75944701aa6861d7342b83a05fa2a20b05fdac2b72d5555304c2d190c77349",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe198e5d091ee435ebf557bf14b0a25a80b5b9840b10f41808a6a7c43cf7b6537",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x41434543454541443b5455",
@@ -533,14 +653,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a42e",
+                "balance" : "0x4563918244f4a0f0",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d560",
+                "balance" : "0x0de0b6b3a761d89e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {