refill general state tests

34 files changed, 102 insertions, 102 deletions

diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json b/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json
index e9485daa4..1d1cf5554 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json
@@ -2,10 +2,10 @@
     "Call1024BalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json b/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json
index 6fbb268dd..b1be09ab2 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json
@@ -2,10 +2,10 @@
     "Call1024OOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json b/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json
index b98c7702d..3a8b9628d 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json
@@ -2,10 +2,10 @@
     "Call1024PreCalls" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json
index 709291a12..2d827f806 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json
@@ -2,10 +2,10 @@
     "CallLoseGasOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json b/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json
index 29cb0e6dd..cfa393c7b 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json
@@ -2,10 +2,10 @@
     "CallRecursiveBombPreCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
index 7c3db8a7e..493a63f44 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
@@ -2,10 +2,10 @@
     "CallcodeLoseGasOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json b/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json
index eb367f073..400b8cd1b 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json
@@ -2,10 +2,10 @@
     "Delegatecall1024" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json b/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json
index e36894c78..b9c375085 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json
@@ -2,10 +2,10 @@
     "Delegatecall1024OOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json
index 5fca5eb1e..acc9a3b68 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json
@@ -2,10 +2,10 @@
     "callOutput1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json
index 2beb2919b..0d322bfbb 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json
@@ -2,10 +2,10 @@
     "callOutput2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json
index d9c96c488..8271a4e2e 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json
@@ -2,10 +2,10 @@
     "callOutput3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json
index c9f8841a5..0fe7a8c39 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json
@@ -2,10 +2,10 @@
     "callOutput3Fail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json
index 2daf984df..6bc8f5a99 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json
@@ -2,10 +2,10 @@
     "callOutput3partial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json
index dfe2787c7..8dc14c65a 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json
@@ -2,10 +2,10 @@
     "callOutput3partialFail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json
index 94421493d..a433c025d 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json
@@ -2,10 +2,10 @@
     "callWithHighValueAndGasOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json
index 985e32dfc..77c384e77 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json
@@ -2,10 +2,10 @@
     "callcodeOutput1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json
index 29e547d92..9d0c0b0ab 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json
@@ -2,10 +2,10 @@
     "callcodeOutput2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json
index 05f209bb2..dcc8f702b 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json
@@ -2,10 +2,10 @@
     "callcodeOutput3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json
index 1c507d10c..d14c1ae0b 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json
@@ -2,10 +2,10 @@
     "callcodeOutput3Fail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json
index 1fcc3b1c5..38b33435d 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json
index b1e11b692..663d18095 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partialFail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json
index 57cb51fbe..abeae986d 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json
@@ -2,10 +2,10 @@
     "callcodeWithHighValueAndGasOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json b/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json
index 254fda8ac..c2bb8bb62 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json
@@ -2,10 +2,10 @@
     "deleagateCallAfterValueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json
index 58dce29e6..0e895f573 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json
@@ -2,10 +2,10 @@
     "delegatecallAndOOGatTxLevel" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json
index 877497131..3445f045e 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json
@@ -2,10 +2,10 @@
     "delegatecallBasic" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
index b42153a80..fae7056bb 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
@@ -2,10 +2,10 @@
     "delegatecallEmptycontract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
index a6a2362da..3b50b1e6e 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
@@ -2,10 +2,10 @@
     "delegatecallInInitcodeToEmptyContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json
index c9f5800f4..f257e30e7 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json
@@ -2,10 +2,10 @@
     "delegatecallInInitcodeToExistingContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json
index 48ec4bb70..d7f5938e6 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json
@@ -2,10 +2,10 @@
     "delegatecallInInitcodeToExistingContractOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json
index 7044a33fc..e99bf93b5 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json
@@ -2,10 +2,10 @@
     "delegatecallOOGinCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
index 99b7416c0..d2f40b387 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
@@ -2,10 +2,10 @@
     "delegatecallSenderCheck" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json
index 917668b67..8c735e676 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json
@@ -2,10 +2,10 @@
     "delegatecallValueCheck" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json
index 475c3a659..d45a64d70 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json
@@ -2,10 +2,10 @@
     "delegatecodeDynamicCode" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json
index 673f56eaf..1b9435e18 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json
@@ -2,10 +2,10 @@
     "delegatecodeDynamicCode2SelfCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {