Hive tests with Byzantine

1 files changed, 186 insertions, 68 deletions

diff --git a/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d24g0v0.json b/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d24g0v0.json
index 895ef6251..857c3bf1e 100644
--- a/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d24g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d24g0v0.json
@@ -1,8 +1,8 @@
 {
-    "pointMulAdd2_d24g0v0_EIP150" : {
+    "pointMulAdd2_d24g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stZeroKnowledge/pointMulAdd2_d24g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0x0215ed",
-                    "hash" : "0xaeb8e97ead35f37765f2d14bcb2d348d5763ef9849a29580abf1ac2e58b556be",
-                    "mixHash" : "0x7360eaf2b907821452a9280377e2a2142e47afb275aaf965ddb0783ee82d93e0",
-                    "nonce" : "0x8a3fa5f54ae0c3f9",
+                    "gasUsed" : "0x0294e1",
+                    "hash" : "0x01b9010652c2b8e5ac667652d2736f3d3e1c36643b02a7b849a7ced38c6fcdbf",
+                    "mixHash" : "0xdc6af0f78da80271d67ca94982ee93d3ec69e1e4b3f626105542bbe337e0ae31",
+                    "nonce" : "0x2dc5d5f30de96560",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
-                    "receiptTrie" : "0xa30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83",
-                    "stateRoot" : "0xdaea7445043807ef19677fe220b738fadd6a0af474609ed39b4fdca85622cf9f",
+                    "receiptTrie" : "0x455332968445f98fda7d99e86709169cef84388ff3840feaec678ebfe95fc425",
+                    "stateRoot" : "0xe22ae1646d18520e6388ab9c41789d7ccbc3d2b01c0cb10f8e72ec25d7d8e348",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0daea7445043807ef19677fe220b738fadd6a0af474609ed39b4fdca85622cf9fa0012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cca0a30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830215ed8203e880a07360eaf2b907821452a9280377e2a2142e47afb275aaf965ddb0783ee82d93e0888a3fa5f54ae0c3f9f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1ba0e3c1282c4bc6fddcd0cc37151ea2ffd383ca950e2f4faa2c3d81b74e3f3e2de1a05b9afead91b49dd2dd70372d41ae268c27c78b9f223436f7bcdf965b07287f13c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0e22ae1646d18520e6388ab9c41789d7ccbc3d2b01c0cb10f8e72ec25d7d8e348a0012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cca0455332968445f98fda7d99e86709169cef84388ff3840feaec678ebfe95fc425b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830294e18203e880a0dc6af0f78da80271d67ca94982ee93d3ec69e1e4b3f626105542bbe337e0ae31882dc5d5f30de96560f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1ba0e3c1282c4bc6fddcd0cc37151ea2ffd383ca950e2f4faa2c3d81b74e3f3e2de1a05b9afead91b49dd2dd70372d41ae268c27c78b9f223436f7bcdf965b07287f13c0",
                 "transactions" : [
                     {
                         "data" : "0x2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",
@@ -62,18 +62,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaeb8e97ead35f37765f2d14bcb2d348d5763ef9849a29580abf1ac2e58b556be",
-        "network" : "EIP150",
+        "lastblockhash" : "0x01b9010652c2b8e5ac667652d2736f3d3e1c36643b02a7b849a7ced38c6fcdbf",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f615ed",
+                "balance" : "0x4563918244f694e1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761ea13",
+                "balance" : "0x0de0b6b3a7616b1f",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -86,8 +93,10 @@
                 "storage" : {
                     "0x00" : "0x01",
                     "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01"
+                    "0x0a" : "0x2fa739d4cde056d8fd75427345cbb34159856e06a4ffad64159c4773f23fbf4b",
+                    "0x0b" : "0x1eed5d5325c31fc89dd541a13d7f63b981fae8d4bf78a6b08a38a601fcfea97b",
+                    "0x14" : "0x08e2142845db159bd105879a109fe7a6f254ed3ddae0e9cd8a2aeae05e5f647b",
+                    "0x15" : "0x221108ee615499d2e0a1113ca1a858a34e055f9da2d30e6e6ab392b049944a92"
                 }
             }
         },
@@ -108,10 +117,128 @@
             }
         }
     },
-    "pointMulAdd2_d24g0v0_EIP158" : {
+    "pointMulAdd2_d24g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroKnowledge/pointMulAdd2_d24g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x3d37ef",
+                    "gasUsed" : "0x0294e1",
+                    "hash" : "0x5fc56b9add6f985afb27edba88504ccc85d207cadbc97a623cdefde354456c33",
+                    "mixHash" : "0x26a6b18980eb512c70b80dced07ce7caeb317ed79297f2256ef6c3229e9e783f",
+                    "nonce" : "0xc434e75078e05fa6",
+                    "number" : "0x01",
+                    "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
+                    "receiptTrie" : "0x455332968445f98fda7d99e86709169cef84388ff3840feaec678ebfe95fc425",
+                    "stateRoot" : "0xe22ae1646d18520e6388ab9c41789d7ccbc3d2b01c0cb10f8e72ec25d7d8e348",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0e22ae1646d18520e6388ab9c41789d7ccbc3d2b01c0cb10f8e72ec25d7d8e348a0012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cca0455332968445f98fda7d99e86709169cef84388ff3840feaec678ebfe95fc425b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830294e18203e880a026a6b18980eb512c70b80dced07ce7caeb317ed79297f2256ef6c3229e9e783f88c434e75078e05fa6f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1ba0e3c1282c4bc6fddcd0cc37151ea2ffd383ca950e2f4faa2c3d81b74e3f3e2de1a05b9afead91b49dd2dd70372d41ae268c27c78b9f223436f7bcdf965b07287f13c0",
+                "transactions" : [
+                    {
+                        "data" : "0x2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0xe3c1282c4bc6fddcd0cc37151ea2ffd383ca950e2f4faa2c3d81b74e3f3e2de1",
+                        "s" : "0x5b9afead91b49dd2dd70372d41ae268c27c78b9f223436f7bcdf965b07287f13",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x3d37ef",
+            "gasUsed" : "0x00",
+            "hash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5fc56b9add6f985afb27edba88504ccc85d207cadbc97a623cdefde354456c33",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
+                "balance" : "0x4563918244f694e1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7616b1f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60003560005260203560205260403560405260603560605260803560805260a03560a05260c03560c052604061012c60806000600060066207a120f2600055604061019060606080600060076207a120f260015561012c51600a5561014c51600b55610190516014556101b051601555601454600a5414600255601554600b5414600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x0a" : "0x2fa739d4cde056d8fd75427345cbb34159856e06a4ffad64159c4773f23fbf4b",
+                    "0x0b" : "0x1eed5d5325c31fc89dd541a13d7f63b981fae8d4bf78a6b08a38a601fcfea97b",
+                    "0x14" : "0x08e2142845db159bd105879a109fe7a6f254ed3ddae0e9cd8a2aeae05e5f647b",
+                    "0x15" : "0x221108ee615499d2e0a1113ca1a858a34e055f9da2d30e6e6ab392b049944a92"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60003560005260203560205260403560405260603560605260803560805260a03560a05260c03560c052604061012c60806000600060066207a120f2600055604061019060606080600060076207a120f260015561012c51600a5561014c51600b55610190516014556101b051601555601454600a5414600255601554600b5414600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "pointMulAdd2_d24g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stZeroKnowledge/pointMulAdd2_d24g0v0Filler.json"
         },
         "blocks" : [
@@ -123,9 +250,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0x0215ed",
-                    "hash" : "0xe63d9d27107897b20630bdd6d0dc304d5c6d7d1e78e89f20cac75a1baef95a1c",
-                    "mixHash" : "0x88f33bf12b2ef985f4f21f772ba29b302ad46574a647671026650d4eae3f4842",
-                    "nonce" : "0x348df75292871c62",
+                    "hash" : "0xe85cb15c42833ef5dca7244493a0b7556fa67f2956c4a2eb1eadb46a35661f36",
+                    "mixHash" : "0x77c2e7a560473223f42e38ae9267cc149041a33b9e42366fe5a7f2628e20eb36",
+                    "nonce" : "0xe039c91f2986b6f1",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
                     "receiptTrie" : "0xa30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83",
@@ -134,7 +261,7 @@
                     "transactionsTrie" : "0x012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0daea7445043807ef19677fe220b738fadd6a0af474609ed39b4fdca85622cf9fa0012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cca0a30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830215ed8203e880a088f33bf12b2ef985f4f21f772ba29b302ad46574a647671026650d4eae3f484288348df75292871c62f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1ba0e3c1282c4bc6fddcd0cc37151ea2ffd383ca950e2f4faa2c3d81b74e3f3e2de1a05b9afead91b49dd2dd70372d41ae268c27c78b9f223436f7bcdf965b07287f13c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0daea7445043807ef19677fe220b738fadd6a0af474609ed39b4fdca85622cf9fa0012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cca0a30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830215ed8203e880a077c2e7a560473223f42e38ae9267cc149041a33b9e42366fe5a7f2628e20eb3688e039c91f2986b6f1f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1ba0e3c1282c4bc6fddcd0cc37151ea2ffd383ca950e2f4faa2c3d81b74e3f3e2de1a05b9afead91b49dd2dd70372d41ae268c27c78b9f223436f7bcdf965b07287f13c0",
                 "transactions" : [
                     {
                         "data" : "0x2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",
@@ -171,8 +298,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe63d9d27107897b20630bdd6d0dc304d5c6d7d1e78e89f20cac75a1baef95a1c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe85cb15c42833ef5dca7244493a0b7556fa67f2956c4a2eb1eadb46a35661f36",
+        "network" : "EIP150",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f615ed",
@@ -217,10 +344,10 @@
             }
         }
     },
-    "pointMulAdd2_d24g0v0_Frontier" : {
+    "pointMulAdd2_d24g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stZeroKnowledge/pointMulAdd2_d24g0v0Filler.json"
         },
         "blocks" : [
@@ -231,19 +358,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0x020e6d",
-                    "hash" : "0x75241c705a859b447a1510f896487d7e4f42a41b9ebf2ad1712655623b3f9bd4",
-                    "mixHash" : "0x259a29cc7ee38f185a51f6b47882d2738723a70644a0ef728e124f632dfc0edd",
-                    "nonce" : "0x41b5104b0d66d985",
+                    "gasUsed" : "0x0215ed",
+                    "hash" : "0xfd4f381fcbd9c1cafa6d9eb5e37d45d150feddaecfcbd3ee12bbd4cf8ad8d1f1",
+                    "mixHash" : "0x33416e1bd10677293b11b550dfa75e68d155c05fb6b3849eb96ecccff4c02760",
+                    "nonce" : "0xe3b1d9acd58e5821",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
-                    "receiptTrie" : "0xf8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6",
-                    "stateRoot" : "0x9af6a6d7bb86e93b6c70b7839ec338cfffad57ca45fe8a727f02dbdfe81346d4",
+                    "receiptTrie" : "0xa30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83",
+                    "stateRoot" : "0xdaea7445043807ef19677fe220b738fadd6a0af474609ed39b4fdca85622cf9f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa09af6a6d7bb86e93b6c70b7839ec338cfffad57ca45fe8a727f02dbdfe81346d4a0012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cca0f8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83020e6d8203e880a0259a29cc7ee38f185a51f6b47882d2738723a70644a0ef728e124f632dfc0edd8841b5104b0d66d985f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1ba0e3c1282c4bc6fddcd0cc37151ea2ffd383ca950e2f4faa2c3d81b74e3f3e2de1a05b9afead91b49dd2dd70372d41ae268c27c78b9f223436f7bcdf965b07287f13c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0daea7445043807ef19677fe220b738fadd6a0af474609ed39b4fdca85622cf9fa0012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cca0a30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830215ed8203e880a033416e1bd10677293b11b550dfa75e68d155c05fb6b3849eb96ecccff4c0276088e3b1d9acd58e5821f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1ba0e3c1282c4bc6fddcd0cc37151ea2ffd383ca950e2f4faa2c3d81b74e3f3e2de1a05b9afead91b49dd2dd70372d41ae268c27c78b9f223436f7bcdf965b07287f13c0",
                 "transactions" : [
                     {
                         "data" : "0x2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",
@@ -280,18 +407,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75241c705a859b447a1510f896487d7e4f42a41b9ebf2ad1712655623b3f9bd4",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfd4f381fcbd9c1cafa6d9eb5e37d45d150feddaecfcbd3ee12bbd4cf8ad8d1f1",
+        "network" : "EIP158",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f60e6d",
+                "balance" : "0x4563918244f615ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761f193",
+                "balance" : "0x0de0b6b3a761ea13",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -326,10 +453,10 @@
             }
         }
     },
-    "pointMulAdd2_d24g0v0_Homestead" : {
+    "pointMulAdd2_d24g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stZeroKnowledge/pointMulAdd2_d24g0v0Filler.json"
         },
         "blocks" : [
@@ -341,9 +468,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0x020e6d",
-                    "hash" : "0x87ed18b077f5ecb39e2d49011f4a809d797febd302a21ef0332438e54ebf3705",
-                    "mixHash" : "0x794e5f046da0f74ce675d4f980532163099170aa6e8f9e1a7ae15f4ea20a875e",
-                    "nonce" : "0xcb29e9d39d2181b8",
+                    "hash" : "0x99aefd568808b962a0ba5e4004b11c1e14f9c2305658968df5a2a6de725adc88",
+                    "mixHash" : "0xe0485b5c7a2071b6ff7ff4d85b0fdcb0380b6812a3be56942788e16f11988d2b",
+                    "nonce" : "0x5f96698538ad2ae5",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
                     "receiptTrie" : "0xf8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6",
@@ -352,7 +479,7 @@
                     "transactionsTrie" : "0x012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa09af6a6d7bb86e93b6c70b7839ec338cfffad57ca45fe8a727f02dbdfe81346d4a0012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cca0f8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83020e6d8203e880a0794e5f046da0f74ce675d4f980532163099170aa6e8f9e1a7ae15f4ea20a875e88cb29e9d39d2181b8f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1ba0e3c1282c4bc6fddcd0cc37151ea2ffd383ca950e2f4faa2c3d81b74e3f3e2de1a05b9afead91b49dd2dd70372d41ae268c27c78b9f223436f7bcdf965b07287f13c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa09af6a6d7bb86e93b6c70b7839ec338cfffad57ca45fe8a727f02dbdfe81346d4a0012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cca0f8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83020e6d8203e880a0e0485b5c7a2071b6ff7ff4d85b0fdcb0380b6812a3be56942788e16f11988d2b885f96698538ad2ae5f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1ba0e3c1282c4bc6fddcd0cc37151ea2ffd383ca950e2f4faa2c3d81b74e3f3e2de1a05b9afead91b49dd2dd70372d41ae268c27c78b9f223436f7bcdf965b07287f13c0",
                 "transactions" : [
                     {
                         "data" : "0x2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",
@@ -389,8 +516,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87ed18b077f5ecb39e2d49011f4a809d797febd302a21ef0332438e54ebf3705",
-        "network" : "Homestead",
+        "lastblockhash" : "0x99aefd568808b962a0ba5e4004b11c1e14f9c2305658968df5a2a6de725adc88",
+        "network" : "Frontier",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f60e6d",
@@ -435,10 +562,10 @@
             }
         }
     },
-    "pointMulAdd2_d24g0v0_Metropolis" : {
+    "pointMulAdd2_d24g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stZeroKnowledge/pointMulAdd2_d24g0v0Filler.json"
         },
         "blocks" : [
@@ -449,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0x0294e1",
-                    "hash" : "0x8e7e9bb0a483292c8372c6e30bb15d939de5add0ba72d3f7e574f48f76e4bd10",
-                    "mixHash" : "0xc26d97958a91101ee77281ddaeeb06ff0a112f323976cfd2d347113bc690dd4c",
-                    "nonce" : "0xd620b68d87db769a",
+                    "gasUsed" : "0x020e6d",
+                    "hash" : "0x1d73269a6e9bde39bc3aa4e689b66a4146f1b1321f211efccc93a5932fe722d3",
+                    "mixHash" : "0x22fd70a1bcbbd6fe8a2a7e1bb69c5929dd047d505ed345bd37350e64d88a9869",
+                    "nonce" : "0x30d2bc2cc6ab48dd",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
-                    "receiptTrie" : "0x455332968445f98fda7d99e86709169cef84388ff3840feaec678ebfe95fc425",
-                    "stateRoot" : "0xe22ae1646d18520e6388ab9c41789d7ccbc3d2b01c0cb10f8e72ec25d7d8e348",
+                    "receiptTrie" : "0xf8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6",
+                    "stateRoot" : "0x9af6a6d7bb86e93b6c70b7839ec338cfffad57ca45fe8a727f02dbdfe81346d4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0e22ae1646d18520e6388ab9c41789d7ccbc3d2b01c0cb10f8e72ec25d7d8e348a0012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cca0455332968445f98fda7d99e86709169cef84388ff3840feaec678ebfe95fc425b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830294e18203e880a0c26d97958a91101ee77281ddaeeb06ff0a112f323976cfd2d347113bc690dd4c88d620b68d87db769af90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1ba0e3c1282c4bc6fddcd0cc37151ea2ffd383ca950e2f4faa2c3d81b74e3f3e2de1a05b9afead91b49dd2dd70372d41ae268c27c78b9f223436f7bcdf965b07287f13c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa09af6a6d7bb86e93b6c70b7839ec338cfffad57ca45fe8a727f02dbdfe81346d4a0012b171ec55e8f89313abef85d8b5126efd839ecbf8173833a1f2876e44ff1cca0f8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83020e6d8203e880a022fd70a1bcbbd6fe8a2a7e1bb69c5929dd047d505ed345bd37350e64d88a98698830d2bc2cc6ab48ddf90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1ba0e3c1282c4bc6fddcd0cc37151ea2ffd383ca950e2f4faa2c3d81b74e3f3e2de1a05b9afead91b49dd2dd70372d41ae268c27c78b9f223436f7bcdf965b07287f13c0",
                 "transactions" : [
                     {
                         "data" : "0x2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",
@@ -498,25 +625,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8e7e9bb0a483292c8372c6e30bb15d939de5add0ba72d3f7e574f48f76e4bd10",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1d73269a6e9bde39bc3aa4e689b66a4146f1b1321f211efccc93a5932fe722d3",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f694e1",
+                "balance" : "0x4563918244f60e6d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616b1f",
+                "balance" : "0x0de0b6b3a761f193",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -529,10 +649,8 @@
                 "storage" : {
                     "0x00" : "0x01",
                     "0x01" : "0x01",
-                    "0x0a" : "0x2fa739d4cde056d8fd75427345cbb34159856e06a4ffad64159c4773f23fbf4b",
-                    "0x0b" : "0x1eed5d5325c31fc89dd541a13d7f63b981fae8d4bf78a6b08a38a601fcfea97b",
-                    "0x14" : "0x08e2142845db159bd105879a109fe7a6f254ed3ddae0e9cd8a2aeae05e5f647b",
-                    "0x15" : "0x221108ee615499d2e0a1113ca1a858a34e055f9da2d30e6e6ab392b049944a92"
+                    "0x02" : "0x01",
+                    "0x03" : "0x01"
                 }
             }
         },