Hive tests with Byzantine

1 files changed, 184 insertions, 58 deletions

diff --git a/BlockchainTests/GeneralStateTests/stStaticCall/static_makeMoney_d0g0v0.json b/BlockchainTests/GeneralStateTests/stStaticCall/static_makeMoney_d0g0v0.json
index 79d39fa37..931f9f5f4 100644
--- a/BlockchainTests/GeneralStateTests/stStaticCall/static_makeMoney_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stStaticCall/static_makeMoney_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "static_makeMoney_d0g0v0_EIP150" : {
+    "static_makeMoney_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_makeMoney_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x037c94",
-                    "hash" : "0xee9c601d03a6823f0225d8a3812b1f66a5a563809fdd0318345e98838b560d47",
-                    "mixHash" : "0xec29882e75e78cf5f5dfafdaff9f8ac5fa275e23b9bd6a3f93bc6a40680fe5f3",
-                    "nonce" : "0x2486278a41d11d15",
+                    "gasUsed" : "0x036ff6",
+                    "hash" : "0x47bb67988bf52c8c071a3e860ffdb913e653d1e0d974458a349dd1d1e5608622",
+                    "mixHash" : "0x2ea098d2d0db9585f756ecee96f7b1ee63f5bd1a830727f57ef18f16e0c07744",
+                    "nonce" : "0x632eeb0c29fdd2be",
                     "number" : "0x01",
                     "parentHash" : "0xdf3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036b",
-                    "receiptTrie" : "0x928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450",
-                    "stateRoot" : "0x7893039f4cf732b9d25ba3dfcf15b81170f69257b7f16bd52349098d36611672",
+                    "receiptTrie" : "0x6649f4cd91d1780aca9edd5876d126b284f3a99035bd3f64245a7aee2f9f548d",
+                    "stateRoot" : "0x0c5026978b58520f4e3e3964288a2671be3fe6a1e060a9411d7ca963a81ffabd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0df3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07893039f4cf732b9d25ba3dfcf15b81170f69257b7f16bd52349098d36611672a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083037c948203e880a0ec29882e75e78cf5f5dfafdaff9f8ac5fa275e23b9bd6a3f93bc6a40680fe5f3882486278a41d11d15f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf90260f901f8a0df3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c5026978b58520f4e3e3964288a2671be3fe6a1e060a9411d7ca963a81ffabda057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da06649f4cd91d1780aca9edd5876d126b284f3a99035bd3f64245a7aee2f9f548db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083036ff68203e880a02ea098d2d0db9585f756ecee96f7b1ee63f5bd1a830727f57ef18f16e0c0774488632eeb0c29fdd2bef862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,25 +62,158 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da05c9b795b59e9e806e60d0f3a2787d4cd476fc31769abf187a64eda91a2d70a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee9c601d03a6823f0225d8a3812b1f66a5a563809fdd0318345e98838b560d47",
-        "network" : "EIP150",
+        "lastblockhash" : "0x47bb67988bf52c8c071a3e860ffdb913e653d1e0d974458a349dd1d1e5608622",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x7b601080600c6000396000f20060003554156009570060203560003555600052600060006000600073aaaaaaaaace5edbc8e2a8697c15331677e6ebf0b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffecfa",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f76ff6",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0bd240",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaaaaaaace5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600160015532600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7b601080600c6000396000f20060003554156009570060203560003555600052600060006000600073aaaaaaaaace5edbc8e2a8697c15331677e6ebf0b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffecfa",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaaaaaaace5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600160015532600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "static_makeMoney_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_makeMoney_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x036ff6",
+                    "hash" : "0x729df13d10187b7be7e5c12f50debe47a72af84a926ef5ea455304435941fab5",
+                    "mixHash" : "0x81451691b101dbe8a72874e04d28ea30a38d5411e66fe6218bd0c25da1035ffa",
+                    "nonce" : "0x274f113b1d05227f",
+                    "number" : "0x01",
+                    "parentHash" : "0xdf3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036b",
+                    "receiptTrie" : "0x6649f4cd91d1780aca9edd5876d126b284f3a99035bd3f64245a7aee2f9f548d",
+                    "stateRoot" : "0x0c5026978b58520f4e3e3964288a2671be3fe6a1e060a9411d7ca963a81ffabd",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0df3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c5026978b58520f4e3e3964288a2671be3fe6a1e060a9411d7ca963a81ffabda057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da06649f4cd91d1780aca9edd5876d126b284f3a99035bd3f64245a7aee2f9f548db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083036ff68203e880a081451691b101dbe8a72874e04d28ea30a38d5411e66fe6218bd0c25da1035ffa88274f113b1d05227ff862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x037c94",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3",
+                        "s" : "0x5a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6ba",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xdf3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xda05c9b795b59e9e806e60d0f3a2787d4cd476fc31769abf187a64eda91a2d70",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da05c9b795b59e9e806e60d0f3a2787d4cd476fc31769abf187a64eda91a2d70a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x729df13d10187b7be7e5c12f50debe47a72af84a926ef5ea455304435941fab5",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x7b601080600c6000396000f20060003554156009570060203560003555600052600060006000600073aaaaaaaaace5edbc8e2a8697c15331677e6ebf0b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffecfa",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77c94",
+                "balance" : "0x4563918244f76ff6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0bc5ac",
+                "balance" : "0x0bd240",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -118,10 +251,10 @@
             }
         }
     },
-    "static_makeMoney_d0g0v0_EIP158" : {
+    "static_makeMoney_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_makeMoney_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x037c94",
-                    "hash" : "0x78ce26317369f788aea913e308fdf1a91a9d5a60e408afbe4f9ef96cae49a8af",
-                    "mixHash" : "0xcdca4e5074424dd5ff05a9d118b8fc3032270751aafc852f815ffc63bec49436",
-                    "nonce" : "0x8cff17da8d10d1ad",
+                    "hash" : "0x8427694510fb7ecea14c1040bdb6ecdf72bdb9c34f5b0e4ee624de8d93546846",
+                    "mixHash" : "0x0f3dd9f5c05fdc0b64930f4c849ab6c6c9efbc4df1ab16269bf0668a3403770f",
+                    "nonce" : "0xeac612529e312518",
                     "number" : "0x01",
                     "parentHash" : "0xdf3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036b",
                     "receiptTrie" : "0x928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450",
@@ -144,7 +277,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0df3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07893039f4cf732b9d25ba3dfcf15b81170f69257b7f16bd52349098d36611672a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083037c948203e880a0cdca4e5074424dd5ff05a9d118b8fc3032270751aafc852f815ffc63bec49436888cff17da8d10d1adf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf90260f901f8a0df3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07893039f4cf732b9d25ba3dfcf15b81170f69257b7f16bd52349098d36611672a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083037c948203e880a00f3dd9f5c05fdc0b64930f4c849ab6c6c9efbc4df1ab16269bf0668a3403770f88eac612529e312518f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da05c9b795b59e9e806e60d0f3a2787d4cd476fc31769abf187a64eda91a2d70a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78ce26317369f788aea913e308fdf1a91a9d5a60e408afbe4f9ef96cae49a8af",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8427694510fb7ecea14c1040bdb6ecdf72bdb9c34f5b0e4ee624de8d93546846",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -237,10 +370,10 @@
             }
         }
     },
-    "static_makeMoney_d0g0v0_Frontier" : {
+    "static_makeMoney_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_makeMoney_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x037c94",
-                    "hash" : "0x712bf7e1e2b71869a791c73a995f121607a4516f5849578ec50e27039a0ac2a4",
-                    "mixHash" : "0xc4233f1840181795096a2382c9afdb83045360472d1c8b4a2cb00a3f25013ec3",
-                    "nonce" : "0xc7d068381ef07614",
+                    "hash" : "0x94ae228980302464c5111237f7b7db509d49d1921f4bfd73d172cc1f79d6216e",
+                    "mixHash" : "0x47676eab0410ece7871723742c4eb3d2b3bb1c3beda3195ca635a585c794ef16",
+                    "nonce" : "0xaddcc5483a33e957",
                     "number" : "0x01",
                     "parentHash" : "0xdf3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036b",
                     "receiptTrie" : "0x928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450",
@@ -263,7 +396,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0df3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07893039f4cf732b9d25ba3dfcf15b81170f69257b7f16bd52349098d36611672a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083037c948203e880a0c4233f1840181795096a2382c9afdb83045360472d1c8b4a2cb00a3f25013ec388c7d068381ef07614f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf90260f901f8a0df3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07893039f4cf732b9d25ba3dfcf15b81170f69257b7f16bd52349098d36611672a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083037c948203e880a047676eab0410ece7871723742c4eb3d2b3bb1c3beda3195ca635a585c794ef1688addcc5483a33e957f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da05c9b795b59e9e806e60d0f3a2787d4cd476fc31769abf187a64eda91a2d70a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x712bf7e1e2b71869a791c73a995f121607a4516f5849578ec50e27039a0ac2a4",
-        "network" : "Frontier",
+        "lastblockhash" : "0x94ae228980302464c5111237f7b7db509d49d1921f4bfd73d172cc1f79d6216e",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -356,10 +489,10 @@
             }
         }
     },
-    "static_makeMoney_d0g0v0_Homestead" : {
+    "static_makeMoney_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_makeMoney_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +504,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x037c94",
-                    "hash" : "0xa56002c5966579a09e1a356f478fc27208710dba621c691391e62fbdee4d524b",
-                    "mixHash" : "0x83041acdb92a8a0556aebe3634ad55e986bb27f1c17b23be9b72a0f9118535c1",
-                    "nonce" : "0xba955f47cc163743",
+                    "hash" : "0xe87fa07612c02711cc8830dc2bc2632f6f46ed310685d257427ec18afb43b1b3",
+                    "mixHash" : "0xedf5f5700e2426f5a447f83f586a04a38656f374d1e1814ed8c0a2bba2807488",
+                    "nonce" : "0x0d211e22c06c4a2b",
                     "number" : "0x01",
                     "parentHash" : "0xdf3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036b",
                     "receiptTrie" : "0x928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450",
@@ -382,7 +515,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0df3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07893039f4cf732b9d25ba3dfcf15b81170f69257b7f16bd52349098d36611672a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083037c948203e880a083041acdb92a8a0556aebe3634ad55e986bb27f1c17b23be9b72a0f9118535c188ba955f47cc163743f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf90260f901f8a0df3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07893039f4cf732b9d25ba3dfcf15b81170f69257b7f16bd52349098d36611672a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083037c948203e880a0edf5f5700e2426f5a447f83f586a04a38656f374d1e1814ed8c0a2bba2807488880d211e22c06c4a2bf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +552,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da05c9b795b59e9e806e60d0f3a2787d4cd476fc31769abf187a64eda91a2d70a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa56002c5966579a09e1a356f478fc27208710dba621c691391e62fbdee4d524b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe87fa07612c02711cc8830dc2bc2632f6f46ed310685d257427ec18afb43b1b3",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -475,10 +608,10 @@
             }
         }
     },
-    "static_makeMoney_d0g0v0_Metropolis" : {
+    "static_makeMoney_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_makeMoney_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -489,19 +622,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x036ff6",
-                    "hash" : "0x5a6ef251f06ce4685bf9f0529b86d7086fb757c83c4e6e0e3a8e9ce094fe373a",
-                    "mixHash" : "0x4cfde8a18fc9f7520418d915e9af3152aaf813efd456929809bf8484283eb7cc",
-                    "nonce" : "0xba62b98d219dbd01",
+                    "gasUsed" : "0x037c94",
+                    "hash" : "0xe5a6e170f4320a97b511764d4e8fe0b3c3c29946ba6830cae1c99a6e14c918b6",
+                    "mixHash" : "0xe16d1afe7a708697e31301f9c47176d95a3afef173b59145fbba774e43474fa2",
+                    "nonce" : "0xf6526d1e0d68cf1f",
                     "number" : "0x01",
                     "parentHash" : "0xdf3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036b",
-                    "receiptTrie" : "0x6649f4cd91d1780aca9edd5876d126b284f3a99035bd3f64245a7aee2f9f548d",
-                    "stateRoot" : "0x0c5026978b58520f4e3e3964288a2671be3fe6a1e060a9411d7ca963a81ffabd",
+                    "receiptTrie" : "0x928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450",
+                    "stateRoot" : "0x7893039f4cf732b9d25ba3dfcf15b81170f69257b7f16bd52349098d36611672",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0df3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c5026978b58520f4e3e3964288a2671be3fe6a1e060a9411d7ca963a81ffabda057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da06649f4cd91d1780aca9edd5876d126b284f3a99035bd3f64245a7aee2f9f548db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083036ff68203e880a04cfde8a18fc9f7520418d915e9af3152aaf813efd456929809bf8484283eb7cc88ba62b98d219dbd01f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf90260f901f8a0df3127b595470efd49ac52f2a5820ae34b38ddf1180c92a8d01713ce2e63036ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07893039f4cf732b9d25ba3dfcf15b81170f69257b7f16bd52349098d36611672a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0928cc724819b8ae3a6485dda63641f617f9c69809da898304d3ea6ed9efec450b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083037c948203e880a0e16d1afe7a708697e31301f9c47176d95a3afef173b59145fbba774e43474fa288f6526d1e0d68cf1ff862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,32 +671,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da05c9b795b59e9e806e60d0f3a2787d4cd476fc31769abf187a64eda91a2d70a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a6ef251f06ce4685bf9f0529b86d7086fb757c83c4e6e0e3a8e9ce094fe373a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe5a6e170f4320a97b511764d4e8fe0b3c3c29946ba6830cae1c99a6e14c918b6",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a764000a",
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7b601080600c6000396000f20060003554156009570060203560003555600052600060006000600073aaaaaaaaace5edbc8e2a8697c15331677e6ebf0b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffecfa",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f76ff6",
+                "balance" : "0x4563918244f77c94",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0bd240",
+                "balance" : "0x0bc5ac",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {