1 files changed, 174 insertions, 48 deletions
diff --git a/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/Callcode50000_d0g1v0.json b/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/Callcode50000_d0g1v0.json
index 26c786a84..18904e018 100644
--- a/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/Callcode50000_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/Callcode50000_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "Callcode50000_d0g1v0_EIP150" : {
+    "Callcode50000_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stQuadraticComplexityTest/Callcode50000_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0200999600",
                     "gasUsed" : "0x0ee6b280",
-                    "hash" : "0x1a24ef7977df96ec04e94680a039f1af6ec8f76c30b1815d7971a45e57f2f7dc",
-                    "mixHash" : "0x17a13215527762f811fa09d63ded69714f67e254f51f8c6a37b96c9509f032a5",
-                    "nonce" : "0x7ea86df794befd1f",
+                    "hash" : "0xfabd3b0f95e0a8cc0e81f167d6be8e1137a573eafc0a7d336e1ef149e3d043c8",
+                    "mixHash" : "0xf21700ee0d3862629a95ccda8e62db4677ff657d556aade0e3abbbc42b5435c0",
+                    "nonce" : "0xb872c1a517284b9d",
                     "number" : "0x01",
                     "parentHash" : "0x05af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50",
-                    "receiptTrie" : "0x3dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18",
-                    "stateRoot" : "0xb00f82cef4e6b4dd74466373098b8d41bcd7b62a20e45bb797b56ad0ae6e7f62",
+                    "receiptTrie" : "0x27408083641cf20cfde86cd87cd57bf10c741d7553352ca96118e31ab8ceb9ce",
+                    "stateRoot" : "0x5023d165d78ba55554f7e6af8702e4a5cef0477827361359177d00e837c9a170",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x11d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901fba005af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b00f82cef4e6b4dd74466373098b8d41bcd7b62a20e45bb797b56ad0ae6e7f62a011d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8a03dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850200999600840ee6b2808203e880a017a13215527762f811fa09d63ded69714f67e254f51f8c6a37b96c9509f032a5887ea86df794befd1ff863f8618001840ee6b28094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059a4b49695baa04705375b29fcf0cfc663d0c3da6c748b0a1f6cab3158c4ff37a05b8cf80c815cb88b89b4e36f05acf96449cf50a69119f5a5b206d80cee938c69c0",
+                "rlp" : "0xf90264f901fba005af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba05023d165d78ba55554f7e6af8702e4a5cef0477827361359177d00e837c9a170a011d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8a027408083641cf20cfde86cd87cd57bf10c741d7553352ca96118e31ab8ceb9ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850200999600840ee6b2808203e880a0f21700ee0d3862629a95ccda8e62db4677ff657d556aade0e3abbbc42b5435c088b872c1a517284b9df863f8618001840ee6b28094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059a4b49695baa04705375b29fcf0cfc663d0c3da6c748b0a1f6cab3158c4ff37a05b8cf80c815cb88b89b4e36f05acf96449cf50a69119f5a5b206d80cee938c69c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba015eea5b3d3a0e6274bdc1716446208e1e8c23188dbdafd14a7b6294133c05807a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850200999600808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a24ef7977df96ec04e94680a039f1af6ec8f76c30b1815d7971a45e57f2f7dc",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfabd3b0f95e0a8cc0e81f167d6be8e1137a573eafc0a7d336e1ef149e3d043c8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffff1194d7f",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "Callcode50000_d0g1v0_EIP158" : {
+    "Callcode50000_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stQuadraticComplexityTest/Callcode50000_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0200999600",
                     "gasUsed" : "0x0ee6b280",
-                    "hash" : "0x407dc7b5e6c98a41b0a6c896c445f4f71786eaeeb7997e570732f1f5b76a7531",
-                    "mixHash" : "0xbf4e6829e423b70b4b538dccdf299b588d38edd53197d9a81e2ae3b6039eb4b1",
-                    "nonce" : "0x37158c46a810d6e8",
+                    "hash" : "0x6161a4318ab23834c3d41b5d34dd9d8ecf02dad237c69b380508df27198d105a",
+                    "mixHash" : "0x203869ef4134cc516fa9b68fb5d7bb424b154dd0d7e1e444c3f4f4af4abbe88b",
+                    "nonce" : "0xe8745f0049af68e7",
                     "number" : "0x01",
                     "parentHash" : "0x05af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50",
-                    "receiptTrie" : "0x3dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18",
-                    "stateRoot" : "0xb00f82cef4e6b4dd74466373098b8d41bcd7b62a20e45bb797b56ad0ae6e7f62",
+                    "receiptTrie" : "0x27408083641cf20cfde86cd87cd57bf10c741d7553352ca96118e31ab8ceb9ce",
+                    "stateRoot" : "0x5023d165d78ba55554f7e6af8702e4a5cef0477827361359177d00e837c9a170",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x11d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901fba005af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b00f82cef4e6b4dd74466373098b8d41bcd7b62a20e45bb797b56ad0ae6e7f62a011d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8a03dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850200999600840ee6b2808203e880a0bf4e6829e423b70b4b538dccdf299b588d38edd53197d9a81e2ae3b6039eb4b18837158c46a810d6e8f863f8618001840ee6b28094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059a4b49695baa04705375b29fcf0cfc663d0c3da6c748b0a1f6cab3158c4ff37a05b8cf80c815cb88b89b4e36f05acf96449cf50a69119f5a5b206d80cee938c69c0",
+                "rlp" : "0xf90264f901fba005af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba05023d165d78ba55554f7e6af8702e4a5cef0477827361359177d00e837c9a170a011d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8a027408083641cf20cfde86cd87cd57bf10c741d7553352ca96118e31ab8ceb9ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850200999600840ee6b2808203e880a0203869ef4134cc516fa9b68fb5d7bb424b154dd0d7e1e444c3f4f4af4abbe88b88e8745f0049af68e7f863f8618001840ee6b28094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059a4b49695baa04705375b29fcf0cfc663d0c3da6c748b0a1f6cab3158c4ff37a05b8cf80c815cb88b89b4e36f05acf96449cf50a69119f5a5b206d80cee938c69c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba015eea5b3d3a0e6274bdc1716446208e1e8c23188dbdafd14a7b6294133c05807a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850200999600808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x407dc7b5e6c98a41b0a6c896c445f4f71786eaeeb7997e570732f1f5b76a7531",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6161a4318ab23834c3d41b5d34dd9d8ecf02dad237c69b380508df27198d105a",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffff1194d7f",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "Callcode50000_d0g1v0_Frontier" : {
+    "Callcode50000_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stQuadraticComplexityTest/Callcode50000_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0200999600",
                     "gasUsed" : "0x0ee6b280",
-                    "hash" : "0xef34d190be5c692dabe2520af5e5cfa2d15114cc6aebdb4ecba3715a7fbb054b",
-                    "mixHash" : "0x64011a3cb1e078b228a981abf356b0dffe2e40fd4cae3d14676dc4f43a90ae26",
-                    "nonce" : "0x0a130c66fdfa0bdc",
+                    "hash" : "0x1db9b22c3c68bcdb8725b08ece681bf783fb1adf45f9eb68791132053263b19c",
+                    "mixHash" : "0xc922346b6e3bbc2b01105f36c0c6909abb441981b538aab4a6868f2d61f72655",
+                    "nonce" : "0x44454a4e687bd632",
                     "number" : "0x01",
                     "parentHash" : "0x05af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50",
                     "receiptTrie" : "0x3dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x11d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901fba005af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b00f82cef4e6b4dd74466373098b8d41bcd7b62a20e45bb797b56ad0ae6e7f62a011d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8a03dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850200999600840ee6b2808203e880a064011a3cb1e078b228a981abf356b0dffe2e40fd4cae3d14676dc4f43a90ae26880a130c66fdfa0bdcf863f8618001840ee6b28094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059a4b49695baa04705375b29fcf0cfc663d0c3da6c748b0a1f6cab3158c4ff37a05b8cf80c815cb88b89b4e36f05acf96449cf50a69119f5a5b206d80cee938c69c0",
+                "rlp" : "0xf90264f901fba005af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b00f82cef4e6b4dd74466373098b8d41bcd7b62a20e45bb797b56ad0ae6e7f62a011d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8a03dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850200999600840ee6b2808203e880a0c922346b6e3bbc2b01105f36c0c6909abb441981b538aab4a6868f2d61f726558844454a4e687bd632f863f8618001840ee6b28094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059a4b49695baa04705375b29fcf0cfc663d0c3da6c748b0a1f6cab3158c4ff37a05b8cf80c815cb88b89b4e36f05acf96449cf50a69119f5a5b206d80cee938c69c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba015eea5b3d3a0e6274bdc1716446208e1e8c23188dbdafd14a7b6294133c05807a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850200999600808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef34d190be5c692dabe2520af5e5cfa2d15114cc6aebdb4ecba3715a7fbb054b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1db9b22c3c68bcdb8725b08ece681bf783fb1adf45f9eb68791132053263b19c",
+        "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffff1194d7f",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "Callcode50000_d0g1v0_Homestead" : {
+    "Callcode50000_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stQuadraticComplexityTest/Callcode50000_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0200999600",
                     "gasUsed" : "0x0ee6b280",
-                    "hash" : "0x05d0db9efc1b116813c42bcafbacda318d8382c453bb510526647d09953a2558",
-                    "mixHash" : "0x927f6a5329dd8823488589b7b9972314aa382876c867832ac59b4ff483373832",
-                    "nonce" : "0x9a64718e35ece66f",
+                    "hash" : "0xea0aef023c6ace6647b79356ece65384b7b682b4073f4a976a8041d379b3865f",
+                    "mixHash" : "0x43f629c9e4c222d8ebc9ea86b1d92c2b53bc63a6a2d03e790e5390093861c032",
+                    "nonce" : "0xb181dc300d1d06f7",
                     "number" : "0x01",
                     "parentHash" : "0x05af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50",
                     "receiptTrie" : "0x3dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0x11d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901fba005af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b00f82cef4e6b4dd74466373098b8d41bcd7b62a20e45bb797b56ad0ae6e7f62a011d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8a03dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850200999600840ee6b2808203e880a0927f6a5329dd8823488589b7b9972314aa382876c867832ac59b4ff483373832889a64718e35ece66ff863f8618001840ee6b28094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059a4b49695baa04705375b29fcf0cfc663d0c3da6c748b0a1f6cab3158c4ff37a05b8cf80c815cb88b89b4e36f05acf96449cf50a69119f5a5b206d80cee938c69c0",
+                "rlp" : "0xf90264f901fba005af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b00f82cef4e6b4dd74466373098b8d41bcd7b62a20e45bb797b56ad0ae6e7f62a011d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8a03dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850200999600840ee6b2808203e880a043f629c9e4c222d8ebc9ea86b1d92c2b53bc63a6a2d03e790e5390093861c03288b181dc300d1d06f7f863f8618001840ee6b28094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059a4b49695baa04705375b29fcf0cfc663d0c3da6c748b0a1f6cab3158c4ff37a05b8cf80c815cb88b89b4e36f05acf96449cf50a69119f5a5b206d80cee938c69c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba015eea5b3d3a0e6274bdc1716446208e1e8c23188dbdafd14a7b6294133c05807a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850200999600808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05d0db9efc1b116813c42bcafbacda318d8382c453bb510526647d09953a2558",
-        "network" : "Homestead",
+        "lastblockhash" : "0xea0aef023c6ace6647b79356ece65384b7b682b4073f4a976a8041d379b3865f",
+        "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffff1194d7f",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "Callcode50000_d0g1v0_Metropolis" : {
+    "Callcode50000_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stQuadraticComplexityTest/Callcode50000_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0200999600",
                     "gasUsed" : "0x0ee6b280",
-                    "hash" : "0x6fa4c1a462cff9e04031ef1a89a38f373073e1557793d08a349243086e8969ed",
-                    "mixHash" : "0x3d5504fb7e83fa9d7544e1cd7631887cb16953fbf383cee3d43e5fdad4309805",
-                    "nonce" : "0xbe9568c88c05b0e8",
+                    "hash" : "0xe4930723d1c307a2f43fe58fdf965657d0aad03de86351f7f839f16054ecaa17",
+                    "mixHash" : "0xd672c64e8f6cdfb16a814242afdc202b067b783812018a9490d9bcd3344bb2a9",
+                    "nonce" : "0x287493593888e928",
                     "number" : "0x01",
                     "parentHash" : "0x05af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50",
-                    "receiptTrie" : "0x27408083641cf20cfde86cd87cd57bf10c741d7553352ca96118e31ab8ceb9ce",
-                    "stateRoot" : "0x5023d165d78ba55554f7e6af8702e4a5cef0477827361359177d00e837c9a170",
+                    "receiptTrie" : "0x3dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18",
+                    "stateRoot" : "0xb00f82cef4e6b4dd74466373098b8d41bcd7b62a20e45bb797b56ad0ae6e7f62",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x11d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901fba005af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba05023d165d78ba55554f7e6af8702e4a5cef0477827361359177d00e837c9a170a011d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8a027408083641cf20cfde86cd87cd57bf10c741d7553352ca96118e31ab8ceb9ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850200999600840ee6b2808203e880a03d5504fb7e83fa9d7544e1cd7631887cb16953fbf383cee3d43e5fdad430980588be9568c88c05b0e8f863f8618001840ee6b28094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059a4b49695baa04705375b29fcf0cfc663d0c3da6c748b0a1f6cab3158c4ff37a05b8cf80c815cb88b89b4e36f05acf96449cf50a69119f5a5b206d80cee938c69c0",
+                "rlp" : "0xf90264f901fba005af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b00f82cef4e6b4dd74466373098b8d41bcd7b62a20e45bb797b56ad0ae6e7f62a011d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8a03dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850200999600840ee6b2808203e880a0d672c64e8f6cdfb16a814242afdc202b067b783812018a9490d9bcd3344bb2a988287493593888e928f863f8618001840ee6b28094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059a4b49695baa04705375b29fcf0cfc663d0c3da6c748b0a1f6cab3158c4ff37a05b8cf80c815cb88b89b4e36f05acf96449cf50a69119f5a5b206d80cee938c69c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba015eea5b3d3a0e6274bdc1716446208e1e8c23188dbdafd14a7b6294133c05807a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850200999600808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6fa4c1a462cff9e04031ef1a89a38f373073e1557793d08a349243086e8969ed",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe4930723d1c307a2f43fe58fdf965657d0aad03de86351f7f839f16054ecaa17",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xfffffffffffffffffffffffff1194d7f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4563918253dab280",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffff",
+                "code" : "0x5b61c3506080511015603f576000600061c3506000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b610640f26000556001608051016080526000565b608051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffff",
+                "code" : "0x5b61c3506080511015603f576000600061c3506000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b610640f26000556001608051016080526000565b608051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Callcode50000_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stQuadraticComplexityTest/Callcode50000_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0200999600",
+                    "gasUsed" : "0x0ee6b280",
+                    "hash" : "0x51c03a2828caa81b76ecff19a1637acae47aeea9a1be90606c287368b83ed14b",
+                    "mixHash" : "0x623718490c80a5402c21c39b823c9a69aec93b5f3f89946f95a680902a669c1e",
+                    "nonce" : "0x6e38f84386f1fb65",
+                    "number" : "0x01",
+                    "parentHash" : "0x05af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50",
+                    "receiptTrie" : "0x3dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18",
+                    "stateRoot" : "0xb00f82cef4e6b4dd74466373098b8d41bcd7b62a20e45bb797b56ad0ae6e7f62",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x11d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901fba005af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b00f82cef4e6b4dd74466373098b8d41bcd7b62a20e45bb797b56ad0ae6e7f62a011d570905f32c46c526a712794d2d4a5e35176ac6de48c8328c5ffe7aaeb10e8a03dee08b3f390f1fe2df5501fd105eea3be345dce4b3f5a8038608dcf941fec18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850200999600840ee6b2808203e880a0623718490c80a5402c21c39b823c9a69aec93b5f3f89946f95a680902a669c1e886e38f84386f1fb65f863f8618001840ee6b28094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059a4b49695baa04705375b29fcf0cfc663d0c3da6c748b0a1f6cab3158c4ff37a05b8cf80c815cb88b89b4e36f05acf96449cf50a69119f5a5b206d80cee938c69c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0ee6b280",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59a4b49695baa04705375b29fcf0cfc663d0c3da6c748b0a1f6cab3158c4ff37",
+                        "s" : "0x5b8cf80c815cb88b89b4e36f05acf96449cf50a69119f5a5b206d80cee938c69",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0200999600",
+            "gasUsed" : "0x00",
+            "hash" : "0x05af435664bc5d7b40cbdf151fc5ac6587b2250e5cd2291077180e27e7a09a50",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x15eea5b3d3a0e6274bdc1716446208e1e8c23188dbdafd14a7b6294133c05807",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba015eea5b3d3a0e6274bdc1716446208e1e8c23188dbdafd14a7b6294133c05807a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850200999600808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x51c03a2828caa81b76ecff19a1637acae47aeea9a1be90606c287368b83ed14b",
+        "network" : "Homestead",
+        "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffff1194d7f",
                 "code" : "",