1 files changed, 168 insertions, 56 deletions
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g0v0.json
index 1d85020c7..b8bbff2f6 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcode_d0g0v0_EIP150" : {
+    "RevertOpcode_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/stRevertTest/RevertOpcode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0c3500",
-                    "hash" : "0x05acd021fc35df462afe0dc4b38b4e41420adc4a33d6d78a779d61259487a080",
-                    "mixHash" : "0x16881b6a52fcd391ea595952e5e568689d0868b53b8ec19600243a2bb9476e1d",
-                    "nonce" : "0x773c722f0452a3e6",
+                    "gasUsed" : "0xa037",
+                    "hash" : "0x8a3e07796e5b7c05e35c687b0aef5320ca5eba404c7137ddc63921be811a2ad0",
+                    "mixHash" : "0x9aa9d1471a50e39005cfce01cc84d6b2ec899f8a6b0cd4f3716fba95ab407095",
+                    "nonce" : "0xa901439b29199630",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
-                    "stateRoot" : "0xf102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7",
+                    "receiptTrie" : "0x5c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4",
+                    "stateRoot" : "0xd6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a016881b6a52fcd391ea595952e5e568689d0868b53b8ec19600243a2bb9476e1d88773c722f0452a3e6f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
+                "rlp" : "0xf9025ff901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a05c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0378203e880a09aa9d1471a50e39005cfce01cc84d6b2ec899f8a6b0cd4f3716fba95ab40709588a901439b29199630f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05acd021fc35df462afe0dc4b38b4e41420adc4a33d6d78a779d61259487a080",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8a3e07796e5b7c05e35c687b0aef5320ca5eba404c7137ddc63921be811a2ad0",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245003500",
+                "balance" : "0x4563918244f4a037",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -80,7 +87,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d498db00",
+                "balance" : "0xe8d4a46fc9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertOpcode_d0g0v0_EIP158" : {
+    "RevertOpcode_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/stRevertTest/RevertOpcode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -118,19 +125,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0c3500",
-                    "hash" : "0x74c311f1e54ab529d929aaf7e677471a77565f43ea9d03aa5e894513d83cdaed",
-                    "mixHash" : "0x0b632b8a35442624e8dc8d3a191c93779dcc501a7e9cb5e5834552dc15f148cb",
-                    "nonce" : "0xbc2fdf052ea2be77",
+                    "gasUsed" : "0xa037",
+                    "hash" : "0x5fe5d9b4aa858df3458de1705ecfe77707b370ea68b47d2155162afe5840cb47",
+                    "mixHash" : "0x18fff4867c2ce59c201dc65ca0328a0e5f27f0d67f1cdab92d42d52bc94959c6",
+                    "nonce" : "0xd0c3480d5450bcb1",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
-                    "stateRoot" : "0xf102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7",
+                    "receiptTrie" : "0x5c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4",
+                    "stateRoot" : "0xd6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a00b632b8a35442624e8dc8d3a191c93779dcc501a7e9cb5e5834552dc15f148cb88bc2fdf052ea2be77f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
+                "rlp" : "0xf9025ff901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a05c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0378203e880a018fff4867c2ce59c201dc65ca0328a0e5f27f0d67f1cdab92d42d52bc94959c688d0c3480d5450bcb1f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,11 +174,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x74c311f1e54ab529d929aaf7e677471a77565f43ea9d03aa5e894513d83cdaed",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5fe5d9b4aa858df3458de1705ecfe77707b370ea68b47d2155162afe5840cb47",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245003500",
+                "balance" : "0x4563918244f4a037",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -185,7 +199,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d498db00",
+                "balance" : "0xe8d4a46fc9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertOpcode_d0g0v0_Frontier" : {
+    "RevertOpcode_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/stRevertTest/RevertOpcode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0c3500",
-                    "hash" : "0xcc5d9ab50a1253638007a9d47558e9670080994c67e9af0e0bc645e60e987097",
-                    "mixHash" : "0xeee3b6a39b9467ba3272a09669bcad44864a1fbb46d87f3c4d2335dc0985ee8a",
-                    "nonce" : "0x291f03305df32f20",
+                    "hash" : "0x21c3bbdc826866cefa61d84f644bbfb01dcbf3780c658b4d17c2b3ebd7097a40",
+                    "mixHash" : "0x1c8fc490d7ef14ae7808729a5f7fd8f9e29c5c17a056eed7af20e4ac37cc8d9c",
+                    "nonce" : "0x6f6657958a6e1204",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
                     "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x4771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a0eee3b6a39b9467ba3272a09669bcad44864a1fbb46d87f3c4d2335dc0985ee8a88291f03305df32f20f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
+                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a01c8fc490d7ef14ae7808729a5f7fd8f9e29c5c17a056eed7af20e4ac37cc8d9c886f6657958a6e1204f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc5d9ab50a1253638007a9d47558e9670080994c67e9af0e0bc645e60e987097",
-        "network" : "Frontier",
+        "lastblockhash" : "0x21c3bbdc826866cefa61d84f644bbfb01dcbf3780c658b4d17c2b3ebd7097a40",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918245003500",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertOpcode_d0g0v0_Homestead" : {
+    "RevertOpcode_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/stRevertTest/RevertOpcode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0c3500",
-                    "hash" : "0x72e395a645a9df966713a3bc2e76f25b5a2a7cb74196a78f52086a33f52adb19",
-                    "mixHash" : "0x3a555035ef91889539cf8a62ced499efa2a5f6d756d95b32167e7fb52ba10413",
-                    "nonce" : "0x2122c6a7f8e2c470",
+                    "hash" : "0x8d9c4378518adfadce2af2174a0b97e25e5004a0fddc4ffb6a2b0d4131396a77",
+                    "mixHash" : "0x078864349a45a7a5dd8b682cf52d13978ff7e3c88fc5026166561376527313fd",
+                    "nonce" : "0x90f59797f2c07ca7",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
                     "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x4771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a03a555035ef91889539cf8a62ced499efa2a5f6d756d95b32167e7fb52ba10413882122c6a7f8e2c470f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
+                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a0078864349a45a7a5dd8b682cf52d13978ff7e3c88fc5026166561376527313fd8890f59797f2c07ca7f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72e395a645a9df966713a3bc2e76f25b5a2a7cb74196a78f52086a33f52adb19",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8d9c4378518adfadce2af2174a0b97e25e5004a0fddc4ffb6a2b0d4131396a77",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918245003500",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertOpcode_d0g0v0_Metropolis" : {
+    "RevertOpcode_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/stRevertTest/RevertOpcode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -433,19 +447,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xa037",
-                    "hash" : "0x5edbf2a26b3815c6563eee203c1a0989faca3670b265c750251295ee38ace4e2",
-                    "mixHash" : "0x09552e1c4f1d7a92617ba79575befc1a9c158125e3d767637266f6153b950064",
-                    "nonce" : "0x53de84c2920ac180",
+                    "gasUsed" : "0x0c3500",
+                    "hash" : "0x6d105c9697194879464e09fe7f024e564d364fa082b85ace3080d22e39bc06a1",
+                    "mixHash" : "0xd2886fa17e26e319b747eaf6929d5f064feab1c3de7602caca8e203bc6a0458d",
+                    "nonce" : "0x0b8dabfff3efc9f2",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x5c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4",
-                    "stateRoot" : "0xd6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191",
+                    "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
+                    "stateRoot" : "0xf102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a05c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0378203e880a009552e1c4f1d7a92617ba79575befc1a9c158125e3d767637266f6153b9500648853de84c2920ac180f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
+                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a0d2886fa17e26e319b747eaf6929d5f064feab1c3de7602caca8e203bc6a0458d880b8dabfff3efc9f2f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,18 +496,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5edbf2a26b3815c6563eee203c1a0989faca3670b265c750251295ee38ace4e2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6d105c9697194879464e09fe7f024e564d364fa082b85ace3080d22e39bc06a1",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918245003500",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x600160005560016000fd6011600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d498db00",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005560016000fd6011600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcode_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0c3500",
+                    "hash" : "0x6f1e7d1be0fb92634077970eeddbbe869f7717f91cfe4fb316be16d0ae498f60",
+                    "mixHash" : "0xe1fcd9595d6b6890096c30bb4872dfac7a93fa8086d31232efa7b9271b807a4d",
+                    "nonce" : "0x44518577871a9a49",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
+                    "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
+                    "stateRoot" : "0xf102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a0e1fcd9595d6b6890096c30bb4872dfac7a93fa8086d31232efa7b9271b807a4d8844518577871a9a49f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562",
+                        "s" : "0x32976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6f1e7d1be0fb92634077970eeddbbe869f7717f91cfe4fb316be16d0ae498f60",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a037",
+                "balance" : "0x4563918245003500",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +619,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a46fc9",
+                "balance" : "0xe8d498db00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {