1 files changed, 162 insertions, 48 deletions
diff --git a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_d0g0v0.json
index bcd06fdca..9c5fe8637 100644
--- a/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemoryTest/mem64kb_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "mem64kb_d0g0v0_EIP150" : {
+    "mem64kb_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/stMemoryTest/mem64kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x5ec89aada66c4368b00e77d69ca84d658dc830b58f92084350e4706a609d111e",
-                    "mixHash" : "0xaadbcd44ff437093f0f648e328d0501e3ff7d87dd27a4436ca405516b21a03bf",
-                    "nonce" : "0x14bf300fff7149cc",
+                    "hash" : "0x2b25cb3795f8fea4397319140b089ab76d83c3ab2ed88f7b3174d78cbde231c6",
+                    "mixHash" : "0x21168e1023e67454b8432bd4f27356611c40ae6b5fb081e67f488d5908832304",
+                    "nonce" : "0x88517a1a970d32bb",
                     "number" : "0x01",
                     "parentHash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
-                    "receiptTrie" : "0xba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790a",
-                    "stateRoot" : "0xa001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9",
+                    "receiptTrie" : "0x0f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002",
+                    "stateRoot" : "0x485e164c3cb5d7285648836a28a5f1dce9fd5fe008b8148999b72fbf3bdbfd1c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0aadbcd44ff437093f0f648e328d0501e3ff7d87dd27a4436ca405516b21a03bf8814bf300fff7149ccf863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485e164c3cb5d7285648836a28a5f1dce9fd5fe008b8148999b72fbf3bdbfd1ca081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a00f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a021168e1023e67454b8432bd4f27356611c40ae6b5fb081e67f488d59088323048888517a1a970d32bbf863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ec89aada66c4368b00e77d69ca84d658dc830b58f92084350e4706a609d111e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2b25cb3795f8fea4397319140b089ab76d83c3ab2ed88f7b3174d78cbde231c6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9e05261f9e05160015559600055",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "mem64kb_d0g0v0_EIP158" : {
+    "mem64kb_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/stMemoryTest/mem64kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x6cc6220c6b307413c320951607c9369f7714478c48a42fe5029ca2449bbf40d2",
-                    "mixHash" : "0xda3c417064a9093aeead95619be685cb35cc20bec4d300839df4422e7164d2ea",
-                    "nonce" : "0x5dedee6ab0c848c7",
+                    "hash" : "0x77ed8cf41e1b91edf8f9ad83eff546f9e38b0bfae567058e424948be75e30a81",
+                    "mixHash" : "0x287d01df45eb5d5759cbca32e2eff00ee5d018936866e16be8eed7ef3c6c90aa",
+                    "nonce" : "0x513e0e5f86596970",
                     "number" : "0x01",
                     "parentHash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
-                    "receiptTrie" : "0xba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790a",
-                    "stateRoot" : "0xa001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9",
+                    "receiptTrie" : "0x0f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002",
+                    "stateRoot" : "0x485e164c3cb5d7285648836a28a5f1dce9fd5fe008b8148999b72fbf3bdbfd1c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0da3c417064a9093aeead95619be685cb35cc20bec4d300839df4422e7164d2ea885dedee6ab0c848c7f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485e164c3cb5d7285648836a28a5f1dce9fd5fe008b8148999b72fbf3bdbfd1ca081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a00f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0287d01df45eb5d5759cbca32e2eff00ee5d018936866e16be8eed7ef3c6c90aa88513e0e5f86596970f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6cc6220c6b307413c320951607c9369f7714478c48a42fe5029ca2449bbf40d2",
-        "network" : "EIP158",
+        "lastblockhash" : "0x77ed8cf41e1b91edf8f9ad83eff546f9e38b0bfae567058e424948be75e30a81",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9e05261f9e05160015559600055",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "mem64kb_d0g0v0_Frontier" : {
+    "mem64kb_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/stMemoryTest/mem64kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x7096d868e433701be47c5dfc3d5b59b278f0c6d5b47238fb251e75f1493938d4",
-                    "mixHash" : "0x5cf0b2e8b0568ea77df4eeae1e8eddac6fdf7c906b2c3a919329a5e661ef1593",
-                    "nonce" : "0x27cea3577e968012",
+                    "hash" : "0x8881c99c8b97e8e24dd577763e071edaebadb7965f38142e75ab8ab06e2ef361",
+                    "mixHash" : "0x697380ab8d449f210b91bf377ac7b077a26a15a1a6399582ad40727b3c7f22f6",
+                    "nonce" : "0xf03a3f718a21eca6",
                     "number" : "0x01",
                     "parentHash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
                     "receiptTrie" : "0xba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790a",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a05cf0b2e8b0568ea77df4eeae1e8eddac6fdf7c906b2c3a919329a5e661ef15938827cea3577e968012f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0697380ab8d449f210b91bf377ac7b077a26a15a1a6399582ad40727b3c7f22f688f03a3f718a21eca6f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7096d868e433701be47c5dfc3d5b59b278f0c6d5b47238fb251e75f1493938d4",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8881c99c8b97e8e24dd577763e071edaebadb7965f38142e75ab8ab06e2ef361",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "mem64kb_d0g0v0_Homestead" : {
+    "mem64kb_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/stMemoryTest/mem64kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x192c973b568c8e35620978ff5bda0f5c4a9a52a5eda2fda0a83d55ae46f0de69",
-                    "mixHash" : "0x08d1c209594bb4892cc07fea9fd36601a6b92083f5dcf00b9782bee8cb822957",
-                    "nonce" : "0x1a4850ddb32364a6",
+                    "hash" : "0xf45843fe210491fe07ff9edc29392d43dc3399103fedef80601252b32d4ff7d2",
+                    "mixHash" : "0xfbf37399fc6974fd01f94f0aaae529c17ceb2fc46fbdb7aa19a285324a178552",
+                    "nonce" : "0x2a784591260bc3de",
                     "number" : "0x01",
                     "parentHash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
                     "receiptTrie" : "0xba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790a",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a008d1c209594bb4892cc07fea9fd36601a6b92083f5dcf00b9782bee8cb822957881a4850ddb32364a6f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0fbf37399fc6974fd01f94f0aaae529c17ceb2fc46fbdb7aa19a285324a178552882a784591260bc3def863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x192c973b568c8e35620978ff5bda0f5c4a9a52a5eda2fda0a83d55ae46f0de69",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf45843fe210491fe07ff9edc29392d43dc3399103fedef80601252b32d4ff7d2",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "mem64kb_d0g0v0_Metropolis" : {
+    "mem64kb_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/stMemoryTest/mem64kb_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x012453",
-                    "hash" : "0x14a6fbb2b8b91e23e7b4b2314a6154aaaed829135650f0b2371e9433cdb7e9ab",
-                    "mixHash" : "0xca611eaa12c9a0208c5b8a73623c885594465f919b4fca5d2bca9e848bcc5fec",
-                    "nonce" : "0x2766eeaaf3799577",
+                    "hash" : "0xd522ae1f627521d2d2f7eafdb1a4d7a1b3ba79f7ae1b6c84510a1f8b369fbad4",
+                    "mixHash" : "0xbb6b8a5a116346e2763228d44fdf62be27fbd8a4423ee77bfd38284f8585df17",
+                    "nonce" : "0xda1629563c25ff5f",
                     "number" : "0x01",
                     "parentHash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
-                    "receiptTrie" : "0x0f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002",
-                    "stateRoot" : "0x485e164c3cb5d7285648836a28a5f1dce9fd5fe008b8148999b72fbf3bdbfd1c",
+                    "receiptTrie" : "0xba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790a",
+                    "stateRoot" : "0xa001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485e164c3cb5d7285648836a28a5f1dce9fd5fe008b8148999b72fbf3bdbfd1ca081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a00f147df50ae9e0dc7aaa1448a0a9f64e14e1671b76eed6f6c5662c826f992002b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0ca611eaa12c9a0208c5b8a73623c885594465f919b4fca5d2bca9e848bcc5fec882766eeaaf3799577f863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0bb6b8a5a116346e2763228d44fdf62be27fbd8a4423ee77bfd38284f8585df1788da1629563c25ff5ff863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14a6fbb2b8b91e23e7b4b2314a6154aaaed829135650f0b2371e9433cdb7e9ab",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd522ae1f627521d2d2f7eafdb1a4d7a1b3ba79f7ae1b6c84510a1f8b369fbad4",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x602a61f9e05261f9e05160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xfa00",
+                    "0x01" : "0x2a"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f52453",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63fffedba3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x602a61f9e05261f9e05160015559600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mem64kb_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemoryTest/mem64kb_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0x012453",
+                    "hash" : "0x10968fc914e113edda0c76687ef870674cabc18b3bf839d00c3004c436daf04e",
+                    "mixHash" : "0x062038f73ca4730db4d70948d01a1412f664009bf842102e6e17744c005a38f1",
+                    "nonce" : "0x1b88cfe3cd7e039a",
+                    "number" : "0x01",
+                    "parentHash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
+                    "receiptTrie" : "0xba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790a",
+                    "stateRoot" : "0xa001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x81fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901faa0dfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a001c3f18a181856e5725165bd49217bf85d2ac3c2088a0c171d6438d43c75b9a081fcf490a12db64308a606cefa3e261e0854f8da7873d95e3ba2b97106d08e03a0ba2c44eca4fdd334be13774939c8ffb5b9a281836b7082a084c517f675d5790ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000830124538203e880a0062038f73ca4730db4d70948d01a1412f664009bf842102e6e17744c005a38f1881b88cfe3cd7e039af863f861800184500018d8940f572e5295c57f15886f9b263e2f6d2d6c7b5ec60a801ba0a273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699a051e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bffc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x500018d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa273bb9d7691b348937e6cc7b3d9c883f49c558ebf1962950ed380bfce169699",
+                        "s" : "0x51e8cbfad048e722025f7b223eb5400ba6f5df788691add661a5ab8d6cdb2bff",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0xdfd03796910c706f5d5d81b927df7eb209dca472452dadee7dd1cc939ceeb32a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x57e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057e3e32a61a5497de95baa1f12444056d6821ebf60728f044075586dda5d0a4aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x10968fc914e113edda0c76687ef870674cabc18b3bf839d00c3004c436daf04e",
+        "network" : "Homestead",
+        "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x602a61f9e05261f9e05160015559600055",