1 files changed, 185 insertions, 59 deletions
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0.json
index 3966d01c2..1ad4edd48 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callWithHighValueAndOOGatTxLevel_d0g0v0_EIP150" : {
+    "callWithHighValueAndOOGatTxLevel_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/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x8290",
-                    "hash" : "0x0860877daabca9fcd1afe0f64ce46574260c9accac1c8c0cbde95201efcc084e",
-                    "mixHash" : "0x9a369a47046f8165e966234c4c9e9b573bf4cc0ff4d164d36d685d67a80b7d40",
-                    "nonce" : "0xfe71eb941a2441cf",
+                    "hash" : "0x542fc177a7f142289b0c853a05b72eaa4099f3c26694e2720284d0d1d250146e",
+                    "mixHash" : "0x95b2a4fa9a132ca1b84539c4598638f62e33f1467c227a4377f7b5ce9ca6cb1b",
+                    "nonce" : "0xc4220accf2492304",
                     "number" : "0x01",
                     "parentHash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
-                    "receiptTrie" : "0xcc6ce7e069cc246f3f670273c1180c2ffceebf38d039dc47d78684cf7a5c2836",
-                    "stateRoot" : "0x1b254c3ca7a57a190fe02bef4926102b571078c82952cbfeba0380ad8094deca",
+                    "receiptTrie" : "0xbc2c93941b714b039cada7f5f1a8c16a91dadd9e059cfd4ed8a7451e670cc2ed",
+                    "stateRoot" : "0x63d5b5157092c7298b6fe6a1ee1803dadc63dfeddf4a343e8631a18573004397",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b254c3ca7a57a190fe02bef4926102b571078c82952cbfeba0380ad8094decaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0cc6ce7e069cc246f3f670273c1180c2ffceebf38d039dc47d78684cf7a5c2836b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282908203e880a09a369a47046f8165e966234c4c9e9b573bf4cc0ff4d164d36d685d67a80b7d4088fe71eb941a2441cff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063d5b5157092c7298b6fe6a1ee1803dadc63dfeddf4a343e8631a18573004397a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0bc2c93941b714b039cada7f5f1a8c16a91dadd9e059cfd4ed8a7451e670cc2edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282908203e880a095b2a4fa9a132ca1b84539c4598638f62e33f1467c227a4377f7b5ce9ca6cb1b88c4220accf2492304f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0860877daabca9fcd1afe0f64ce46574260c9accac1c8c0cbde95201efcc084e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x542fc177a7f142289b0c853a05b72eaa4099f3c26694e2720284d0d1d250146e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6000600060006000620186a173945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f1600055",
@@ -118,10 +125,136 @@
             }
         }
     },
-    "callWithHighValueAndOOGatTxLevel_d0g0v0_EIP158" : {
+    "callWithHighValueAndOOGatTxLevel_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x8290",
+                    "hash" : "0xdb0029a81ec1ff2ae0008eb14d874d53a26626432cea52d298d347f236a3db67",
+                    "mixHash" : "0x0ea8d0ef5325291e64a136928b7804a557e730c00320d7e92fa5845d77fcef91",
+                    "nonce" : "0xd1128d8c2f47b225",
+                    "number" : "0x01",
+                    "parentHash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
+                    "receiptTrie" : "0xbc2c93941b714b039cada7f5f1a8c16a91dadd9e059cfd4ed8a7451e670cc2ed",
+                    "stateRoot" : "0x63d5b5157092c7298b6fe6a1ee1803dadc63dfeddf4a343e8631a18573004397",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063d5b5157092c7298b6fe6a1ee1803dadc63dfeddf4a343e8631a18573004397a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0bc2c93941b714b039cada7f5f1a8c16a91dadd9e059cfd4ed8a7451e670cc2edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282908203e880a00ea8d0ef5325291e64a136928b7804a557e730c00320d7e92fa5845d77fcef9188d1128d8c2f47b225f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
+                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdb0029a81ec1ff2ae0008eb14d874d53a26626432cea52d298d347f236a3db67",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6000600060006000620186a173945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f48290",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7637d70",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6000600060006000620186a173945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callWithHighValueAndOOGatTxLevel_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/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x8290",
-                    "hash" : "0x2b238e9833bbbba14f368447755218367e1411f546b64c580e393d0c020dc2f0",
-                    "mixHash" : "0x292967150b6792bd3bb7cd56a0f03f4a764446e3fc6c15b28c862ba8aae57e39",
-                    "nonce" : "0xa0bb6a96b2e6dfb2",
+                    "hash" : "0x51585937b5a69fc6517714ddd906c8d7c55a6036b17cc206dde94b634e985f33",
+                    "mixHash" : "0xdcf3cd724154d0ace50cbed3c16ca82d6b69cb61576a63f799c304b5d1d90b02",
+                    "nonce" : "0x3d5920370acec141",
                     "number" : "0x01",
                     "parentHash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
                     "receiptTrie" : "0xcc6ce7e069cc246f3f670273c1180c2ffceebf38d039dc47d78684cf7a5c2836",
@@ -144,7 +277,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b254c3ca7a57a190fe02bef4926102b571078c82952cbfeba0380ad8094decaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0cc6ce7e069cc246f3f670273c1180c2ffceebf38d039dc47d78684cf7a5c2836b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282908203e880a0292967150b6792bd3bb7cd56a0f03f4a764446e3fc6c15b28c862ba8aae57e3988a0bb6a96b2e6dfb2f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b254c3ca7a57a190fe02bef4926102b571078c82952cbfeba0380ad8094decaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0cc6ce7e069cc246f3f670273c1180c2ffceebf38d039dc47d78684cf7a5c2836b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282908203e880a0dcf3cd724154d0ace50cbed3c16ca82d6b69cb61576a63f799c304b5d1d90b02883d5920370acec141f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2b238e9833bbbba14f368447755218367e1411f546b64c580e393d0c020dc2f0",
-        "network" : "EIP158",
+        "lastblockhash" : "0x51585937b5a69fc6517714ddd906c8d7c55a6036b17cc206dde94b634e985f33",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -237,10 +370,10 @@
             }
         }
     },
-    "callWithHighValueAndOOGatTxLevel_d0g0v0_Frontier" : {
+    "callWithHighValueAndOOGatTxLevel_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/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -251,19 +384,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x81ec590a3cc656af6a3c221485a858b273382839357a9d646180e1be8cbe9f9b",
-                    "mixHash" : "0xd90beb4b469c061a453cfcbab5a2a0c08fb17e5abce8bd52caa3d92dc53695c8",
-                    "nonce" : "0x18f1e4ec759e866a",
+                    "gasUsed" : "0x8290",
+                    "hash" : "0x09d21baaafa25e7aca3d9b9e901894d0e72da38e4683046d1f541ba033168c7c",
+                    "mixHash" : "0xa4182b184d87c5297bc5b18eed2655f9da3803f0f4ff566063083278090c8071",
+                    "nonce" : "0xd876e52d77c95767",
                     "number" : "0x01",
                     "parentHash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
-                    "receiptTrie" : "0xf56aa5b99f8029c038586333297514801b6e25eb9487cc8b4e57c7dad29d489e",
-                    "stateRoot" : "0xe5d33735ceb656bc5a545fd087d544b06ec2949b4f111456682967d30c46043f",
+                    "receiptTrie" : "0xcc6ce7e069cc246f3f670273c1180c2ffceebf38d039dc47d78684cf7a5c2836",
+                    "stateRoot" : "0x1b254c3ca7a57a190fe02bef4926102b571078c82952cbfeba0380ad8094deca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5d33735ceb656bc5a545fd087d544b06ec2949b4f111456682967d30c46043fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0f56aa5b99f8029c038586333297514801b6e25eb9487cc8b4e57c7dad29d489eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0d90beb4b469c061a453cfcbab5a2a0c08fb17e5abce8bd52caa3d92dc53695c88818f1e4ec759e866af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b254c3ca7a57a190fe02bef4926102b571078c82952cbfeba0380ad8094decaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0cc6ce7e069cc246f3f670273c1180c2ffceebf38d039dc47d78684cf7a5c2836b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282908203e880a0a4182b184d87c5297bc5b18eed2655f9da3803f0f4ff566063083278090c807188d876e52d77c95767f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81ec590a3cc656af6a3c221485a858b273382839357a9d646180e1be8cbe9f9b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x09d21baaafa25e7aca3d9b9e901894d0e72da38e4683046d1f541ba033168c7c",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -311,7 +444,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
+                "balance" : "0x4563918244f48290",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -325,7 +458,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
+                "balance" : "0x0de0b6b3a7637d70",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -356,10 +489,10 @@
             }
         }
     },
-    "callWithHighValueAndOOGatTxLevel_d0g0v0_Homestead" : {
+    "callWithHighValueAndOOGatTxLevel_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/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +504,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xf276ac4eaa5d6c15405a7a698ecb494ad7114c0c906c6198d5bb3306c629e3d5",
-                    "mixHash" : "0xad14d239633004524bba8da665fa8351ad11ce4d0ea8e41677adccf74de5809c",
-                    "nonce" : "0x41be0a199e0df252",
+                    "hash" : "0x2de8d9e583e6224b6a492870a6b21e0b7819f7eb352bb6d74d62fd4c9b5e968d",
+                    "mixHash" : "0xa1ff463619b2245671c535c51d07e9ccaa200b8ad7e5e6bc876eed67abb6c227",
+                    "nonce" : "0xb7b650b741930003",
                     "number" : "0x01",
                     "parentHash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
                     "receiptTrie" : "0xf56aa5b99f8029c038586333297514801b6e25eb9487cc8b4e57c7dad29d489e",
@@ -382,7 +515,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5d33735ceb656bc5a545fd087d544b06ec2949b4f111456682967d30c46043fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0f56aa5b99f8029c038586333297514801b6e25eb9487cc8b4e57c7dad29d489eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ad14d239633004524bba8da665fa8351ad11ce4d0ea8e41677adccf74de5809c8841be0a199e0df252f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5d33735ceb656bc5a545fd087d544b06ec2949b4f111456682967d30c46043fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0f56aa5b99f8029c038586333297514801b6e25eb9487cc8b4e57c7dad29d489eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0a1ff463619b2245671c535c51d07e9ccaa200b8ad7e5e6bc876eed67abb6c22788b7b650b741930003f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +552,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf276ac4eaa5d6c15405a7a698ecb494ad7114c0c906c6198d5bb3306c629e3d5",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2de8d9e583e6224b6a492870a6b21e0b7819f7eb352bb6d74d62fd4c9b5e968d",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -475,10 +608,10 @@
             }
         }
     },
-    "callWithHighValueAndOOGatTxLevel_d0g0v0_Metropolis" : {
+    "callWithHighValueAndOOGatTxLevel_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/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -489,19 +622,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x8290",
-                    "hash" : "0x1d663850934c3effb0985fdeb21e20015a063b439d0006a3d750aed9a91b0696",
-                    "mixHash" : "0x5f6283e107d68e2788c8da0a2918cffedd0eb8e5d29a8af517bde3b5bca29e57",
-                    "nonce" : "0x7f513a6e27440fc8",
+                    "gasUsed" : "0x2dc6c0",
+                    "hash" : "0x209559ed32048ecdf037ed27493758346c06248fe942a32bf7ce8e4efd1d21de",
+                    "mixHash" : "0x3dcd69de6d2f757b9458fc2acb7af5fee69592c41929f8301c72c4d125b896f9",
+                    "nonce" : "0x3b88c3fd0a604c9a",
                     "number" : "0x01",
                     "parentHash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
-                    "receiptTrie" : "0xbc2c93941b714b039cada7f5f1a8c16a91dadd9e059cfd4ed8a7451e670cc2ed",
-                    "stateRoot" : "0x63d5b5157092c7298b6fe6a1ee1803dadc63dfeddf4a343e8631a18573004397",
+                    "receiptTrie" : "0xf56aa5b99f8029c038586333297514801b6e25eb9487cc8b4e57c7dad29d489e",
+                    "stateRoot" : "0xe5d33735ceb656bc5a545fd087d544b06ec2949b4f111456682967d30c46043f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063d5b5157092c7298b6fe6a1ee1803dadc63dfeddf4a343e8631a18573004397a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0bc2c93941b714b039cada7f5f1a8c16a91dadd9e059cfd4ed8a7451e670cc2edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282908203e880a05f6283e107d68e2788c8da0a2918cffedd0eb8e5d29a8af517bde3b5bca29e57887f513a6e27440fc8f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5d33735ceb656bc5a545fd087d544b06ec2949b4f111456682967d30c46043fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0f56aa5b99f8029c038586333297514801b6e25eb9487cc8b4e57c7dad29d489eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a03dcd69de6d2f757b9458fc2acb7af5fee69592c41929f8301c72c4d125b896f9883b88c3fd0a604c9af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +671,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d663850934c3effb0985fdeb21e20015a063b439d0006a3d750aed9a91b0696",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x209559ed32048ecdf037ed27493758346c06248fe942a32bf7ce8e4efd1d21de",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6000600060006000620186a173945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f1600055",
@@ -556,7 +682,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f48290",
+                "balance" : "0x456391824521c6c0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -570,7 +696,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7637d70",
+                "balance" : "0x0de0b6b3a7363940",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {