refill general state tests

42 files changed, 213 insertions, 213 deletions

diff --git a/GeneralStateTests/stWalletTest/dayLimitConstruction.json b/GeneralStateTests/stWalletTest/dayLimitConstruction.json
index 9dab6deb1..cada718c3 100644
--- a/GeneralStateTests/stWalletTest/dayLimitConstruction.json
+++ b/GeneralStateTests/stWalletTest/dayLimitConstruction.json
@@ -1,17 +1,17 @@
 {
-    "dayLimitConstruction " : {
+    "dayLimitConstruction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ed81234935fb19c5c48025847ffb0811ff29aa19f83e54c5ebeb9fac2a14017c",
+                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "ed81234935fb19c5c48025847ffb0811ff29aa19f83e54c5ebeb9fac2a14017c",
+                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f225f2559b4fc4aee19024e0b91fb9b08a8e60a9ed5bfeed243304fda7dbc085",
+                    "hash" : "56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "afa10cbed56d94a198246670b71ab820d3f3e53433eff42c787d94308aecb02f",
+                    "hash" : "56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b497a0b8e92fb3f2bbaf3c3b614b41ec501e1faf4e7b4f6952bde008a4efa0cd",
+                    "hash" : "0ee86fc01d7944c33b3b8babbc4f94d9043ce11d7524cf7d7dcd528e8a830815",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "b497a0b8e92fb3f2bbaf3c3b614b41ec501e1faf4e7b4f6952bde008a4efa0cd",
+                    "hash" : "0ee86fc01d7944c33b3b8babbc4f94d9043ce11d7524cf7d7dcd528e8a830815",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ed81234935fb19c5c48025847ffb0811ff29aa19f83e54c5ebeb9fac2a14017c",
+                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "ed81234935fb19c5c48025847ffb0811ff29aa19f83e54c5ebeb9fac2a14017c",
+                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
diff --git a/GeneralStateTests/stWalletTest/dayLimitConstructionOOG.json b/GeneralStateTests/stWalletTest/dayLimitConstructionOOG.json
index a045b6e63..64e7d3886 100644
--- a/GeneralStateTests/stWalletTest/dayLimitConstructionOOG.json
+++ b/GeneralStateTests/stWalletTest/dayLimitConstructionOOG.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitConstructionOOG " : {
+    "dayLimitConstructionOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7757eb985d0d319cd645a63d5ce9cecbfb8bb4ea3d481d3c1a8a171d8804c78c",
+                    "hash" : "adcf2b13c275760d72cf61dc682be74826170608f8ef2b352b3612dbe45aaec7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json b/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json
index 522bfc66f..29a4a0f45 100644
--- a/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json
+++ b/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json
@@ -1,17 +1,17 @@
 {
-    "dayLimitConstructionPartial " : {
+    "dayLimitConstructionPartial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ee7fe1365c006ad0822e65b9f897444f2d41a7d88d514a322eb52d92c5730624",
+                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ee7fe1365c006ad0822e65b9f897444f2d41a7d88d514a322eb52d92c5730624",
+                    "hash" : "56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b497a0b8e92fb3f2bbaf3c3b614b41ec501e1faf4e7b4f6952bde008a4efa0cd",
+                    "hash" : "0ee86fc01d7944c33b3b8babbc4f94d9043ce11d7524cf7d7dcd528e8a830815",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ee7fe1365c006ad0822e65b9f897444f2d41a7d88d514a322eb52d92c5730624",
+                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/dayLimitResetSpentToday.json b/GeneralStateTests/stWalletTest/dayLimitResetSpentToday.json
index faf35cf95..90cfaba53 100644
--- a/GeneralStateTests/stWalletTest/dayLimitResetSpentToday.json
+++ b/GeneralStateTests/stWalletTest/dayLimitResetSpentToday.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitResetSpentToday " : {
+    "dayLimitResetSpentToday" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/dayLimitSetDailyLimit.json b/GeneralStateTests/stWalletTest/dayLimitSetDailyLimit.json
index eebd9ed0e..4c40a5f69 100644
--- a/GeneralStateTests/stWalletTest/dayLimitSetDailyLimit.json
+++ b/GeneralStateTests/stWalletTest/dayLimitSetDailyLimit.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitSetDailyLimit " : {
+    "dayLimitSetDailyLimit" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/dayLimitSetDailyLimitNoData.json b/GeneralStateTests/stWalletTest/dayLimitSetDailyLimitNoData.json
index 4715c156e..3687f972d 100644
--- a/GeneralStateTests/stWalletTest/dayLimitSetDailyLimitNoData.json
+++ b/GeneralStateTests/stWalletTest/dayLimitSetDailyLimitNoData.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitSetDailyLimitNoData " : {
+    "dayLimitSetDailyLimitNoData" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedAddOwner.json b/GeneralStateTests/stWalletTest/multiOwnedAddOwner.json
index 62d4712c6..f9f4ce320 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedAddOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedAddOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedAddOwner " : {
+    "multiOwnedAddOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedAddOwnerAddMyself.json b/GeneralStateTests/stWalletTest/multiOwnedAddOwnerAddMyself.json
index 025344f9e..1244d02b1 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedAddOwnerAddMyself.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedAddOwnerAddMyself.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedAddOwnerAddMyself " : {
+    "multiOwnedAddOwnerAddMyself" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner.json b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner.json
index 73ed6b102..53ddcdb42 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeOwner " : {
+    "multiOwnedChangeOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeOwnerNoArgument.json b/GeneralStateTests/stWalletTest/multiOwnedChangeOwnerNoArgument.json
index 62cd49c4a..8b3007118 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeOwnerNoArgument.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeOwnerNoArgument.json
@@ -2,10 +2,10 @@
     "multiOwnedChangeOwnerNoArgument" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_fromNotOwner.json b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_fromNotOwner.json
index ef9450841..a3afc0986 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_fromNotOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_fromNotOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeOwner_fromNotOwner " : {
+    "multiOwnedChangeOwner_fromNotOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_toIsOwner.json b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_toIsOwner.json
index d4688ddfa..50a0589a4 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_toIsOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_toIsOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeOwner_toIsOwner " : {
+    "multiOwnedChangeOwner_toIsOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo0.json b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo0.json
index 1cca7a199..cf39a4d59 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo0.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo0.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeRequirementTo0 " : {
+    "multiOwnedChangeRequirementTo0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo1.json b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo1.json
index 82638e3f5..8acf385d2 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo1.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo1.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeRequirementTo1 " : {
+    "multiOwnedChangeRequirementTo1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo2.json b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo2.json
index cb550904a..49b834542 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo2.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo2.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeRequirementTo2 " : {
+    "multiOwnedChangeRequirementTo2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json b/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json
index db3afd8df..6b62ca32f 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedConstructionCorrect " : {
+    "multiOwnedConstructionCorrect" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGas.json b/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGas.json
index d5e9e50a0..8d73b05cb 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGas.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGas.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedConstructionNotEnoughGas " : {
+    "multiOwnedConstructionNotEnoughGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGasPartial.json b/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGasPartial.json
index d6df67633..4ee1a67a5 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGasPartial.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGasPartial.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedConstructionNotEnoughGasPartial " : {
+    "multiOwnedConstructionNotEnoughGasPartial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedIsOwnerFalse.json b/GeneralStateTests/stWalletTest/multiOwnedIsOwnerFalse.json
index 49e9c06ce..b3ff665cc 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedIsOwnerFalse.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedIsOwnerFalse.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedIsOwnerFalse " : {
+    "multiOwnedIsOwnerFalse" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedIsOwnerTrue.json b/GeneralStateTests/stWalletTest/multiOwnedIsOwnerTrue.json
index 8701604c9..bb410ea36 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedIsOwnerTrue.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedIsOwnerTrue.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedIsOwnerTrue " : {
+    "multiOwnedIsOwnerTrue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner.json b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner.json
index 505862302..0d1f849a4 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRemoveOwner " : {
+    "multiOwnedRemoveOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwnerByNonOwner.json b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwnerByNonOwner.json
index 38a3a0728..4c63ec6d0 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwnerByNonOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwnerByNonOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRemoveOwnerByNonOwner " : {
+    "multiOwnedRemoveOwnerByNonOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_mySelf.json b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_mySelf.json
index bdfc014a5..b32804460 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_mySelf.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_mySelf.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRemoveOwner_mySelf " : {
+    "multiOwnedRemoveOwner_mySelf" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwner.json b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwner.json
index 67ff69eb3..ca4679306 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRemoveOwner_ownerIsNotOwner " : {
+    "multiOwnedRemoveOwner_ownerIsNotOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRevokeNothing.json b/GeneralStateTests/stWalletTest/multiOwnedRevokeNothing.json
index 04c09a8d1..c44ac0264 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRevokeNothing.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRevokeNothing.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRevokeNothing " : {
+    "multiOwnedRevokeNothing" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletAddOwnerRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletAddOwnerRemovePendingTransaction.json
index a2a5639ce..f5719463b 100644
--- a/GeneralStateTests/stWalletTest/walletAddOwnerRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletAddOwnerRemovePendingTransaction.json
@@ -1,11 +1,11 @@
 {
-    "walletAddOwnerRemovePendingTransaction " : {
+    "walletAddOwnerRemovePendingTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletChangeOwnerRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletChangeOwnerRemovePendingTransaction.json
index 3e3294d11..84573872c 100644
--- a/GeneralStateTests/stWalletTest/walletChangeOwnerRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletChangeOwnerRemovePendingTransaction.json
@@ -1,11 +1,11 @@
 {
-    "walletChangeOwnerRemovePendingTransaction " : {
+    "walletChangeOwnerRemovePendingTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json
index ec0a5f0bc..c86b027e0 100644
--- a/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json
@@ -1,11 +1,11 @@
 {
-    "walletChangeRequirementRemovePendingTransaction " : {
+    "walletChangeRequirementRemovePendingTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletConfirm.json b/GeneralStateTests/stWalletTest/walletConfirm.json
index 1d2fe8cde..ab028e0f4 100644
--- a/GeneralStateTests/stWalletTest/walletConfirm.json
+++ b/GeneralStateTests/stWalletTest/walletConfirm.json
@@ -1,11 +1,11 @@
 {
-    "walletConfirm " : {
+    "walletConfirm" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletConstruction.json b/GeneralStateTests/stWalletTest/walletConstruction.json
index 13650b37c..8feb73c6e 100644
--- a/GeneralStateTests/stWalletTest/walletConstruction.json
+++ b/GeneralStateTests/stWalletTest/walletConstruction.json
@@ -1,17 +1,17 @@
 {
-    "walletConstruction " : {
+    "walletConstruction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fc08ac63b6a8002515ba5b39754c4bf07ce7c9d1e3c74fd6491336cfe8197a5c",
+                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "c26d9edc7d3a7869a06febbdf5f89fe361263fabd6b4e69919e2d4686360f24a",
+                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "db8c1c5809f00578b61bd8b08d3f65318aa46c12b2affa8f18b59bbcf5eae69d",
+                    "hash" : "de273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "db8c1c5809f00578b61bd8b08d3f65318aa46c12b2affa8f18b59bbcf5eae69d",
+                    "hash" : "de273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
diff --git a/GeneralStateTests/stWalletTest/walletConstructionOOG.json b/GeneralStateTests/stWalletTest/walletConstructionOOG.json
index 977dda1d4..0fa468a42 100644
--- a/GeneralStateTests/stWalletTest/walletConstructionOOG.json
+++ b/GeneralStateTests/stWalletTest/walletConstructionOOG.json
@@ -1,11 +1,11 @@
 {
-    "walletConstructionOOG " : {
+    "walletConstructionOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "cfb28c1ba1d5dda09a48def32e6be10cdbc290e63b85769a85e27b68ab0bc6ef",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "cfb28c1ba1d5dda09a48def32e6be10cdbc290e63b85769a85e27b68ab0bc6ef",
+                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3c9b4f4c32d0880433951d6f9e3e516658aa37820abd29eb3ebcad3f8d03be22",
+                    "hash" : "bb177d808c1e3345f197c1690948a45da1b91056b93473a31f0f106be4b31683",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "db8c1c5809f00578b61bd8b08d3f65318aa46c12b2affa8f18b59bbcf5eae69d",
+                    "hash" : "de273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "cfb28c1ba1d5dda09a48def32e6be10cdbc290e63b85769a85e27b68ab0bc6ef",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
diff --git a/GeneralStateTests/stWalletTest/walletConstructionPartial.json b/GeneralStateTests/stWalletTest/walletConstructionPartial.json
index 74215d4ae..efe1e6984 100644
--- a/GeneralStateTests/stWalletTest/walletConstructionPartial.json
+++ b/GeneralStateTests/stWalletTest/walletConstructionPartial.json
@@ -1,17 +1,17 @@
 {
-    "walletConstructionPartial " : {
+    "walletConstructionPartial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c26d9edc7d3a7869a06febbdf5f89fe361263fabd6b4e69919e2d4686360f24a",
+                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "db8c1c5809f00578b61bd8b08d3f65318aa46c12b2affa8f18b59bbcf5eae69d",
+                    "hash" : "de273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/walletDefault.json b/GeneralStateTests/stWalletTest/walletDefault.json
index 42f17888a..ecf61cdc1 100644
--- a/GeneralStateTests/stWalletTest/walletDefault.json
+++ b/GeneralStateTests/stWalletTest/walletDefault.json
@@ -1,11 +1,11 @@
 {
-    "walletDefault " : {
+    "walletDefault" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletDefaultWithOutValue.json b/GeneralStateTests/stWalletTest/walletDefaultWithOutValue.json
index 8da79e480..7bc6adeb8 100644
--- a/GeneralStateTests/stWalletTest/walletDefaultWithOutValue.json
+++ b/GeneralStateTests/stWalletTest/walletDefaultWithOutValue.json
@@ -1,11 +1,11 @@
 {
-    "walletDefaultWithOutValue " : {
+    "walletDefaultWithOutValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitMultiOwner.json b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitMultiOwner.json
index ad569e32a..132d78586 100644
--- a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitMultiOwner.json
+++ b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitMultiOwner.json
@@ -1,17 +1,17 @@
 {
-    "walletExecuteOverDailyLimitMultiOwner " : {
+    "walletExecuteOverDailyLimitMultiOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "39c41a9bb1ef618d353ac50d37c0c4105d27f7d2f72a33ce9f9e09267ea454d4",
+                    "hash" : "f36bbfa8ef75d0827091e979ab45f88aca100449e23efa61baa1ea9187450db2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7fa8578f56078e6968c6eb4d78e7ce3b9d4f6737591fb510cd0f2997917364fe",
+                    "hash" : "4e98ab6f78c177e5a950cbae526866c7bf2f2245aa27e5d47cffcc513b49d3f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "70e895d75fd4223ced63de48e748ce8199c5ceeff4793e8315c161f9723bbaf7",
+                    "hash" : "47c3b7b4a9488688b0e7fdface2c118672bc9cd9cf7d56316b0d7c42b4530b18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "70e895d75fd4223ced63de48e748ce8199c5ceeff4793e8315c161f9723bbaf7",
+                    "hash" : "47c3b7b4a9488688b0e7fdface2c118672bc9cd9cf7d56316b0d7c42b4530b18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwner.json b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwner.json
index e04cf2b89..6cdd90a65 100644
--- a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwner.json
+++ b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwner.json
@@ -1,17 +1,17 @@
 {
-    "walletExecuteOverDailyLimitOnlyOneOwner " : {
+    "walletExecuteOverDailyLimitOnlyOneOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "68ea06f8a8373546423a99a7dac7019a7a5aee5dcead4bfd4fa37266dcb431c6",
+                    "hash" : "4560f9f796eadd8b25fa6aab7820c620399268377eb5183d45cecf11d3861005",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9fc087bfbfa9e369c6be53c4a7ceadbe99924a6c063a175cad49e48ba129f208",
+                    "hash" : "c35acda0bf3e60848029418fa6e7f4b9f7de0d0b72ca136aa8cc19e866ab78d0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9bcebfe40914dc85779277c5ee18263b4ff7bbba11f1a4d16ffc9cf52ce8045e",
+                    "hash" : "2d54afeef9b30b0a8ccfb4c8017300d86f54e74ee22d348a0954ed60e24ddbf5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9bcebfe40914dc85779277c5ee18263b4ff7bbba11f1a4d16ffc9cf52ce8045e",
+                    "hash" : "2d54afeef9b30b0a8ccfb4c8017300d86f54e74ee22d348a0954ed60e24ddbf5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNew.json b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNew.json
index fdee935fa..2669e6df8 100644
--- a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNew.json
+++ b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNew.json
@@ -1,17 +1,17 @@
 {
-    "walletExecuteOverDailyLimitOnlyOneOwnerNew " : {
+    "walletExecuteOverDailyLimitOnlyOneOwnerNew" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5430246c957676dfd15afc89c687b41ff114b3b21923b0b24a184f94fdc5793a",
+                    "hash" : "fb4f90b233539bf0aba711d7b1070b31421272a0a34c9f3c9cf5d531ee110ba3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "adcc1c3e7bbb3765c9c6ce55ea77ddf54c7ca3d6cc1c61b35478150f05cec258",
+                    "hash" : "467ed06f47f9361f8b3112e8c5958013d8e1e4cae54784a1e5b56a079c611b85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1108db6168d39507d87ba3ba1c9a40e99f9393489c4a8577c71f73251bc72c07",
+                    "hash" : "0d1e55d5b34a8dc8c28112c2c69d85d4bf22320367238cb469de61bde0041fc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1108db6168d39507d87ba3ba1c9a40e99f9393489c4a8577c71f73251bc72c07",
+                    "hash" : "0d1e55d5b34a8dc8c28112c2c69d85d4bf22320367238cb469de61bde0041fc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/walletExecuteUnderDailyLimit.json b/GeneralStateTests/stWalletTest/walletExecuteUnderDailyLimit.json
index b192fd7da..af1938f18 100644
--- a/GeneralStateTests/stWalletTest/walletExecuteUnderDailyLimit.json
+++ b/GeneralStateTests/stWalletTest/walletExecuteUnderDailyLimit.json
@@ -1,17 +1,17 @@
 {
-    "walletExecuteUnderDailyLimit " : {
+    "walletExecuteUnderDailyLimit" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c2c581694bc15abea73a08e924614a579cbdf069944ebd5d3daba67714e8f869",
+                    "hash" : "0c610f77ce142f0eaf4e1d797b2b747c59bf319e28dc79af20dac4b69b5d5927",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "698f2b036b3d2cf9f35eb330c57073a4d67e6de806bc12b8f7f53c7629bfa8c6",
+                    "hash" : "689518c4f1ed3b9c2d585a105cd224aa01e5b951ec744d4fdb5d5b19ab6e8d63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "883670dccc674e0e6a9d5f8d15bcfd67b973d8506f0c454d4f1468db7cf9be4d",
+                    "hash" : "34221d1e5aed8f56e27a05cc9f59135b04a8889f4c36e58df32027e4445c00ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "883670dccc674e0e6a9d5f8d15bcfd67b973d8506f0c454d4f1468db7cf9be4d",
+                    "hash" : "34221d1e5aed8f56e27a05cc9f59135b04a8889f4c36e58df32027e4445c00ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/walletKill.json b/GeneralStateTests/stWalletTest/walletKill.json
index 6ad9b8a8a..41a5aca4b 100644
--- a/GeneralStateTests/stWalletTest/walletKill.json
+++ b/GeneralStateTests/stWalletTest/walletKill.json
@@ -1,11 +1,11 @@
 {
-    "walletKill " : {
+    "walletKill" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletKillNotByOwner.json b/GeneralStateTests/stWalletTest/walletKillNotByOwner.json
index 6ee210600..ec41c7625 100644
--- a/GeneralStateTests/stWalletTest/walletKillNotByOwner.json
+++ b/GeneralStateTests/stWalletTest/walletKillNotByOwner.json
@@ -1,11 +1,11 @@
 {
-    "walletKillNotByOwner " : {
+    "walletKillNotByOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletKillToWallet.json b/GeneralStateTests/stWalletTest/walletKillToWallet.json
index 1a7138c77..317999cc3 100644
--- a/GeneralStateTests/stWalletTest/walletKillToWallet.json
+++ b/GeneralStateTests/stWalletTest/walletKillToWallet.json
@@ -1,11 +1,11 @@
 {
-    "walletKillToWallet " : {
+    "walletKillToWallet" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletRemoveOwnerRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletRemoveOwnerRemovePendingTransaction.json
index 88f57143b..3a58a845a 100644
--- a/GeneralStateTests/stWalletTest/walletRemoveOwnerRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletRemoveOwnerRemovePendingTransaction.json
@@ -1,11 +1,11 @@
 {
-    "walletRemoveOwnerRemovePendingTransaction " : {
+    "walletRemoveOwnerRemovePendingTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {