Hive tests with Byzantine

1 files changed, 173 insertions, 59 deletions

diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0.json
index 3772e581c..69bf976f7 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODESha256_3_prefix0_d0g0v0_EIP150" : {
+    "CALLCODESha256_3_prefix0_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/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0xb76b7eb0d68bf6da1a54ff77bdbed919f3e264a14b0cb6c19fa4ca5c6b68aaea",
-                    "mixHash" : "0x89c6cd07964f57a90cf6b04ba2b35d3e2a2e38630b8ae55a760150d5c61b3e2a",
-                    "nonce" : "0x547f1c6f3a314770",
+                    "hash" : "0x3fbe306ed7f2403447f9b2e16d5cb908ae7fad87e01f6d6d757da84b285ae477",
+                    "mixHash" : "0xefac8abdf70bbf0f284658f364982360ecbc684bb57c92f391b711871c40f1c8",
+                    "nonce" : "0x708b97459ddefb26",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
-                    "receiptTrie" : "0x1393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0",
-                    "stateRoot" : "0x62311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7b",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x2e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a089c6cd07964f57a90cf6b04ba2b35d3e2a2e38630b8ae55a760150d5c61b3e2a88547f1c6f3a314770f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0efac8abdf70bbf0f284658f364982360ecbc684bb57c92f391b711871c40f1c888708b97459ddefb26f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb76b7eb0d68bf6da1a54ff77bdbed919f3e264a14b0cb6c19fa4ca5c6b68aaea",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3fbe306ed7f2403447f9b2e16d5cb908ae7fad87e01f6d6d757da84b285ae477",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODESha256_3_prefix0_d0g0v0_EIP158" : {
+    "CALLCODESha256_3_prefix0_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0xa4bc035b1870da5270c7797a429cf5bf16a2697ec1d522cb7b3f13a4b43d024b",
+                    "mixHash" : "0xa69d403076bae27f2ba891bb0cd29bf9ffce730038dfdec2e99e7eaad2c1bc0c",
+                    "nonce" : "0x2bbeac6180694dca",
+                    "number" : "0x01",
+                    "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
+                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
+                    "stateRoot" : "0x2e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0a69d403076bae27f2ba891bb0cd29bf9ffce730038dfdec2e99e7eaad2c1bc0c882bbeac6180694dcaf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x77e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa4bc035b1870da5270c7797a429cf5bf16a2697ec1d522cb7b3f13a4b43d024b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f188",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76187d8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODESha256_3_prefix0_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/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf188",
-                    "hash" : "0x99fc29c1ee1b6569350b27f92167bca6f9e642667e50196027630cfcee36bb91",
-                    "mixHash" : "0x668656224b7915892a146419004489fc6891e8de88294c0b775a83b180f967da",
-                    "nonce" : "0xe1b9e99f0fe63bfc",
+                    "hash" : "0x05fdb7ce0511e8b4297c8826e57d2a4eb37fbe14253eec214695684dc5a7a6be",
+                    "mixHash" : "0xb7cfa5f58227f507b6ae6ac33fd3303fb5f51abcbde3a5c6fa18ebe00f2b6cc5",
+                    "nonce" : "0x5b5d64c339135abf",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
                     "receiptTrie" : "0x1393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0668656224b7915892a146419004489fc6891e8de88294c0b775a83b180f967da88e1b9e99f0fe63bfcf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0b7cfa5f58227f507b6ae6ac33fd3303fb5f51abcbde3a5c6fa18ebe00f2b6cc5885b5d64c339135abff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99fc29c1ee1b6569350b27f92167bca6f9e642667e50196027630cfcee36bb91",
-        "network" : "EIP158",
+        "lastblockhash" : "0x05fdb7ce0511e8b4297c8826e57d2a4eb37fbe14253eec214695684dc5a7a6be",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODESha256_3_prefix0_d0g0v0_Frontier" : {
+    "CALLCODESha256_3_prefix0_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/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeef4",
-                    "hash" : "0x7bf90123ef3036032373587d8c32ad9da1e3e9c9e62f4f3e38aac04747dc95ab",
-                    "mixHash" : "0x18519d39621a8318ee38216ed50366df62fda1fc4bd91f924ae26e2503c2d898",
-                    "nonce" : "0xeca67ac02878701f",
+                    "gasUsed" : "0xf188",
+                    "hash" : "0x6700dd05929b08f18dd4da6b3ea06ca3e63a27b9d41a078fff168e63793bab81",
+                    "mixHash" : "0x226165b5d3fbf86bff809388cc7945c1d6c6f50ee4316fcf74f54ca19b8e6e19",
+                    "nonce" : "0xd5f57afc23bcd547",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
-                    "receiptTrie" : "0x33a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9de",
-                    "stateRoot" : "0x77b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56b",
+                    "receiptTrie" : "0x1393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0",
+                    "stateRoot" : "0x62311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba033a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a018519d39621a8318ee38216ed50366df62fda1fc4bd91f924ae26e2503c2d89888eca67ac02878701ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062311155ba74c49f5053b91c8f93a63fb3dfe5fca609f15ba9eeb557f9ed1c7ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01393655dafd9b97f6bccb24b32ceed7a36a0a1f60db5d3b1dc49ef91fc3354b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0226165b5d3fbf86bff809388cc7945c1d6c6f50ee4316fcf74f54ca19b8e6e1988d5f57afc23bcd547f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bf90123ef3036032373587d8c32ad9da1e3e9c9e62f4f3e38aac04747dc95ab",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6700dd05929b08f18dd4da6b3ea06ca3e63a27b9d41a078fff168e63793bab81",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eef4",
+                "balance" : "0x4563918244f4f188",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618a6c",
+                "balance" : "0x0de0b6b3a76187d8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODESha256_3_prefix0_d0g0v0_Homestead" : {
+    "CALLCODESha256_3_prefix0_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/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeef4",
-                    "hash" : "0xd3776e2985f951688ff32b34fcaa22939970e73d5deab3529daccf6055e1f8df",
-                    "mixHash" : "0xad4ad7b4b2612098c83a8f05cecfe80e58e06ff4397360a4b9145feb8e66d390",
-                    "nonce" : "0x7357f7e15e7d4228",
+                    "hash" : "0x6e97bd556bb959b633930f8f76d8acc44597c2fd1f897fd25c65c3414741f0b5",
+                    "mixHash" : "0x203ff1729f2d9885cfa0d60c4d233c48060cc0bc26fd4a08332d6cd49366a5ca",
+                    "nonce" : "0x7e3037ea18a1835a",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
                     "receiptTrie" : "0x33a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9de",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba033a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a0ad4ad7b4b2612098c83a8f05cecfe80e58e06ff4397360a4b9145feb8e66d390887357f7e15e7d4228f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba033a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a0203ff1729f2d9885cfa0d60c4d233c48060cc0bc26fd4a08332d6cd49366a5ca887e3037ea18a1835af865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3776e2985f951688ff32b34fcaa22939970e73d5deab3529daccf6055e1f8df",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6e97bd556bb959b633930f8f76d8acc44597c2fd1f897fd25c65c3414741f0b5",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODESha256_3_prefix0_d0g0v0_Metropolis" : {
+    "CALLCODESha256_3_prefix0_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/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf188",
-                    "hash" : "0x33efdeacbd3d10e763b6c21cff5cffeabf41500d07ec0c170e0978e870807b1c",
-                    "mixHash" : "0xa72a693c99468ccb88f7730c2af61096e01f917fc64ce7eacffd14efb2eedc33",
-                    "nonce" : "0x9ab3b00d5f91a1fa",
+                    "gasUsed" : "0xeef4",
+                    "hash" : "0x04570ac25a95d9210da1274933c89014f205a39f48f1c65da03de29e7562c584",
+                    "mixHash" : "0xc28cb6f68f9d6d1a0de631cf1a6d05196e7e063b348ff95582edb2439e421a3c",
+                    "nonce" : "0x4b3d7ba62b109669",
                     "number" : "0x01",
                     "parentHash" : "0x3b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8",
-                    "receiptTrie" : "0x30ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740",
-                    "stateRoot" : "0x2e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1",
+                    "receiptTrie" : "0x33a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9de",
+                    "stateRoot" : "0x77b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e6d0651640de994ed4d43ec9a1a3ee019a00647047d29617f5a665454d8e6e1a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba030ee5fab59b2abde8a622e53b1870ae6bae955eb7b592dbd9da8fc5276612740b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1888203e880a0a72a693c99468ccb88f7730c2af61096e01f917fc64ce7eacffd14efb2eedc33889ab3b00d5f91a1faf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a03b02f7cd5d6c9a529d887618e6d66886741d3f8cdadde2552ae87d08b35a63f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077b6cfd46e7aa7b9adbb99b1745689c6fe7c33f71d299c2eabedfc3d961cd56ba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba033a2deb5f93a90a0bef6ea4f4e1993ee022f4fcba27035bc9b76d13bf7c8f9deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eef48203e880a0c28cb6f68f9d6d1a0de631cf1a6d05196e7e063b348ff95582edb2439e421a3c884b3d7ba62b109669f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077e3d89a1857f175aea357fdc0971c4482545f83833421c1185ea2c528c9fc7da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33efdeacbd3d10e763b6c21cff5cffeabf41500d07ec0c170e0978e870807b1c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x04570ac25a95d9210da1274933c89014f205a39f48f1c65da03de29e7562c584",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f188",
+                "balance" : "0x4563918244f4eef4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76187d8",
+                "balance" : "0x0de0b6b3a7618a6c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {