Hive tests with Byzantine

1 files changed, 186 insertions, 68 deletions

diff --git a/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d20g0v0.json b/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d20g0v0.json
index c1348afd0..a8cf78801 100644
--- a/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d20g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d20g0v0.json
@@ -1,8 +1,8 @@
 {
-    "pointMulAdd2_d20g0v0_EIP150" : {
+    "pointMulAdd2_d20g0v0_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_d20g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0x02156d",
-                    "hash" : "0x0b2988e0cb75e7e7423dba20a57214ca891f3aaf7425898ce2aaba4ed9e17062",
-                    "mixHash" : "0x2f4b2b1bba50377be7649bde8be3b2b24129769b5dd1ec641f7741c6f34c7b67",
-                    "nonce" : "0xb62b6ed4ad634ff7",
+                    "gasUsed" : "0x029461",
+                    "hash" : "0x07c7bf4bd7ccf0a48733383b5a8146c520707147745a3be0019ec249b0ae88ed",
+                    "mixHash" : "0x1ac827cb49cf82e03c79836378a0ddb2a73a70d1e6784bbcc1bcd690e93542c5",
+                    "nonce" : "0x00b744e1594d6b5f",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
-                    "receiptTrie" : "0xd94a07f74ae4640cf63831f94f4332678853486845d5c5668037fd9183645f3b",
-                    "stateRoot" : "0x947fff05764cb9a9358e0bbafcf6e13f3ff1534f061d00004791cd53ade55676",
+                    "receiptTrie" : "0x6baf9603028b1a8bb11315caa4076134cabf251220358e820c3252eceff1d60f",
+                    "stateRoot" : "0x2afa3f753cd9dc85995c9153d823b4199270be48253f99974514063bb1797b9a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0947fff05764cb9a9358e0bbafcf6e13f3ff1534f061d00004791cd53ade55676a0ffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19a0d94a07f74ae4640cf63831f94f4332678853486845d5c5668037fd9183645f3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8302156d8203e880a02f4b2b1bba50377be7649bde8be3b2b24129769b5dd1ec641f7741c6f34c7b6788b62b6ed4ad634ff7f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451ba02a54b60324e24937c403bfa358f7d75299409b56d7844a25640b52225a9c9b85a0121593e90b3def8ad5090c27ba680bd420f01a67905bcb3e889d140a436697c0c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa02afa3f753cd9dc85995c9153d823b4199270be48253f99974514063bb1797b9aa0ffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19a06baf9603028b1a8bb11315caa4076134cabf251220358e820c3252eceff1d60fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830294618203e880a01ac827cb49cf82e03c79836378a0ddb2a73a70d1e6784bbcc1bcd690e93542c58800b744e1594d6b5ff90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451ba02a54b60324e24937c403bfa358f7d75299409b56d7844a25640b52225a9c9b85a0121593e90b3def8ad5090c27ba680bd420f01a67905bcb3e889d140a436697c0c0",
                 "transactions" : [
                     {
                         "data" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",
@@ -62,18 +62,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b2988e0cb75e7e7423dba20a57214ca891f3aaf7425898ce2aaba4ed9e17062",
-        "network" : "EIP150",
+        "lastblockhash" : "0x07c7bf4bd7ccf0a48733383b5a8146c520707147745a3be0019ec249b0ae88ed",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f6156d",
+                "balance" : "0x4563918244f69461",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761ea93",
+                "balance" : "0x0de0b6b3a7616b9f",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -86,8 +93,10 @@
                 "storage" : {
                     "0x00" : "0x01",
                     "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01"
+                    "0x0a" : "0x1fd3b816d9951dcb9aa9797d25e51a865987703ae83cd69c4658679f0350ae2b",
+                    "0x0b" : "0x29ce3d80a74ddc13784beb25ca9fbfd048a3265a32c6f38b92060c5093a0e7a7",
+                    "0x14" : "0x2c15ed1902e189486ab6b625aa982510aef6246b21a1e1bcea382da4d735e8ba",
+                    "0x15" : "0x02103e58cbd2fa8081763442ab46c26a9b8051e9b049c3948c8d7d0e139c5e3f"
                 }
             }
         },
@@ -108,10 +117,128 @@
             }
         }
     },
-    "pointMulAdd2_d20g0v0_EIP158" : {
+    "pointMulAdd2_d20g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroKnowledge/pointMulAdd2_d20g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x3d37ef",
+                    "gasUsed" : "0x029461",
+                    "hash" : "0x012dfdb7cb2548b4e9a098ce37242220f948349da4c490c3dd130c9ecf012a15",
+                    "mixHash" : "0x88ba6bb6c4d5b1542863e76561fe6498dff56f96b1800ea796620383cd88b00a",
+                    "nonce" : "0x0e20b373472daad0",
+                    "number" : "0x01",
+                    "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
+                    "receiptTrie" : "0x6baf9603028b1a8bb11315caa4076134cabf251220358e820c3252eceff1d60f",
+                    "stateRoot" : "0x2afa3f753cd9dc85995c9153d823b4199270be48253f99974514063bb1797b9a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa02afa3f753cd9dc85995c9153d823b4199270be48253f99974514063bb1797b9aa0ffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19a06baf9603028b1a8bb11315caa4076134cabf251220358e820c3252eceff1d60fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830294618203e880a088ba6bb6c4d5b1542863e76561fe6498dff56f96b1800ea796620383cd88b00a880e20b373472daad0f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451ba02a54b60324e24937c403bfa358f7d75299409b56d7844a25640b52225a9c9b85a0121593e90b3def8ad5090c27ba680bd420f01a67905bcb3e889d140a436697c0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x2a54b60324e24937c403bfa358f7d75299409b56d7844a25640b52225a9c9b85",
+                        "s" : "0x121593e90b3def8ad5090c27ba680bd420f01a67905bcb3e889d140a436697c0",
+                        "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" : "0x012dfdb7cb2548b4e9a098ce37242220f948349da4c490c3dd130c9ecf012a15",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
+                "balance" : "0x4563918244f69461",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7616b9f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60003560005260203560205260403560405260603560605260803560805260a03560a05260c03560c052604061012c60806000600060066207a120f2600055604061019060606080600060076207a120f260015561012c51600a5561014c51600b55610190516014556101b051601555601454600a5414600255601554600b5414600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x0a" : "0x1fd3b816d9951dcb9aa9797d25e51a865987703ae83cd69c4658679f0350ae2b",
+                    "0x0b" : "0x29ce3d80a74ddc13784beb25ca9fbfd048a3265a32c6f38b92060c5093a0e7a7",
+                    "0x14" : "0x2c15ed1902e189486ab6b625aa982510aef6246b21a1e1bcea382da4d735e8ba",
+                    "0x15" : "0x02103e58cbd2fa8081763442ab46c26a9b8051e9b049c3948c8d7d0e139c5e3f"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60003560005260203560205260403560405260603560605260803560805260a03560a05260c03560c052604061012c60806000600060066207a120f2600055604061019060606080600060076207a120f260015561012c51600a5561014c51600b55610190516014556101b051601555601454600a5414600255601554600b5414600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "pointMulAdd2_d20g0v0_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_d20g0v0Filler.json"
         },
         "blocks" : [
@@ -123,9 +250,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0x02156d",
-                    "hash" : "0xfc3d75b9af72bf51a3516a28b25fc1754f827f97545a7c015a36df1a93085023",
-                    "mixHash" : "0xeea9d797b6a1e1abb9a6f3aa739686b322d0a8e22bad4ec30a17f8063b7a673e",
-                    "nonce" : "0xb7caec36d927ca27",
+                    "hash" : "0x4fd4c7e44c0eeacad047064d3ceafab0ae9b7900d51aced200552077f7d5ae03",
+                    "mixHash" : "0xa97eb85e32d2006a7edabd91c4db99bcb7f6b2308d9cfae057832d7946f7b4ad",
+                    "nonce" : "0x951c7181c4255282",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
                     "receiptTrie" : "0xd94a07f74ae4640cf63831f94f4332678853486845d5c5668037fd9183645f3b",
@@ -134,7 +261,7 @@
                     "transactionsTrie" : "0xffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0947fff05764cb9a9358e0bbafcf6e13f3ff1534f061d00004791cd53ade55676a0ffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19a0d94a07f74ae4640cf63831f94f4332678853486845d5c5668037fd9183645f3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8302156d8203e880a0eea9d797b6a1e1abb9a6f3aa739686b322d0a8e22bad4ec30a17f8063b7a673e88b7caec36d927ca27f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451ba02a54b60324e24937c403bfa358f7d75299409b56d7844a25640b52225a9c9b85a0121593e90b3def8ad5090c27ba680bd420f01a67905bcb3e889d140a436697c0c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0947fff05764cb9a9358e0bbafcf6e13f3ff1534f061d00004791cd53ade55676a0ffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19a0d94a07f74ae4640cf63831f94f4332678853486845d5c5668037fd9183645f3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8302156d8203e880a0a97eb85e32d2006a7edabd91c4db99bcb7f6b2308d9cfae057832d7946f7b4ad88951c7181c4255282f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451ba02a54b60324e24937c403bfa358f7d75299409b56d7844a25640b52225a9c9b85a0121593e90b3def8ad5090c27ba680bd420f01a67905bcb3e889d140a436697c0c0",
                 "transactions" : [
                     {
                         "data" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",
@@ -171,8 +298,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc3d75b9af72bf51a3516a28b25fc1754f827f97545a7c015a36df1a93085023",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4fd4c7e44c0eeacad047064d3ceafab0ae9b7900d51aced200552077f7d5ae03",
+        "network" : "EIP150",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f6156d",
@@ -217,10 +344,10 @@
             }
         }
     },
-    "pointMulAdd2_d20g0v0_Frontier" : {
+    "pointMulAdd2_d20g0v0_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_d20g0v0Filler.json"
         },
         "blocks" : [
@@ -231,19 +358,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0x020ded",
-                    "hash" : "0x2e5a8cd88bd2042b6b7443467784ef28a591827fcaec2357a87031665b97e386",
-                    "mixHash" : "0x9bb01725c0f62481608b5bfbce23223be1c3603bfdbd9bed5b78a482cdd9b1ea",
-                    "nonce" : "0x436636d581821c5c",
+                    "gasUsed" : "0x02156d",
+                    "hash" : "0x92d5a9dbd9b210233e074cfe2a9cd0ea52398654dd6f16be52aeab9a0ba6fc22",
+                    "mixHash" : "0x8b066588f763670fce99bfec895026fde6f3ebd5421728ac3509c8344e00c2fa",
+                    "nonce" : "0x2042f2d8ce94b2c6",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
-                    "receiptTrie" : "0x7a056a37d06912de992c4ea2893ecc742d1d11fe58207fbafc3228e78341b824",
-                    "stateRoot" : "0x82b3ea1d7e6c7130fdfea72c6be868e3c093abcc440c5789584793233b97932d",
+                    "receiptTrie" : "0xd94a07f74ae4640cf63831f94f4332678853486845d5c5668037fd9183645f3b",
+                    "stateRoot" : "0x947fff05764cb9a9358e0bbafcf6e13f3ff1534f061d00004791cd53ade55676",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa082b3ea1d7e6c7130fdfea72c6be868e3c093abcc440c5789584793233b97932da0ffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19a07a056a37d06912de992c4ea2893ecc742d1d11fe58207fbafc3228e78341b824b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83020ded8203e880a09bb01725c0f62481608b5bfbce23223be1c3603bfdbd9bed5b78a482cdd9b1ea88436636d581821c5cf90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451ba02a54b60324e24937c403bfa358f7d75299409b56d7844a25640b52225a9c9b85a0121593e90b3def8ad5090c27ba680bd420f01a67905bcb3e889d140a436697c0c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0947fff05764cb9a9358e0bbafcf6e13f3ff1534f061d00004791cd53ade55676a0ffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19a0d94a07f74ae4640cf63831f94f4332678853486845d5c5668037fd9183645f3bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8302156d8203e880a08b066588f763670fce99bfec895026fde6f3ebd5421728ac3509c8344e00c2fa882042f2d8ce94b2c6f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451ba02a54b60324e24937c403bfa358f7d75299409b56d7844a25640b52225a9c9b85a0121593e90b3def8ad5090c27ba680bd420f01a67905bcb3e889d140a436697c0c0",
                 "transactions" : [
                     {
                         "data" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",
@@ -280,18 +407,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e5a8cd88bd2042b6b7443467784ef28a591827fcaec2357a87031665b97e386",
-        "network" : "Frontier",
+        "lastblockhash" : "0x92d5a9dbd9b210233e074cfe2a9cd0ea52398654dd6f16be52aeab9a0ba6fc22",
+        "network" : "EIP158",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f60ded",
+                "balance" : "0x4563918244f6156d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761f213",
+                "balance" : "0x0de0b6b3a761ea93",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -326,10 +453,10 @@
             }
         }
     },
-    "pointMulAdd2_d20g0v0_Homestead" : {
+    "pointMulAdd2_d20g0v0_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_d20g0v0Filler.json"
         },
         "blocks" : [
@@ -341,9 +468,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0x020ded",
-                    "hash" : "0x805e76b44deee21710cf903eab3dd57d4d417a97388794b94747d2b6940510bd",
-                    "mixHash" : "0xa47a7a5ccc9bb73bee000d498435fe86b575adc21c8b1f6f69f3c2c386f98c8f",
-                    "nonce" : "0x7d0994dba0bce43a",
+                    "hash" : "0xee53982bf81177de4de4b4e71e7d973404ca31a1349aa034851749b673179163",
+                    "mixHash" : "0xa2e8c59aa80597e0358c987c1f7313373932a03821cdf9f06b8b45d029ce3e4a",
+                    "nonce" : "0xa08e8bff6e2e9e1f",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
                     "receiptTrie" : "0x7a056a37d06912de992c4ea2893ecc742d1d11fe58207fbafc3228e78341b824",
@@ -352,7 +479,7 @@
                     "transactionsTrie" : "0xffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa082b3ea1d7e6c7130fdfea72c6be868e3c093abcc440c5789584793233b97932da0ffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19a07a056a37d06912de992c4ea2893ecc742d1d11fe58207fbafc3228e78341b824b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83020ded8203e880a0a47a7a5ccc9bb73bee000d498435fe86b575adc21c8b1f6f69f3c2c386f98c8f887d0994dba0bce43af90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451ba02a54b60324e24937c403bfa358f7d75299409b56d7844a25640b52225a9c9b85a0121593e90b3def8ad5090c27ba680bd420f01a67905bcb3e889d140a436697c0c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa082b3ea1d7e6c7130fdfea72c6be868e3c093abcc440c5789584793233b97932da0ffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19a07a056a37d06912de992c4ea2893ecc742d1d11fe58207fbafc3228e78341b824b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83020ded8203e880a0a2e8c59aa80597e0358c987c1f7313373932a03821cdf9f06b8b45d029ce3e4a88a08e8bff6e2e9e1ff90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451ba02a54b60324e24937c403bfa358f7d75299409b56d7844a25640b52225a9c9b85a0121593e90b3def8ad5090c27ba680bd420f01a67905bcb3e889d140a436697c0c0",
                 "transactions" : [
                     {
                         "data" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",
@@ -389,8 +516,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x805e76b44deee21710cf903eab3dd57d4d417a97388794b94747d2b6940510bd",
-        "network" : "Homestead",
+        "lastblockhash" : "0xee53982bf81177de4de4b4e71e7d973404ca31a1349aa034851749b673179163",
+        "network" : "Frontier",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f60ded",
@@ -435,10 +562,10 @@
             }
         }
     },
-    "pointMulAdd2_d20g0v0_Metropolis" : {
+    "pointMulAdd2_d20g0v0_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_d20g0v0Filler.json"
         },
         "blocks" : [
@@ -449,19 +576,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0x029461",
-                    "hash" : "0x2f78af8ae9b9e860f453f9ae2331cb4c4577b7840beda43069ab28223ccd6136",
-                    "mixHash" : "0x3143314164e459bf458f3ce3733585f120bb5f1017d172c052c3f21d3275aed8",
-                    "nonce" : "0x8df17e4e469a846d",
+                    "gasUsed" : "0x020ded",
+                    "hash" : "0xca3548e76f44069a16bd1c819ae6648283827df5b64c251cfdc87663a41cdfcd",
+                    "mixHash" : "0x6770849130458fc9012b88cad4a42eb8d0f0699dbbb618b0289b9aa3b5f706f5",
+                    "nonce" : "0x745f83953154acf3",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
-                    "receiptTrie" : "0x6baf9603028b1a8bb11315caa4076134cabf251220358e820c3252eceff1d60f",
-                    "stateRoot" : "0x2afa3f753cd9dc85995c9153d823b4199270be48253f99974514063bb1797b9a",
+                    "receiptTrie" : "0x7a056a37d06912de992c4ea2893ecc742d1d11fe58207fbafc3228e78341b824",
+                    "stateRoot" : "0x82b3ea1d7e6c7130fdfea72c6be868e3c093abcc440c5789584793233b97932d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa02afa3f753cd9dc85995c9153d823b4199270be48253f99974514063bb1797b9aa0ffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19a06baf9603028b1a8bb11315caa4076134cabf251220358e820c3252eceff1d60fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830294618203e880a03143314164e459bf458f3ce3733585f120bb5f1017d172c052c3f21d3275aed8888df17e4e469a846df90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451ba02a54b60324e24937c403bfa358f7d75299409b56d7844a25640b52225a9c9b85a0121593e90b3def8ad5090c27ba680bd420f01a67905bcb3e889d140a436697c0c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa082b3ea1d7e6c7130fdfea72c6be868e3c093abcc440c5789584793233b97932da0ffbbe8bcccad22c1a218a1878e68892c273ad05925308edb98b25c70ee246d19a07a056a37d06912de992c4ea2893ecc742d1d11fe58207fbafc3228e78341b824b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef83020ded8203e880a06770849130458fc9012b88cad4a42eb8d0f0699dbbb618b0289b9aa3b5f706f588745f83953154acf3f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451ba02a54b60324e24937c403bfa358f7d75299409b56d7844a25640b52225a9c9b85a0121593e90b3def8ad5090c27ba680bd420f01a67905bcb3e889d140a436697c0c0",
                 "transactions" : [
                     {
                         "data" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",
@@ -498,25 +625,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f78af8ae9b9e860f453f9ae2331cb4c4577b7840beda43069ab28223ccd6136",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xca3548e76f44069a16bd1c819ae6648283827df5b64c251cfdc87663a41cdfcd",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f69461",
+                "balance" : "0x4563918244f60ded",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616b9f",
+                "balance" : "0x0de0b6b3a761f213",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -529,10 +649,8 @@
                 "storage" : {
                     "0x00" : "0x01",
                     "0x01" : "0x01",
-                    "0x0a" : "0x1fd3b816d9951dcb9aa9797d25e51a865987703ae83cd69c4658679f0350ae2b",
-                    "0x0b" : "0x29ce3d80a74ddc13784beb25ca9fbfd048a3265a32c6f38b92060c5093a0e7a7",
-                    "0x14" : "0x2c15ed1902e189486ab6b625aa982510aef6246b21a1e1bcea382da4d735e8ba",
-                    "0x15" : "0x02103e58cbd2fa8081763442ab46c26a9b8051e9b049c3948c8d7d0e139c5e3f"
+                    "0x02" : "0x01",
+                    "0x03" : "0x01"
                 }
             }
         },