update general state tests fillers to suite blockchain

34 files changed, 102 insertions, 102 deletions

diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
index b5f621d0b..c2dc8e729 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
@@ -2,10 +2,10 @@
     "Call1024BalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
index 3ae1fbee4..f128be269 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
@@ -2,10 +2,10 @@
     "Call1024OOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
index d4c46f8d6..1c7f3049c 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
@@ -2,10 +2,10 @@
     "Call1024PreCalls" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
index 79c199edb..90c83e426 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
@@ -2,10 +2,10 @@
     "CallLoseGasOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
index e6533bcea..20fb3316f 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
@@ -2,10 +2,10 @@
     "CallRecursiveBombPreCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
index c95e9a0f1..f471dc585 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
@@ -2,10 +2,10 @@
     "CallcodeLoseGasOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
index 779a9b33a..3d1f23f50 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
@@ -2,10 +2,10 @@
     "Delegatecall1024" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
index c3fb2d985..55e5a38c8 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
@@ -2,10 +2,10 @@
     "Delegatecall1024OOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json
index 833b8dce8..72f8cab95 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json
@@ -2,10 +2,10 @@
     "callOutput1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json
index 4bfc9f170..ee21ae515 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json
@@ -2,10 +2,10 @@
     "callOutput2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json
index ccf2f97c4..1128c9a34 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json
@@ -2,10 +2,10 @@
     "callOutput3Fail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json
index f51662866..ed47cfaaf 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json
@@ -2,10 +2,10 @@
     "callOutput3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
index 7db2c0291..5d9a742e3 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
@@ -2,10 +2,10 @@
     "callOutput3partialFail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json
index 5357a8f08..1071ea957 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json
@@ -2,10 +2,10 @@
     "callOutput3partial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
index 05fc8711c..71e32679f 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
@@ -2,10 +2,10 @@
     "callWithHighValueAndGasOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
index 907ea612a..e2f277269 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
@@ -2,10 +2,10 @@
     "callcodeOutput1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
index 589a46b05..0e5fa2f5c 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
@@ -2,10 +2,10 @@
     "callcodeOutput2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
index faffeead4..5b062fc38 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
@@ -2,10 +2,10 @@
     "callcodeOutput3Fail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
index 59cb29da3..b1e815283 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
@@ -2,10 +2,10 @@
     "callcodeOutput3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
index 49469ff81..389e15575 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partialFail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
index b2f460403..9b6beccbe 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
index a29ae633d..d0b4a95e7 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
@@ -2,10 +2,10 @@
     "callcodeWithHighValueAndGasOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
index f074f250d..f87dea507 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
@@ -2,10 +2,10 @@
     "deleagateCallAfterValueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
index 30a2bc92f..adcf97cd7 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
@@ -2,10 +2,10 @@
     "delegatecallAndOOGatTxLevel" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
index c2ac9c260..ead82d6b1 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
@@ -2,10 +2,10 @@
     "delegatecallBasic" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
index c888a9fbf..e4a0ea10d 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
@@ -2,10 +2,10 @@
     "delegatecallEmptycontract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
index 2ab064072..d4c17cc0a 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
@@ -2,10 +2,10 @@
     "delegatecallInInitcodeToEmptyContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
index f0de4758c..6db108794 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
@@ -2,10 +2,10 @@
     "delegatecallInInitcodeToExistingContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
index 6fd8bbdf7..170b86d15 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
@@ -2,10 +2,10 @@
     "delegatecallInInitcodeToExistingContractOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json
index eee3633f9..f202c636d 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json
@@ -2,10 +2,10 @@
     "delegatecallOOGinCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
index 590f23499..ec61c9c16 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
@@ -2,10 +2,10 @@
     "delegatecallSenderCheck" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
index 22cd15428..101a62c52 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
@@ -2,10 +2,10 @@
     "delegatecallValueCheck" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
index 08687506e..f7fe21acf 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
@@ -2,10 +2,10 @@
     "delegatecodeDynamicCode2SelfCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
index 990b3b1a9..14340c016 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
@@ -2,10 +2,10 @@
     "delegatecodeDynamicCode" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [