Hive tests with Byzantine

1 files changed, 188 insertions, 68 deletions

diff --git a/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d22g0v0.json b/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d22g0v0.json
index ef2f4a4ef..7bdd06fe0 100644
--- a/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d22g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d22g0v0.json
@@ -1,8 +1,8 @@
 {
-    "pointMulAdd2_d22g0v0_EIP150" : {
+    "pointMulAdd2_d22g0v0_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_d22g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0x0215ed",
-                    "hash" : "0x49ad3f2cb3bfe44bcf9efb531909940e6b464be2ac6ecab882ed226f0385ac73",
-                    "mixHash" : "0x821cb89efd0b19a385f147685c032566e584e0a98d89e22ce605dff561a934e0",
-                    "nonce" : "0x44a0ad35d1adf625",
+                    "gasUsed" : "0x030a11",
+                    "hash" : "0xe8d23043f1f580e27169a6f773c93a91894b8e91cb7f136abc91c7bb7f50e02b",
+                    "mixHash" : "0x3c366fa604e53eacc3075e59dd4962300123810ed6a771f4eb23e0db29346647",
+                    "nonce" : "0x673176f7b3a4dcbd",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
-                    "receiptTrie" : "0xa30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83",
-                    "stateRoot" : "0xdaea7445043807ef19677fe220b738fadd6a0af474609ed39b4fdca85622cf9f",
+                    "receiptTrie" : "0x1847b88c1b1d77e582e8ab175c2a8c4e3a484e01968f6f96c58db62fe6e521cc",
+                    "stateRoot" : "0xc810e1fbdbe96df9d725978a8bc6bdf6dd89c909129cf406400e194a6ee3db2b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0daea7445043807ef19677fe220b738fadd6a0af474609ed39b4fdca85622cf9fa0730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4ea0a30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830215ed8203e880a0821cb89efd0b19a385f147685c032566e584e0a98d89e22ce605dff561a934e08844a0ad35d1adf625f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000021ca00f178bbbacd2b5ef57fa76128ad17fa02f199e3dd399a225c4adea37da7194d7a058b245dc39e7a7b185635769c0912c94aa7a3305bd610f2e05134aa928f88a49c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0c810e1fbdbe96df9d725978a8bc6bdf6dd89c909129cf406400e194a6ee3db2ba0730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4ea01847b88c1b1d77e582e8ab175c2a8c4e3a484e01968f6f96c58db62fe6e521ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83030a118203e880a03c366fa604e53eacc3075e59dd4962300123810ed6a771f4eb23e0db2934664788673176f7b3a4dcbdf90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000021ca00f178bbbacd2b5ef57fa76128ad17fa02f199e3dd399a225c4adea37da7194d7a058b245dc39e7a7b185635769c0912c94aa7a3305bd610f2e05134aa928f88a49c0",
                 "transactions" : [
                     {
                         "data" : "0x2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b00000000000000000000000000000000000000000000000000000000000000002",
@@ -62,18 +62,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49ad3f2cb3bfe44bcf9efb531909940e6b464be2ac6ecab882ed226f0385ac73",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe8d23043f1f580e27169a6f773c93a91894b8e91cb7f136abc91c7bb7f50e02b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f615ed",
+                "balance" : "0x4563918244f70a11",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761ea13",
+                "balance" : "0x0de0b6b3a760f5ef",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -87,7 +94,11 @@
                     "0x00" : "0x01",
                     "0x01" : "0x01",
                     "0x02" : "0x01",
-                    "0x03" : "0x01"
+                    "0x03" : "0x01",
+                    "0x0a" : "0x2fa739d4cde056d8fd75427345cbb34159856e06a4ffad64159c4773f23fbf4b",
+                    "0x0b" : "0x1eed5d5325c31fc89dd541a13d7f63b981fae8d4bf78a6b08a38a601fcfea97b",
+                    "0x14" : "0x2fa739d4cde056d8fd75427345cbb34159856e06a4ffad64159c4773f23fbf4b",
+                    "0x15" : "0x1eed5d5325c31fc89dd541a13d7f63b981fae8d4bf78a6b08a38a601fcfea97b"
                 }
             }
         },
@@ -108,10 +119,130 @@
             }
         }
     },
-    "pointMulAdd2_d22g0v0_EIP158" : {
+    "pointMulAdd2_d22g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroKnowledge/pointMulAdd2_d22g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x3d37ef",
+                    "gasUsed" : "0x030a11",
+                    "hash" : "0xdd71b95238545a5a7b6151f5417b729129a042778bf6896eddf7e832332370a9",
+                    "mixHash" : "0x00895f627338e3389d5bc34d7d7edff394afe4971e15723d70229df09ddb5c1e",
+                    "nonce" : "0xdb2af4bcb5daea3a",
+                    "number" : "0x01",
+                    "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
+                    "receiptTrie" : "0x1847b88c1b1d77e582e8ab175c2a8c4e3a484e01968f6f96c58db62fe6e521cc",
+                    "stateRoot" : "0xc810e1fbdbe96df9d725978a8bc6bdf6dd89c909129cf406400e194a6ee3db2b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0c810e1fbdbe96df9d725978a8bc6bdf6dd89c909129cf406400e194a6ee3db2ba0730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4ea01847b88c1b1d77e582e8ab175c2a8c4e3a484e01968f6f96c58db62fe6e521ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83030a118203e880a000895f627338e3389d5bc34d7d7edff394afe4971e15723d70229df09ddb5c1e88db2af4bcb5daea3af90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000021ca00f178bbbacd2b5ef57fa76128ad17fa02f199e3dd399a225c4adea37da7194d7a058b245dc39e7a7b185635769c0912c94aa7a3305bd610f2e05134aa928f88a49c0",
+                "transactions" : [
+                    {
+                        "data" : "0x2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b00000000000000000000000000000000000000000000000000000000000000002",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x0f178bbbacd2b5ef57fa76128ad17fa02f199e3dd399a225c4adea37da7194d7",
+                        "s" : "0x58b245dc39e7a7b185635769c0912c94aa7a3305bd610f2e05134aa928f88a49",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "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" : "0xdd71b95238545a5a7b6151f5417b729129a042778bf6896eddf7e832332370a9",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
+                "balance" : "0x4563918244f70a11",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a760f5ef",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60003560005260203560205260403560405260603560605260803560805260a03560a05260c03560c052604061012c60806000600060066207a120f2600055604061019060606080600060076207a120f260015561012c51600a5561014c51600b55610190516014556101b051601555601454600a5414600255601554600b5414600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x0a" : "0x2fa739d4cde056d8fd75427345cbb34159856e06a4ffad64159c4773f23fbf4b",
+                    "0x0b" : "0x1eed5d5325c31fc89dd541a13d7f63b981fae8d4bf78a6b08a38a601fcfea97b",
+                    "0x14" : "0x2fa739d4cde056d8fd75427345cbb34159856e06a4ffad64159c4773f23fbf4b",
+                    "0x15" : "0x1eed5d5325c31fc89dd541a13d7f63b981fae8d4bf78a6b08a38a601fcfea97b"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60003560005260203560205260403560405260603560605260803560805260a03560a05260c03560c052604061012c60806000600060066207a120f2600055604061019060606080600060076207a120f260015561012c51600a5561014c51600b55610190516014556101b051601555601454600a5414600255601554600b5414600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "pointMulAdd2_d22g0v0_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_d22g0v0Filler.json"
         },
         "blocks" : [
@@ -123,9 +254,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0x0215ed",
-                    "hash" : "0x8d68ccbfd19c58a49a89d189dfa8c6b572c3a88298dc5f448716cb7aa14c7956",
-                    "mixHash" : "0x9b41576ec3c907b9daba544e0591e41718248e1f807aef1f6ac53c98639a1e5a",
-                    "nonce" : "0x32463c7196cfc507",
+                    "hash" : "0x5f688dd377d0cde5e77eb4a9af5353a77300a6a187353acc785570a9a8055a78",
+                    "mixHash" : "0x7a372bef7e3ebc72a570656f82970312d9d6c5bee37528fb4d29961f4dfae0f3",
+                    "nonce" : "0xaca6944333926e4d",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
                     "receiptTrie" : "0xa30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83",
@@ -134,7 +265,7 @@
                     "transactionsTrie" : "0x730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0daea7445043807ef19677fe220b738fadd6a0af474609ed39b4fdca85622cf9fa0730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4ea0a30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830215ed8203e880a09b41576ec3c907b9daba544e0591e41718248e1f807aef1f6ac53c98639a1e5a8832463c7196cfc507f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000021ca00f178bbbacd2b5ef57fa76128ad17fa02f199e3dd399a225c4adea37da7194d7a058b245dc39e7a7b185635769c0912c94aa7a3305bd610f2e05134aa928f88a49c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0daea7445043807ef19677fe220b738fadd6a0af474609ed39b4fdca85622cf9fa0730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4ea0a30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830215ed8203e880a07a372bef7e3ebc72a570656f82970312d9d6c5bee37528fb4d29961f4dfae0f388aca6944333926e4df90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000021ca00f178bbbacd2b5ef57fa76128ad17fa02f199e3dd399a225c4adea37da7194d7a058b245dc39e7a7b185635769c0912c94aa7a3305bd610f2e05134aa928f88a49c0",
                 "transactions" : [
                     {
                         "data" : "0x2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b00000000000000000000000000000000000000000000000000000000000000002",
@@ -171,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d68ccbfd19c58a49a89d189dfa8c6b572c3a88298dc5f448716cb7aa14c7956",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5f688dd377d0cde5e77eb4a9af5353a77300a6a187353acc785570a9a8055a78",
+        "network" : "EIP150",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f615ed",
@@ -217,10 +348,10 @@
             }
         }
     },
-    "pointMulAdd2_d22g0v0_Frontier" : {
+    "pointMulAdd2_d22g0v0_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_d22g0v0Filler.json"
         },
         "blocks" : [
@@ -231,19 +362,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0x020e6d",
-                    "hash" : "0x92343941567dc64b394f3127ad2d2affc059db297c67af64b1c8ba0a44c39b61",
-                    "mixHash" : "0x17183f234eebd590db29193ef98690a20b5e33b5d1175837886df80f60b76710",
-                    "nonce" : "0x9a6b8452474fb9c8",
+                    "gasUsed" : "0x0215ed",
+                    "hash" : "0x6c4d5131f841114137e256dc7344974bd42ce1bfaddf346672a14a8aa66cda6f",
+                    "mixHash" : "0x78d07148e4f73c02c2c72d359b843c0320be20073f0ddd50071539333902ef8c",
+                    "nonce" : "0xa7667df4e3976e0e",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
-                    "receiptTrie" : "0xf8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6",
-                    "stateRoot" : "0x9af6a6d7bb86e93b6c70b7839ec338cfffad57ca45fe8a727f02dbdfe81346d4",
+                    "receiptTrie" : "0xa30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83",
+                    "stateRoot" : "0xdaea7445043807ef19677fe220b738fadd6a0af474609ed39b4fdca85622cf9f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa09af6a6d7bb86e93b6c70b7839ec338cfffad57ca45fe8a727f02dbdfe81346d4a0730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4ea0f8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83020e6d8203e880a017183f234eebd590db29193ef98690a20b5e33b5d1175837886df80f60b76710889a6b8452474fb9c8f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000021ca00f178bbbacd2b5ef57fa76128ad17fa02f199e3dd399a225c4adea37da7194d7a058b245dc39e7a7b185635769c0912c94aa7a3305bd610f2e05134aa928f88a49c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0daea7445043807ef19677fe220b738fadd6a0af474609ed39b4fdca85622cf9fa0730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4ea0a30edcf22c59f80a85e1531125a0d5a46187defc4a4d0d2eff38da41ce626e83b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830215ed8203e880a078d07148e4f73c02c2c72d359b843c0320be20073f0ddd50071539333902ef8c88a7667df4e3976e0ef90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000021ca00f178bbbacd2b5ef57fa76128ad17fa02f199e3dd399a225c4adea37da7194d7a058b245dc39e7a7b185635769c0912c94aa7a3305bd610f2e05134aa928f88a49c0",
                 "transactions" : [
                     {
                         "data" : "0x2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b00000000000000000000000000000000000000000000000000000000000000002",
@@ -280,18 +411,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92343941567dc64b394f3127ad2d2affc059db297c67af64b1c8ba0a44c39b61",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6c4d5131f841114137e256dc7344974bd42ce1bfaddf346672a14a8aa66cda6f",
+        "network" : "EIP158",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f60e6d",
+                "balance" : "0x4563918244f615ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761f193",
+                "balance" : "0x0de0b6b3a761ea13",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -326,10 +457,10 @@
             }
         }
     },
-    "pointMulAdd2_d22g0v0_Homestead" : {
+    "pointMulAdd2_d22g0v0_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_d22g0v0Filler.json"
         },
         "blocks" : [
@@ -341,9 +472,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0x020e6d",
-                    "hash" : "0xed63df1e92339497814e8a20e31b0c85573ecb10d276fe933b19ee680c9f92a0",
-                    "mixHash" : "0x061cf06bb261e7f7735cb6b1c4b1ad61af1e96b4109031270f170fab49be1051",
-                    "nonce" : "0x15f882bb9ecb2a4c",
+                    "hash" : "0x5a7ac7736efbe4f948bb2c50a38c77105302407e64e3c7ef5d11d987b1dc9911",
+                    "mixHash" : "0xc252b5ce6b05af40aa91d47defb8c3ff7e51136e2c63cca83aeb42ab052164ea",
+                    "nonce" : "0xbe4e570d8ec6f553",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
                     "receiptTrie" : "0xf8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6",
@@ -352,7 +483,7 @@
                     "transactionsTrie" : "0x730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa09af6a6d7bb86e93b6c70b7839ec338cfffad57ca45fe8a727f02dbdfe81346d4a0730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4ea0f8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83020e6d8203e880a0061cf06bb261e7f7735cb6b1c4b1ad61af1e96b4109031270f170fab49be10518815f882bb9ecb2a4cf90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000021ca00f178bbbacd2b5ef57fa76128ad17fa02f199e3dd399a225c4adea37da7194d7a058b245dc39e7a7b185635769c0912c94aa7a3305bd610f2e05134aa928f88a49c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa09af6a6d7bb86e93b6c70b7839ec338cfffad57ca45fe8a727f02dbdfe81346d4a0730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4ea0f8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83020e6d8203e880a0c252b5ce6b05af40aa91d47defb8c3ff7e51136e2c63cca83aeb42ab052164ea88be4e570d8ec6f553f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000021ca00f178bbbacd2b5ef57fa76128ad17fa02f199e3dd399a225c4adea37da7194d7a058b245dc39e7a7b185635769c0912c94aa7a3305bd610f2e05134aa928f88a49c0",
                 "transactions" : [
                     {
                         "data" : "0x2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b00000000000000000000000000000000000000000000000000000000000000002",
@@ -389,8 +520,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed63df1e92339497814e8a20e31b0c85573ecb10d276fe933b19ee680c9f92a0",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5a7ac7736efbe4f948bb2c50a38c77105302407e64e3c7ef5d11d987b1dc9911",
+        "network" : "Frontier",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f60e6d",
@@ -435,10 +566,10 @@
             }
         }
     },
-    "pointMulAdd2_d22g0v0_Metropolis" : {
+    "pointMulAdd2_d22g0v0_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_d22g0v0Filler.json"
         },
         "blocks" : [
@@ -449,19 +580,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0x030a11",
-                    "hash" : "0x0c08e047555483f332535ab3bcca78aa9c3382a91dd4533dc74e78a3da8c740d",
-                    "mixHash" : "0x86b5b7a76a72e1d59c07c021a954f0878d7bc8e151e89424535db6001a03c45c",
-                    "nonce" : "0xcf2df8e5d5f4554d",
+                    "gasUsed" : "0x020e6d",
+                    "hash" : "0xc3878ea9646bf654173eac224a3cfb45ff118628c5dd173ab3439ccc39f43579",
+                    "mixHash" : "0x1f099daa7dbe3ee0d44aee84fe309e88e0cad10b722c94853ebc7cfdcb2ca869",
+                    "nonce" : "0x5365b99b463d97de",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
-                    "receiptTrie" : "0x1847b88c1b1d77e582e8ab175c2a8c4e3a484e01968f6f96c58db62fe6e521cc",
-                    "stateRoot" : "0xc810e1fbdbe96df9d725978a8bc6bdf6dd89c909129cf406400e194a6ee3db2b",
+                    "receiptTrie" : "0xf8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6",
+                    "stateRoot" : "0x9af6a6d7bb86e93b6c70b7839ec338cfffad57ca45fe8a727f02dbdfe81346d4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0c810e1fbdbe96df9d725978a8bc6bdf6dd89c909129cf406400e194a6ee3db2ba0730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4ea01847b88c1b1d77e582e8ab175c2a8c4e3a484e01968f6f96c58db62fe6e521ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83030a118203e880a086b5b7a76a72e1d59c07c021a954f0878d7bc8e151e89424535db6001a03c45c88cf2df8e5d5f4554df90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000021ca00f178bbbacd2b5ef57fa76128ad17fa02f199e3dd399a225c4adea37da7194d7a058b245dc39e7a7b185635769c0912c94aa7a3305bd610f2e05134aa928f88a49c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa09af6a6d7bb86e93b6c70b7839ec338cfffad57ca45fe8a727f02dbdfe81346d4a0730093a2bd757abcd3e2cbb071fcb606c62fc646a300060b2244777df1496a4ea0f8d655bb2ce3f0a094ef7783de44e74484ffe6763bf83d04c7785a132834b9c6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83020e6d8203e880a01f099daa7dbe3ee0d44aee84fe309e88e0cad10b722c94853ebc7cfdcb2ca869885365b99b463d97def90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000021ca00f178bbbacd2b5ef57fa76128ad17fa02f199e3dd399a225c4adea37da7194d7a058b245dc39e7a7b185635769c0912c94aa7a3305bd610f2e05134aa928f88a49c0",
                 "transactions" : [
                     {
                         "data" : "0x2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b00000000000000000000000000000000000000000000000000000000000000002",
@@ -498,25 +629,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0c08e047555483f332535ab3bcca78aa9c3382a91dd4533dc74e78a3da8c740d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc3878ea9646bf654173eac224a3cfb45ff118628c5dd173ab3439ccc39f43579",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f70a11",
+                "balance" : "0x4563918244f60e6d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760f5ef",
+                "balance" : "0x0de0b6b3a761f193",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -530,11 +654,7 @@
                     "0x00" : "0x01",
                     "0x01" : "0x01",
                     "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x0a" : "0x2fa739d4cde056d8fd75427345cbb34159856e06a4ffad64159c4773f23fbf4b",
-                    "0x0b" : "0x1eed5d5325c31fc89dd541a13d7f63b981fae8d4bf78a6b08a38a601fcfea97b",
-                    "0x14" : "0x2fa739d4cde056d8fd75427345cbb34159856e06a4ffad64159c4773f23fbf4b",
-                    "0x15" : "0x1eed5d5325c31fc89dd541a13d7f63b981fae8d4bf78a6b08a38a601fcfea97b"
+                    "0x03" : "0x01"
                 }
             }
         },