Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 40 insertions, 47 deletions

diff --git a/BlockchainTests/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction_d0g0v0.json b/BlockchainTests/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction_d0g0v0.json
index ff1dd2db6..a8e70e01a 100644
--- a/BlockchainTests/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction_d0g0v0.json
@@ -2,7 +2,7 @@
     "walletChangeRequirementRemovePendingTransaction_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stWalletTest/walletChangeRequirementRemovePendingTransaction_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ea3",
-                    "hash" : "0x007ee7236db329eede17dfbe58e7ba5dd4bb212f76bddac838fbb0d12f3d8e3b",
-                    "mixHash" : "0xfd831f153f41b5f412024dae613526e985696246fdd0d1cad1b3bd5c53a722e1",
-                    "nonce" : "0x9f49b84c4b0be687",
+                    "hash" : "0xd5caa96b7d41d8af748daf3e663b0c242fdc0d83d5a1694a0bce720558e3af95",
+                    "mixHash" : "0xf9753a2b2a11a9d19c41435489d424cc7d024b1d086b9db4024e3201d625dde4",
+                    "nonce" : "0x2606f6e7d66dcbad",
                     "number" : "0x01",
                     "parentHash" : "0x9058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312",
                     "receiptTrie" : "0xe756c21d54374c531f6c5f598c8238a7bd117eec1798b8628e7cfea1cde67855",
-                    "stateRoot" : "0x7ed351eaf7d7380aa4dfd87e61729ac249e73bbb809b65385b8651845332816a",
+                    "stateRoot" : "0x7fb56f154ad6085c7452bef7a1923a91be9fb55ed7a8bed3adbac80b8e0f39ab",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90284f901f8a09058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ed351eaf7d7380aa4dfd87e61729ac249e73bbb809b65385b8651845332816aa06ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362a0e756c21d54374c531f6c5f598c8238a7bd117eec1798b8628e7cfea1cde67855b901000000000080000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000200000000000000000000000100000000000000000000000000000008000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000004000000000000000083020000018398968083016ea38203e880a0fd831f153f41b5f412024dae613526e985696246fdd0d1cad1b3bd5c53a722e1889f49b84c4b0be687f886f88480018398968094ec0e71ad0a90ffe1909d27dac207f7680abba42d80a4ba51a6df00000000000000000000000000000000000000000000000000000000000000021ba0e0a645785e276952a772306620d9f5e936c4c0aff8cde422ef0d3f1702d0ae4ba07a9b251360ce918232f9c1f0b07c322392d41f447f24b23fd4975c3e1abd2c79c0",
+                "rlp" : "0xf90284f901f8a09058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07fb56f154ad6085c7452bef7a1923a91be9fb55ed7a8bed3adbac80b8e0f39aba06ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362a0e756c21d54374c531f6c5f598c8238a7bd117eec1798b8628e7cfea1cde67855b901000000000080000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000200000000000000000000000100000000000000000000000000000008000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000004000000000000000083020000018398968083016ea38203e880a0f9753a2b2a11a9d19c41435489d424cc7d024b1d086b9db4024e3201d625dde4882606f6e7d66dcbadf886f88480018398968094ec0e71ad0a90ffe1909d27dac207f7680abba42d80a4ba51a6df00000000000000000000000000000000000000000000000000000000000000021ba0e0a645785e276952a772306620d9f5e936c4c0aff8cde422ef0d3f1702d0ae4ba07a9b251360ce918232f9c1f0b07c322392d41f447f24b23fd4975c3e1abd2c79c0",
                 "transactions" : [
                     {
                         "data" : "0xba51a6df0000000000000000000000000000000000000000000000000000000000000002",
@@ -62,18 +62,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee773247ff23f59fce994701776888dcfcb7adbfa2fc29d7e595f39e1394e47ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x007ee7236db329eede17dfbe58e7ba5dd4bb212f76bddac838fbb0d12f3d8e3b",
+        "lastblockhash" : "0xd5caa96b7d41d8af748daf3e663b0c242fdc0d83d5a1694a0bce720558e3af95",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56ea3",
+                "balance" : "0x29a2241af62d6ea3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -148,7 +141,7 @@
     "walletChangeRequirementRemovePendingTransaction_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stWalletTest/walletChangeRequirementRemovePendingTransaction_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -160,18 +153,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ea3",
-                    "hash" : "0x67d85af4eeacd585e7fd2cb58cd9cbf177812602f949e4b8528f0076fe9dbc28",
-                    "mixHash" : "0x0f2006182bc5a2cd0fdb7587a5c191fba291c2323ee909b5e9762cf6313fbc0c",
-                    "nonce" : "0x2177595ebe7cf3ed",
+                    "hash" : "0xabd91e079002b538915da6fa4869aafdcfa7ca99754e591ed36e74bce7c17ad9",
+                    "mixHash" : "0xd12d7d357573f932106eeead4a4aa870d1b9b100e0d12a706ee134dfe8325c1c",
+                    "nonce" : "0x0867679d0a6b4ca7",
                     "number" : "0x01",
                     "parentHash" : "0x9058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312",
                     "receiptTrie" : "0xe756c21d54374c531f6c5f598c8238a7bd117eec1798b8628e7cfea1cde67855",
-                    "stateRoot" : "0x7ed351eaf7d7380aa4dfd87e61729ac249e73bbb809b65385b8651845332816a",
+                    "stateRoot" : "0x9cfdc613a90b0a61256e4d11da67d3fcee235a2880ef9612338b6c2d33b5f5b5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90284f901f8a09058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ed351eaf7d7380aa4dfd87e61729ac249e73bbb809b65385b8651845332816aa06ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362a0e756c21d54374c531f6c5f598c8238a7bd117eec1798b8628e7cfea1cde67855b901000000000080000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000200000000000000000000000100000000000000000000000000000008000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000004000000000000000083020000018398968083016ea38203e880a00f2006182bc5a2cd0fdb7587a5c191fba291c2323ee909b5e9762cf6313fbc0c882177595ebe7cf3edf886f88480018398968094ec0e71ad0a90ffe1909d27dac207f7680abba42d80a4ba51a6df00000000000000000000000000000000000000000000000000000000000000021ba0e0a645785e276952a772306620d9f5e936c4c0aff8cde422ef0d3f1702d0ae4ba07a9b251360ce918232f9c1f0b07c322392d41f447f24b23fd4975c3e1abd2c79c0",
+                "rlp" : "0xf90284f901f8a09058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cfdc613a90b0a61256e4d11da67d3fcee235a2880ef9612338b6c2d33b5f5b5a06ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362a0e756c21d54374c531f6c5f598c8238a7bd117eec1798b8628e7cfea1cde67855b901000000000080000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000200000000000000000000000100000000000000000000000000000008000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000004000000000000000083020000018398968083016ea38203e880a0d12d7d357573f932106eeead4a4aa870d1b9b100e0d12a706ee134dfe8325c1c880867679d0a6b4ca7f886f88480018398968094ec0e71ad0a90ffe1909d27dac207f7680abba42d80a4ba51a6df00000000000000000000000000000000000000000000000000000000000000021ba0e0a645785e276952a772306620d9f5e936c4c0aff8cde422ef0d3f1702d0ae4ba07a9b251360ce918232f9c1f0b07c322392d41f447f24b23fd4975c3e1abd2c79c0",
                 "transactions" : [
                     {
                         "data" : "0xba51a6df0000000000000000000000000000000000000000000000000000000000000002",
@@ -208,7 +201,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee773247ff23f59fce994701776888dcfcb7adbfa2fc29d7e595f39e1394e47ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67d85af4eeacd585e7fd2cb58cd9cbf177812602f949e4b8528f0076fe9dbc28",
+        "lastblockhash" : "0xabd91e079002b538915da6fa4869aafdcfa7ca99754e591ed36e74bce7c17ad9",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -219,7 +212,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56ea3",
+                "balance" : "0x29a2241af62d6ea3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -294,7 +287,7 @@
     "walletChangeRequirementRemovePendingTransaction_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stWalletTest/walletChangeRequirementRemovePendingTransaction_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -306,9 +299,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016e2b",
-                    "hash" : "0x566d454626b7440979888451a069a692df8da37bc00fc19b3b5914a5cd175f04",
-                    "mixHash" : "0xb88e50c7cd2e3ab8bf45d94b2b8f7fa87f0d882147175602f57d83c91b90c5c2",
-                    "nonce" : "0x49489dc3791d3958",
+                    "hash" : "0xab465f0a5ec5f5b1250e051e69dcf71aad0c2db0548d89eaaaeb9ba9d4697a07",
+                    "mixHash" : "0xeee74b4463f0d91d7e729a223c7280dc2c84cb4086a05cfdd00c1195e0c3ba47",
+                    "nonce" : "0xc293b50aab608f98",
                     "number" : "0x01",
                     "parentHash" : "0x9058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312",
                     "receiptTrie" : "0x9120d1b6e5502996a31ea03d84f58be9e6dfdcc3678ba8dad6734f7ae00afc51",
@@ -317,7 +310,7 @@
                     "transactionsTrie" : "0x6ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90284f901f8a09058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0156e0bb9333cbe161fe9f5fb4562b03f2ab62fc53d09cae561028decd03f51bda06ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362a09120d1b6e5502996a31ea03d84f58be9e6dfdcc3678ba8dad6734f7ae00afc51b901000000000080000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000200000000000000000000000100000000000000000000000000000008000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000004000000000000000083020000018398968083016e2b8203e880a0b88e50c7cd2e3ab8bf45d94b2b8f7fa87f0d882147175602f57d83c91b90c5c28849489dc3791d3958f886f88480018398968094ec0e71ad0a90ffe1909d27dac207f7680abba42d80a4ba51a6df00000000000000000000000000000000000000000000000000000000000000021ba0e0a645785e276952a772306620d9f5e936c4c0aff8cde422ef0d3f1702d0ae4ba07a9b251360ce918232f9c1f0b07c322392d41f447f24b23fd4975c3e1abd2c79c0",
+                "rlp" : "0xf90284f901f8a09058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0156e0bb9333cbe161fe9f5fb4562b03f2ab62fc53d09cae561028decd03f51bda06ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362a09120d1b6e5502996a31ea03d84f58be9e6dfdcc3678ba8dad6734f7ae00afc51b901000000000080000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000200000000000000000000000100000000000000000000000000000008000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000004000000000000000083020000018398968083016e2b8203e880a0eee74b4463f0d91d7e729a223c7280dc2c84cb4086a05cfdd00c1195e0c3ba4788c293b50aab608f98f886f88480018398968094ec0e71ad0a90ffe1909d27dac207f7680abba42d80a4ba51a6df00000000000000000000000000000000000000000000000000000000000000021ba0e0a645785e276952a772306620d9f5e936c4c0aff8cde422ef0d3f1702d0ae4ba07a9b251360ce918232f9c1f0b07c322392d41f447f24b23fd4975c3e1abd2c79c0",
                 "transactions" : [
                     {
                         "data" : "0xba51a6df0000000000000000000000000000000000000000000000000000000000000002",
@@ -354,7 +347,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee773247ff23f59fce994701776888dcfcb7adbfa2fc29d7e595f39e1394e47ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x566d454626b7440979888451a069a692df8da37bc00fc19b3b5914a5cd175f04",
+        "lastblockhash" : "0xab465f0a5ec5f5b1250e051e69dcf71aad0c2db0548d89eaaaeb9ba9d4697a07",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -433,7 +426,7 @@
     "walletChangeRequirementRemovePendingTransaction_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stWalletTest/walletChangeRequirementRemovePendingTransaction_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -445,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016ea3",
-                    "hash" : "0xc0c812f62a9328f59a8a3cb702b4a71489c1fcfcb2816b29b1eb029e88979f97",
-                    "mixHash" : "0xc0f1e7a6465ed5b80b9338b7bd439f029db331027d6baa9922a0793413d922fe",
-                    "nonce" : "0x3d4e539903688c03",
+                    "hash" : "0xf86ac71543e17d21e514d7cc9af369bc5749ee8ded7f75b2382a1193d81d912b",
+                    "mixHash" : "0x7c4c2794aa4e352fdb69fd4ba44ed51ab2b40a6171f70663f231966995a84167",
+                    "nonce" : "0x95823a3e95e1097e",
                     "number" : "0x01",
                     "parentHash" : "0x9058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312",
                     "receiptTrie" : "0x45ceca25921ed254c601d5831dbd71e55457dfb34ac7faf4d21095a0377546d3",
@@ -456,7 +449,7 @@
                     "transactionsTrie" : "0x6ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90284f901f8a09058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06aeb68b0e473e36af198bcd9d4f2e6030ac48b9ffc4872b487bbd3bf8a5f885ca06ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362a045ceca25921ed254c601d5831dbd71e55457dfb34ac7faf4d21095a0377546d3b901000000000080000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000200000000000000000000000100000000000000000000000000000008000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000004000000000000000083020000018398968083016ea38203e880a0c0f1e7a6465ed5b80b9338b7bd439f029db331027d6baa9922a0793413d922fe883d4e539903688c03f886f88480018398968094ec0e71ad0a90ffe1909d27dac207f7680abba42d80a4ba51a6df00000000000000000000000000000000000000000000000000000000000000021ba0e0a645785e276952a772306620d9f5e936c4c0aff8cde422ef0d3f1702d0ae4ba07a9b251360ce918232f9c1f0b07c322392d41f447f24b23fd4975c3e1abd2c79c0",
+                "rlp" : "0xf90284f901f8a09058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06aeb68b0e473e36af198bcd9d4f2e6030ac48b9ffc4872b487bbd3bf8a5f885ca06ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362a045ceca25921ed254c601d5831dbd71e55457dfb34ac7faf4d21095a0377546d3b901000000000080000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000200000000000000000000000100000000000000000000000000000008000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000004000000000000000083020000018398968083016ea38203e880a07c4c2794aa4e352fdb69fd4ba44ed51ab2b40a6171f70663f231966995a841678895823a3e95e1097ef886f88480018398968094ec0e71ad0a90ffe1909d27dac207f7680abba42d80a4ba51a6df00000000000000000000000000000000000000000000000000000000000000021ba0e0a645785e276952a772306620d9f5e936c4c0aff8cde422ef0d3f1702d0ae4ba07a9b251360ce918232f9c1f0b07c322392d41f447f24b23fd4975c3e1abd2c79c0",
                 "transactions" : [
                     {
                         "data" : "0xba51a6df0000000000000000000000000000000000000000000000000000000000000002",
@@ -493,7 +486,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee773247ff23f59fce994701776888dcfcb7adbfa2fc29d7e595f39e1394e47ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0c812f62a9328f59a8a3cb702b4a71489c1fcfcb2816b29b1eb029e88979f97",
+        "lastblockhash" : "0xf86ac71543e17d21e514d7cc9af369bc5749ee8ded7f75b2382a1193d81d912b",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -572,7 +565,7 @@
     "walletChangeRequirementRemovePendingTransaction_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stWalletTest/walletChangeRequirementRemovePendingTransaction_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -584,9 +577,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016642",
-                    "hash" : "0xa7ab93f66f0e4df3bc99613b79f94f8f9744b7f183363dec4e33246a4a891c59",
-                    "mixHash" : "0x11870b599cb4dc8cb3ad3973e5c2ddd9c0b91bb730bad4e9892946cb3ecd3c79",
-                    "nonce" : "0x82f54da5cc3f2d92",
+                    "hash" : "0x422c190219327fd408e81772d91c7a38f8a392a515109e024147c94f35349585",
+                    "mixHash" : "0x5230800df44c0e29180645fcb782e3c321f13f7034757da0c6bad4ede88857e1",
+                    "nonce" : "0xab877264828bc0cb",
                     "number" : "0x01",
                     "parentHash" : "0x9058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312",
                     "receiptTrie" : "0x21531cf982305be48b5e52482fc78339d0cbaaead9cb2fb174b114693754b6a3",
@@ -595,7 +588,7 @@
                     "transactionsTrie" : "0x6ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90284f901f8a09058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069f8b556cecb85bc3e4584c33b36d3a9b4879fe4923c36bc8c80f49377c9d3c0a06ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362a021531cf982305be48b5e52482fc78339d0cbaaead9cb2fb174b114693754b6a3b9010000000000800000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000000001000000000000000000000000000000080000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000830200000183989680830166428203e880a011870b599cb4dc8cb3ad3973e5c2ddd9c0b91bb730bad4e9892946cb3ecd3c798882f54da5cc3f2d92f886f88480018398968094ec0e71ad0a90ffe1909d27dac207f7680abba42d80a4ba51a6df00000000000000000000000000000000000000000000000000000000000000021ba0e0a645785e276952a772306620d9f5e936c4c0aff8cde422ef0d3f1702d0ae4ba07a9b251360ce918232f9c1f0b07c322392d41f447f24b23fd4975c3e1abd2c79c0",
+                "rlp" : "0xf90284f901f8a09058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069f8b556cecb85bc3e4584c33b36d3a9b4879fe4923c36bc8c80f49377c9d3c0a06ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362a021531cf982305be48b5e52482fc78339d0cbaaead9cb2fb174b114693754b6a3b9010000000000800000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000000001000000000000000000000000000000080000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000830200000183989680830166428203e880a05230800df44c0e29180645fcb782e3c321f13f7034757da0c6bad4ede88857e188ab877264828bc0cbf886f88480018398968094ec0e71ad0a90ffe1909d27dac207f7680abba42d80a4ba51a6df00000000000000000000000000000000000000000000000000000000000000021ba0e0a645785e276952a772306620d9f5e936c4c0aff8cde422ef0d3f1702d0ae4ba07a9b251360ce918232f9c1f0b07c322392d41f447f24b23fd4975c3e1abd2c79c0",
                 "transactions" : [
                     {
                         "data" : "0xba51a6df0000000000000000000000000000000000000000000000000000000000000002",
@@ -632,7 +625,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee773247ff23f59fce994701776888dcfcb7adbfa2fc29d7e595f39e1394e47ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa7ab93f66f0e4df3bc99613b79f94f8f9744b7f183363dec4e33246a4a891c59",
+        "lastblockhash" : "0x422c190219327fd408e81772d91c7a38f8a392a515109e024147c94f35349585",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -711,7 +704,7 @@
     "walletChangeRequirementRemovePendingTransaction_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stWalletTest/walletChangeRequirementRemovePendingTransaction_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -723,9 +716,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016642",
-                    "hash" : "0x6f45bb1831b916233785bcb1896c6daefe80f1d16899842254032f5c4fe1c35f",
-                    "mixHash" : "0xa7cb778fd95d678d8db7106a583bd24a19f4c239276ba827b764d1fc20fdb524",
-                    "nonce" : "0x417857460a0b1c08",
+                    "hash" : "0x14398476ed43909e0dff1c4b8eea616aeeecea1f1ea21f0caf813e164f92b928",
+                    "mixHash" : "0x5ff480c2e68ad6f62ca0514e0416ffd795fef15c6774f6809f5e20d57d6fe1cf",
+                    "nonce" : "0x7189237e89c78835",
                     "number" : "0x01",
                     "parentHash" : "0x9058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312",
                     "receiptTrie" : "0x21531cf982305be48b5e52482fc78339d0cbaaead9cb2fb174b114693754b6a3",
@@ -734,7 +727,7 @@
                     "transactionsTrie" : "0x6ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90284f901f8a09058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069f8b556cecb85bc3e4584c33b36d3a9b4879fe4923c36bc8c80f49377c9d3c0a06ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362a021531cf982305be48b5e52482fc78339d0cbaaead9cb2fb174b114693754b6a3b9010000000000800000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000000001000000000000000000000000000000080000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000830200000183989680830166428203e880a0a7cb778fd95d678d8db7106a583bd24a19f4c239276ba827b764d1fc20fdb52488417857460a0b1c08f886f88480018398968094ec0e71ad0a90ffe1909d27dac207f7680abba42d80a4ba51a6df00000000000000000000000000000000000000000000000000000000000000021ba0e0a645785e276952a772306620d9f5e936c4c0aff8cde422ef0d3f1702d0ae4ba07a9b251360ce918232f9c1f0b07c322392d41f447f24b23fd4975c3e1abd2c79c0",
+                "rlp" : "0xf90284f901f8a09058fb73fb13292cfc2d1479393c57976fb81abe6cb975d2e68234406d285312a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069f8b556cecb85bc3e4584c33b36d3a9b4879fe4923c36bc8c80f49377c9d3c0a06ddc16d26316dc5d78037b9479cae745c4ec5a461813e069ad157ad03d68f362a021531cf982305be48b5e52482fc78339d0cbaaead9cb2fb174b114693754b6a3b9010000000000800000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000000001000000000000000000000000000000080000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000830200000183989680830166428203e880a05ff480c2e68ad6f62ca0514e0416ffd795fef15c6774f6809f5e20d57d6fe1cf887189237e89c78835f886f88480018398968094ec0e71ad0a90ffe1909d27dac207f7680abba42d80a4ba51a6df00000000000000000000000000000000000000000000000000000000000000021ba0e0a645785e276952a772306620d9f5e936c4c0aff8cde422ef0d3f1702d0ae4ba07a9b251360ce918232f9c1f0b07c322392d41f447f24b23fd4975c3e1abd2c79c0",
                 "transactions" : [
                     {
                         "data" : "0xba51a6df0000000000000000000000000000000000000000000000000000000000000002",
@@ -771,7 +764,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee773247ff23f59fce994701776888dcfcb7adbfa2fc29d7e595f39e1394e47ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f45bb1831b916233785bcb1896c6daefe80f1d16899842254032f5c4fe1c35f",
+        "lastblockhash" : "0x14398476ed43909e0dff1c4b8eea616aeeecea1f1ea21f0caf813e164f92b928",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {