Hive tests with Byzantine

1 files changed, 187 insertions, 47 deletions

diff --git a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0.json
index b7225ef36..7fa09ece1 100644
--- a/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_EIP150" : {
+    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_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/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x3045250114ae005da8d85d2d90b1f9b2db555219a77e0202545af6589e830895",
-                    "mixHash" : "0x6b6300036dd96e4c832c0635a1d254e6dbfa7ded6a79d9f22d5c55688f09f596",
-                    "nonce" : "0x4fb1a669003b36cb",
+                    "hash" : "0x7567dc9d053f8cc6da4ec3c1365ac9fd63f7efb70e943bb60e50aa52be47e8ba",
+                    "mixHash" : "0x40d76f89b3585e3bb5786b4b08a424966fd7f5ef187366ad973439c24f514bcf",
+                    "nonce" : "0x14a0d89a1fbb09cc",
                     "number" : "0x01",
                     "parentHash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
-                    "receiptTrie" : "0x717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5a",
-                    "stateRoot" : "0xd2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0",
+                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
+                    "stateRoot" : "0x8f4a26645f4f8e8ffdb43297e5c19413c90a5443371763fff0d5e0e9819290b4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a06b6300036dd96e4c832c0635a1d254e6dbfa7ded6a79d9f22d5c55688f09f596884fb1a669003b36cbf862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f4a26645f4f8e8ffdb43297e5c19413c90a5443371763fff0d5e0e9819290b4a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a040d76f89b3585e3bb5786b4b08a424966fd7f5ef187366ad973439c24f514bcf8814a0d89a1fbb09ccf862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3045250114ae005da8d85d2d90b1f9b2db555219a77e0202545af6589e830895",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7567dc9d053f8cc6da4ec3c1365ac9fd63f7efb70e943bb60e50aa52be47e8ba",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000114620927c0f1600955",
@@ -132,10 +139,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_EIP158" : {
+    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -147,18 +154,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x9dec4747252cb6feb38f46c704a3333ec744dd47699516eef8fd4500e632112b",
-                    "mixHash" : "0xe62969300d97d4867219ba7917b5805d137f01768162adcdd342cf38ab8f5fb6",
-                    "nonce" : "0xfd9a1a6bacd547a5",
+                    "hash" : "0xfe4930e304dbca7284062622e5540a86acad1fe18540ff8e46118a117d588e08",
+                    "mixHash" : "0x458056e802651ebf4416998eb2219678cc6178a757524b8033d4187ddbee0e18",
+                    "nonce" : "0x05e5658abc64ed07",
                     "number" : "0x01",
                     "parentHash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
-                    "receiptTrie" : "0x717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5a",
-                    "stateRoot" : "0xd2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0",
+                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
+                    "stateRoot" : "0x8f4a26645f4f8e8ffdb43297e5c19413c90a5443371763fff0d5e0e9819290b4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0e62969300d97d4867219ba7917b5805d137f01768162adcdd342cf38ab8f5fb688fd9a1a6bacd547a5f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f4a26645f4f8e8ffdb43297e5c19413c90a5443371763fff0d5e0e9819290b4a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0458056e802651ebf4416998eb2219678cc6178a757524b8033d4187ddbee0e188805e5658abc64ed07f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -195,9 +202,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9dec4747252cb6feb38f46c704a3333ec744dd47699516eef8fd4500e632112b",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfe4930e304dbca7284062622e5540a86acad1fe18540ff8e46118a117d588e08",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000114620927c0f1600955",
@@ -265,10 +279,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_Frontier" : {
+    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_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/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -280,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0xee28bfb30534a8b9a0ece8c6966948c8a1a99fe762057d06566b0c0fbdb61ade",
-                    "mixHash" : "0xeb0e0b0182277404e3ea48bed3a0c4dbcb90964f78dc4d47a4ffcb87b337b6ba",
-                    "nonce" : "0xbf66f384a2e9d8a5",
+                    "hash" : "0x8c1d421dfadab60c71714ff63f4daf40069b61e513be9ba8c1ed8b3468ce368e",
+                    "mixHash" : "0x92a671a4b11ab5ab7adcf606bc189f040d9a6f52f3fde91d46d628e232923544",
+                    "nonce" : "0x7bbf4777ecab91fa",
                     "number" : "0x01",
                     "parentHash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
                     "receiptTrie" : "0x717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5a",
@@ -291,7 +305,7 @@
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0eb0e0b0182277404e3ea48bed3a0c4dbcb90964f78dc4d47a4ffcb87b337b6ba88bf66f384a2e9d8a5f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a092a671a4b11ab5ab7adcf606bc189f040d9a6f52f3fde91d46d628e232923544887bbf4777ecab91faf862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -328,8 +342,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee28bfb30534a8b9a0ece8c6966948c8a1a99fe762057d06566b0c0fbdb61ade",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8c1d421dfadab60c71714ff63f4daf40069b61e513be9ba8c1ed8b3468ce368e",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
@@ -398,10 +412,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_Homestead" : {
+    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_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/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -413,9 +427,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x41ef352ff647edf19ad4896308341316fe233ed3df4338347bb8d4b141e584f3",
-                    "mixHash" : "0x1a1ba62b809a9a3c487fecb941ad1813bfbc5dc2b7ed58c2cd7dc420c5426066",
-                    "nonce" : "0xfc6e0ac310f3039b",
+                    "hash" : "0x16d0454d6ae4b637c7c03ffde09ebe5f996770f8fe1de25c27f8017049f0ce4a",
+                    "mixHash" : "0x7fe5117d46a02bf50147a417aa1a4bf9b603c8bd282e94817c77d4bc71d49312",
+                    "nonce" : "0xea256fc3d9e25eab",
                     "number" : "0x01",
                     "parentHash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
                     "receiptTrie" : "0x717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5a",
@@ -424,7 +438,7 @@
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a01a1ba62b809a9a3c487fecb941ad1813bfbc5dc2b7ed58c2cd7dc420c542606688fc6e0ac310f3039bf862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a07fe5117d46a02bf50147a417aa1a4bf9b603c8bd282e94817c77d4bc71d4931288ea256fc3d9e25eabf862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -461,8 +475,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41ef352ff647edf19ad4896308341316fe233ed3df4338347bb8d4b141e584f3",
-        "network" : "Homestead",
+        "lastblockhash" : "0x16d0454d6ae4b637c7c03ffde09ebe5f996770f8fe1de25c27f8017049f0ce4a",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
@@ -531,10 +545,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_Metropolis" : {
+    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_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/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -546,18 +560,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x992696f4ac96bc1e095bd0d22f905b459002def821f4bc74917271c7111d0830",
-                    "mixHash" : "0x76096d097a27ea346d180e4c044dbc758bcf9140ca66d975085467fb2b8e7d2a",
-                    "nonce" : "0x64f0e00c4b878859",
+                    "hash" : "0xa6e8cd56721def85022d436e61cc745b0312cd8578038c8202492d5232289aeb",
+                    "mixHash" : "0xccc16f7cab14ae12180a3d93746d346e47685bdea0e722141fab890ff20a4dda",
+                    "nonce" : "0x9b247279e7748919",
                     "number" : "0x01",
                     "parentHash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
-                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
-                    "stateRoot" : "0x8f4a26645f4f8e8ffdb43297e5c19413c90a5443371763fff0d5e0e9819290b4",
+                    "receiptTrie" : "0x717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5a",
+                    "stateRoot" : "0xd2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f4a26645f4f8e8ffdb43297e5c19413c90a5443371763fff0d5e0e9819290b4a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a076096d097a27ea346d180e4c044dbc758bcf9140ca66d975085467fb2b8e7d2a8864f0e00c4b878859f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0ccc16f7cab14ae12180a3d93746d346e47685bdea0e722141fab890ff20a4dda889b247279e7748919f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -594,16 +608,142 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x992696f4ac96bc1e095bd0d22f905b459002def821f4bc74917271c7111d0830",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa6e8cd56721def85022d436e61cc745b0312cd8578038c8202492d5232289aeb",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000113" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000114620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000114" : {
+                "balance" : "0x00",
+                "code" : "0x5a6008555a6009555a600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f67100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a29f00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000113620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000113" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000114620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000114" : {
                 "balance" : "0x00",
+                "code" : "0x5a6008555a6009555a600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000113620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x347871fc2a83ce65d1170af5e080bed267bb21f262bda518b51d36e26292f405",
+                    "mixHash" : "0x469a53dc6fe7f14dca04874e9068aec2d320159044890d978867e64155117634",
+                    "nonce" : "0x903584adac51bee3",
+                    "number" : "0x01",
+                    "parentHash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
+                    "receiptTrie" : "0x717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5a",
+                    "stateRoot" : "0xd2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a059b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2b05487b77bd7781ffd5dda0214c39dc813f08fb245bc1959b4e54d400c3fa0a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca0717644f81f4150543d9cb5b27f18f4da8ded3de73494ec5c1001e9e06ea6ee5ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0469a53dc6fe7f14dca04874e9068aec2d320159044890d978867e6415511763488903584adac51bee3f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4",
+                        "s" : "0x109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x59b8847debc79ede2b9f608518ea527bebf06409265e2879dfa49520a67f7c4f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d64f31cf5c6e07733ad22bb63e5f486a81237adedc04427e818129b20430767a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x347871fc2a83ce65d1170af5e080bed267bb21f262bda518b51d36e26292f405",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000114620927c0f1600955",