Hive tests with Byzantine

1 files changed, 188 insertions, 68 deletions

diff --git a/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d19g0v0.json b/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d19g0v0.json
index 7de6e27c3..b94b33a36 100644
--- a/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d19g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointMulAdd2_d19g0v0.json
@@ -1,8 +1,8 @@
 {
-    "pointMulAdd2_d19g0v0_EIP150" : {
+    "pointMulAdd2_d19g0v0_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_d19g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0x0205ad",
-                    "hash" : "0x047f5942d3725a1cde5f837e0fbaeda1ce4e44bff3bc9277dff406b2df4504bd",
-                    "mixHash" : "0x938e6d1d6c193b26063566f8800958360356e9617424ddaf2c7ae8cedadfa5ba",
-                    "nonce" : "0xc8d66a15c9b8f6fa",
+                    "gasUsed" : "0x02f9d1",
+                    "hash" : "0xf30e076e0262034d2322e664d8fa0bb4482607b2443f2b052b071d2252dbb755",
+                    "mixHash" : "0x461f374d9d86e90203a49c0542adbff2d45bbbf9929c0b187d11d29fd639decc",
+                    "nonce" : "0x20c03d8dd3017f34",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
-                    "receiptTrie" : "0xef17d3b48154544f529f697c8d9b82ebd1234305df236e463712c568d19a4456",
-                    "stateRoot" : "0x7e54d82d8bf63fadf35d86dfd78e09ab33ff65869f64e1b65d1b697185b39b1f",
+                    "receiptTrie" : "0x996aff37969d11ceb70de6d6c44f578d1bcf351a5bbebbd4a7396ebc0885dc0e",
+                    "stateRoot" : "0x5076680a27de3f05a0b3a5b343a355a8bc7f5547c53fe41cad11b4c6f126af9f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x20d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918aba",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa07e54d82d8bf63fadf35d86dfd78e09ab33ff65869f64e1b65d1b697185b39b1fa020d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918abaa0ef17d3b48154544f529f697c8d9b82ebd1234305df236e463712c568d19a4456b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830205ad8203e880a0938e6d1d6c193b26063566f8800958360356e9617424ddaf2c7ae8cedadfa5ba88c8d66a15c9b8f6faf90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd461ba033ce52abf658f1fab2ea4c843dd7484f53e21b9b8c738ae14829622f5e695611a00bd456b3a03cd7782670d1232ee0e09ed736109dfcedd0c75f11e476c3fd6da9c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa05076680a27de3f05a0b3a5b343a355a8bc7f5547c53fe41cad11b4c6f126af9fa020d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918abaa0996aff37969d11ceb70de6d6c44f578d1bcf351a5bbebbd4a7396ebc0885dc0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8302f9d18203e880a0461f374d9d86e90203a49c0542adbff2d45bbbf9929c0b187d11d29fd639decc8820c03d8dd3017f34f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd461ba033ce52abf658f1fab2ea4c843dd7484f53e21b9b8c738ae14829622f5e695611a00bd456b3a03cd7782670d1232ee0e09ed736109dfcedd0c75f11e476c3fd6da9c0",
                 "transactions" : [
                     {
                         "data" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",
@@ -62,18 +62,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x047f5942d3725a1cde5f837e0fbaeda1ce4e44bff3bc9277dff406b2df4504bd",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf30e076e0262034d2322e664d8fa0bb4482607b2443f2b052b071d2252dbb755",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f605ad",
+                "balance" : "0x4563918244f6f9d1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761fa53",
+                "balance" : "0x0de0b6b3a761062f",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -87,7 +94,11 @@
                     "0x00" : "0x01",
                     "0x01" : "0x01",
                     "0x02" : "0x01",
-                    "0x03" : "0x01"
+                    "0x03" : "0x01",
+                    "0x0a" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628",
+                    "0x0b" : "0x069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad",
+                    "0x14" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628",
+                    "0x15" : "0x069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad"
                 }
             }
         },
@@ -108,10 +119,130 @@
             }
         }
     },
-    "pointMulAdd2_d19g0v0_EIP158" : {
+    "pointMulAdd2_d19g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroKnowledge/pointMulAdd2_d19g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x3d37ef",
+                    "gasUsed" : "0x02f9d1",
+                    "hash" : "0x931d0dae7be2b0c5628d079fe922ddfbc364212b75f6887075f7d02776466a35",
+                    "mixHash" : "0xea96d3e96cc38e19b45d7e1d93761dfb0ba6c5a9e8652bb023d40057eadc1811",
+                    "nonce" : "0x2ffe5e1c68cafb3f",
+                    "number" : "0x01",
+                    "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
+                    "receiptTrie" : "0x996aff37969d11ceb70de6d6c44f578d1bcf351a5bbebbd4a7396ebc0885dc0e",
+                    "stateRoot" : "0x5076680a27de3f05a0b3a5b343a355a8bc7f5547c53fe41cad11b4c6f126af9f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x20d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918aba",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa05076680a27de3f05a0b3a5b343a355a8bc7f5547c53fe41cad11b4c6f126af9fa020d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918abaa0996aff37969d11ceb70de6d6c44f578d1bcf351a5bbebbd4a7396ebc0885dc0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8302f9d18203e880a0ea96d3e96cc38e19b45d7e1d93761dfb0ba6c5a9e8652bb023d40057eadc1811882ffe5e1c68cafb3ff90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd461ba033ce52abf658f1fab2ea4c843dd7484f53e21b9b8c738ae14829622f5e695611a00bd456b3a03cd7782670d1232ee0e09ed736109dfcedd0c75f11e476c3fd6da9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x33ce52abf658f1fab2ea4c843dd7484f53e21b9b8c738ae14829622f5e695611",
+                        "s" : "0x0bd456b3a03cd7782670d1232ee0e09ed736109dfcedd0c75f11e476c3fd6da9",
+                        "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" : "0x931d0dae7be2b0c5628d079fe922ddfbc364212b75f6887075f7d02776466a35",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
+                "balance" : "0x4563918244f6f9d1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761062f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60003560005260203560205260403560405260603560605260803560805260a03560a05260c03560c052604061012c60806000600060066207a120f2600055604061019060606080600060076207a120f260015561012c51600a5561014c51600b55610190516014556101b051601555601454600a5414600255601554600b5414600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x0a" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628",
+                    "0x0b" : "0x069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad",
+                    "0x14" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628",
+                    "0x15" : "0x069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60003560005260203560205260403560405260603560605260803560805260a03560a05260c03560c052604061012c60806000600060066207a120f2600055604061019060606080600060076207a120f260015561012c51600a5561014c51600b55610190516014556101b051601555601454600a5414600255601554600b5414600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "pointMulAdd2_d19g0v0_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_d19g0v0Filler.json"
         },
         "blocks" : [
@@ -123,9 +254,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0x0205ad",
-                    "hash" : "0x89862d1df4b4ba6435de35fd0535a172fdd427664fa9334d8e4c438680cba3b0",
-                    "mixHash" : "0xc9810fbaf243d16ca812688aedee67420c81d75daaeb7531589400abba148971",
-                    "nonce" : "0x0f4f94bee7b2e8ff",
+                    "hash" : "0x2bcd8ea364368e3f86ed766d7ce4fbe6ef8974d5560ffc7cc3387607f361155a",
+                    "mixHash" : "0xbecc388e87fa8d4770d4d68ff39c7262b568e3a4abc99c4a9416f67707d3553c",
+                    "nonce" : "0x7db540d6d6b65ab9",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
                     "receiptTrie" : "0xef17d3b48154544f529f697c8d9b82ebd1234305df236e463712c568d19a4456",
@@ -134,7 +265,7 @@
                     "transactionsTrie" : "0x20d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918aba",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa07e54d82d8bf63fadf35d86dfd78e09ab33ff65869f64e1b65d1b697185b39b1fa020d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918abaa0ef17d3b48154544f529f697c8d9b82ebd1234305df236e463712c568d19a4456b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830205ad8203e880a0c9810fbaf243d16ca812688aedee67420c81d75daaeb7531589400abba148971880f4f94bee7b2e8fff90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd461ba033ce52abf658f1fab2ea4c843dd7484f53e21b9b8c738ae14829622f5e695611a00bd456b3a03cd7782670d1232ee0e09ed736109dfcedd0c75f11e476c3fd6da9c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa07e54d82d8bf63fadf35d86dfd78e09ab33ff65869f64e1b65d1b697185b39b1fa020d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918abaa0ef17d3b48154544f529f697c8d9b82ebd1234305df236e463712c568d19a4456b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830205ad8203e880a0becc388e87fa8d4770d4d68ff39c7262b568e3a4abc99c4a9416f67707d3553c887db540d6d6b65ab9f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd461ba033ce52abf658f1fab2ea4c843dd7484f53e21b9b8c738ae14829622f5e695611a00bd456b3a03cd7782670d1232ee0e09ed736109dfcedd0c75f11e476c3fd6da9c0",
                 "transactions" : [
                     {
                         "data" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",
@@ -171,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89862d1df4b4ba6435de35fd0535a172fdd427664fa9334d8e4c438680cba3b0",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2bcd8ea364368e3f86ed766d7ce4fbe6ef8974d5560ffc7cc3387607f361155a",
+        "network" : "EIP150",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f605ad",
@@ -217,10 +348,10 @@
             }
         }
     },
-    "pointMulAdd2_d19g0v0_Frontier" : {
+    "pointMulAdd2_d19g0v0_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_d19g0v0Filler.json"
         },
         "blocks" : [
@@ -231,19 +362,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0x01fe2d",
-                    "hash" : "0xf62c0e7e62c495f1f6949b36baab5c4e9b80f0acb3a08bca89617df9a4b545de",
-                    "mixHash" : "0xfc6d1b43c77b47a611409127ad09c7e4f7f7f58dd4a4b265b237db6c28e7a64a",
-                    "nonce" : "0xb50370a852f8c1ff",
+                    "gasUsed" : "0x0205ad",
+                    "hash" : "0x8eaee59f85a8f1b7fd6a2b329d10a889c42b150ba47499f6071d5a07ff7d42c1",
+                    "mixHash" : "0x3a95e54ee1524078226ba64bc03590e837c60347285f193938887d0858e856b2",
+                    "nonce" : "0x9db5bd9b30a16d74",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
-                    "receiptTrie" : "0xb804fff39afa6c5f49cba04fb984625928fb6a98e8b5be36b31d7c9b57372949",
-                    "stateRoot" : "0x94d04289113e353dbe20f463ae633b3230c89e15089d3659ce10e278dee7dd86",
+                    "receiptTrie" : "0xef17d3b48154544f529f697c8d9b82ebd1234305df236e463712c568d19a4456",
+                    "stateRoot" : "0x7e54d82d8bf63fadf35d86dfd78e09ab33ff65869f64e1b65d1b697185b39b1f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x20d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918aba",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa094d04289113e353dbe20f463ae633b3230c89e15089d3659ce10e278dee7dd86a020d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918abaa0b804fff39afa6c5f49cba04fb984625928fb6a98e8b5be36b31d7c9b57372949b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8301fe2d8203e880a0fc6d1b43c77b47a611409127ad09c7e4f7f7f58dd4a4b265b237db6c28e7a64a88b50370a852f8c1fff90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd461ba033ce52abf658f1fab2ea4c843dd7484f53e21b9b8c738ae14829622f5e695611a00bd456b3a03cd7782670d1232ee0e09ed736109dfcedd0c75f11e476c3fd6da9c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa07e54d82d8bf63fadf35d86dfd78e09ab33ff65869f64e1b65d1b697185b39b1fa020d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918abaa0ef17d3b48154544f529f697c8d9b82ebd1234305df236e463712c568d19a4456b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef830205ad8203e880a03a95e54ee1524078226ba64bc03590e837c60347285f193938887d0858e856b2889db5bd9b30a16d74f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd461ba033ce52abf658f1fab2ea4c843dd7484f53e21b9b8c738ae14829622f5e695611a00bd456b3a03cd7782670d1232ee0e09ed736109dfcedd0c75f11e476c3fd6da9c0",
                 "transactions" : [
                     {
                         "data" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",
@@ -280,18 +411,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf62c0e7e62c495f1f6949b36baab5c4e9b80f0acb3a08bca89617df9a4b545de",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8eaee59f85a8f1b7fd6a2b329d10a889c42b150ba47499f6071d5a07ff7d42c1",
+        "network" : "EIP158",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f5fe2d",
+                "balance" : "0x4563918244f605ad",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76201d3",
+                "balance" : "0x0de0b6b3a761fa53",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -326,10 +457,10 @@
             }
         }
     },
-    "pointMulAdd2_d19g0v0_Homestead" : {
+    "pointMulAdd2_d19g0v0_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_d19g0v0Filler.json"
         },
         "blocks" : [
@@ -341,9 +472,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0x01fe2d",
-                    "hash" : "0xa33edb3cf101cedaeda107fccb44fcb38f047a134f8ab0a4b81168e6a6195048",
-                    "mixHash" : "0x265f9118fa7f079d877da1be2f9d85ae2a8e5b02d44756bbd47cbafe0d0001b4",
-                    "nonce" : "0xd2933f03a9a5e64c",
+                    "hash" : "0x79793b60fdae420eac1cc32c14184dcb92708cd690ffea587b86120a0046f4fc",
+                    "mixHash" : "0xb54e3fde850b3505d7fade2c4f9df5bea8f0cc3e371d40fc303f1ca6a10b1da7",
+                    "nonce" : "0xf7bd7af6f89402ea",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
                     "receiptTrie" : "0xb804fff39afa6c5f49cba04fb984625928fb6a98e8b5be36b31d7c9b57372949",
@@ -352,7 +483,7 @@
                     "transactionsTrie" : "0x20d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918aba",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa094d04289113e353dbe20f463ae633b3230c89e15089d3659ce10e278dee7dd86a020d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918abaa0b804fff39afa6c5f49cba04fb984625928fb6a98e8b5be36b31d7c9b57372949b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8301fe2d8203e880a0265f9118fa7f079d877da1be2f9d85ae2a8e5b02d44756bbd47cbafe0d0001b488d2933f03a9a5e64cf90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd461ba033ce52abf658f1fab2ea4c843dd7484f53e21b9b8c738ae14829622f5e695611a00bd456b3a03cd7782670d1232ee0e09ed736109dfcedd0c75f11e476c3fd6da9c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa094d04289113e353dbe20f463ae633b3230c89e15089d3659ce10e278dee7dd86a020d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918abaa0b804fff39afa6c5f49cba04fb984625928fb6a98e8b5be36b31d7c9b57372949b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8301fe2d8203e880a0b54e3fde850b3505d7fade2c4f9df5bea8f0cc3e371d40fc303f1ca6a10b1da788f7bd7af6f89402eaf90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd461ba033ce52abf658f1fab2ea4c843dd7484f53e21b9b8c738ae14829622f5e695611a00bd456b3a03cd7782670d1232ee0e09ed736109dfcedd0c75f11e476c3fd6da9c0",
                 "transactions" : [
                     {
                         "data" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",
@@ -389,8 +520,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa33edb3cf101cedaeda107fccb44fcb38f047a134f8ab0a4b81168e6a6195048",
-        "network" : "Homestead",
+        "lastblockhash" : "0x79793b60fdae420eac1cc32c14184dcb92708cd690ffea587b86120a0046f4fc",
+        "network" : "Frontier",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f5fe2d",
@@ -435,10 +566,10 @@
             }
         }
     },
-    "pointMulAdd2_d19g0v0_Metropolis" : {
+    "pointMulAdd2_d19g0v0_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_d19g0v0Filler.json"
         },
         "blocks" : [
@@ -449,19 +580,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0x02f9d1",
-                    "hash" : "0x0d07a95ab40648860c5e2a98217fa3ab3c26522eb8948ac4e7138a25c600aa45",
-                    "mixHash" : "0xa7a67d42d2b17030be45cdfbe24e1350f06201a123700abea4376264bc5b0304",
-                    "nonce" : "0xeffbe9d69db5de93",
+                    "gasUsed" : "0x01fe2d",
+                    "hash" : "0x2c470fdcb2a2c941913f5d4205c4d960db12bd94c69a12ee52b9ca281aa6383b",
+                    "mixHash" : "0xa288bdefbefccf487ecdf92643a9d9c04062dc741225405b1d28b7d629ec988a",
+                    "nonce" : "0x137916eee3837a2f",
                     "number" : "0x01",
                     "parentHash" : "0x9b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1def",
-                    "receiptTrie" : "0x996aff37969d11ceb70de6d6c44f578d1bcf351a5bbebbd4a7396ebc0885dc0e",
-                    "stateRoot" : "0x5076680a27de3f05a0b3a5b343a355a8bc7f5547c53fe41cad11b4c6f126af9f",
+                    "receiptTrie" : "0xb804fff39afa6c5f49cba04fb984625928fb6a98e8b5be36b31d7c9b57372949",
+                    "stateRoot" : "0x94d04289113e353dbe20f463ae633b3230c89e15089d3659ce10e278dee7dd86",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x20d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918aba",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa05076680a27de3f05a0b3a5b343a355a8bc7f5547c53fe41cad11b4c6f126af9fa020d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918abaa0996aff37969d11ceb70de6d6c44f578d1bcf351a5bbebbd4a7396ebc0885dc0eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8302f9d18203e880a0a7a67d42d2b17030be45cdfbe24e1350f06201a123700abea4376264bc5b030488effbe9d69db5de93f90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd461ba033ce52abf658f1fab2ea4c843dd7484f53e21b9b8c738ae14829622f5e695611a00bd456b3a03cd7782670d1232ee0e09ed736109dfcedd0c75f11e476c3fd6da9c0",
+                "rlp" : "0xf90343f901f8a09b25016c45ce0e295a463681361471a29c00aea06cba17cbc22894ce6d2c1defa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa094d04289113e353dbe20f463ae633b3230c89e15089d3659ce10e278dee7dd86a020d025a5fe237e2d7943651116ff132dc9a932b27d97475a7cca529a41918abaa0b804fff39afa6c5f49cba04fb984625928fb6a98e8b5be36b31d7c9b57372949b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8301fe2d8203e880a0a288bdefbefccf487ecdf92643a9d9c04062dc741225405b1d28b7d629ec988a88137916eee3837a2ff90144f901410101831e848094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8e00ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd461ba033ce52abf658f1fab2ea4c843dd7484f53e21b9b8c738ae14829622f5e695611a00bd456b3a03cd7782670d1232ee0e09ed736109dfcedd0c75f11e476c3fd6da9c0",
                 "transactions" : [
                     {
                         "data" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",
@@ -498,25 +629,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0a4db92ceb60668ffcb9642d55fa7fe34cc341b53029d31394d82f0c61462bd99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d07a95ab40648860c5e2a98217fa3ab3c26522eb8948ac4e7138a25c600aa45",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2c470fdcb2a2c941913f5d4205c4d960db12bd94c69a12ee52b9ca281aa6383b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f6f9d1",
+                "balance" : "0x4563918244f5fe2d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761062f",
+                "balance" : "0x0de0b6b3a76201d3",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -530,11 +654,7 @@
                     "0x00" : "0x01",
                     "0x01" : "0x01",
                     "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x0a" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628",
-                    "0x0b" : "0x069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad",
-                    "0x14" : "0x0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628",
-                    "0x15" : "0x069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad"
+                    "0x03" : "0x01"
                 }
             }
         },