update general state tests fillers to suite blockchain

30 files changed, 89 insertions, 89 deletions

diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/Call1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/Call1024BalanceTooLowFiller.json
index d7a871119..abb4e166e 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/Call1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/Call1024BalanceTooLowFiller.json
@@ -2,10 +2,10 @@
     "Call1024BalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json
index e6673b894..41d891dc1 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json
@@ -2,10 +2,10 @@
     "Call1024PreCalls" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/Callcode1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/Callcode1024BalanceTooLowFiller.json
index 17632a7de..f5a25d71e 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/Callcode1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/Callcode1024BalanceTooLowFiller.json
@@ -2,10 +2,10 @@
     "Callcode1024BalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_1Filler.json
index 1000490a7..725156920 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_1Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_1Filler.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_2Filler.json
index ff506f77e..ff4532fa7 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_2Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_2Filler.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_valueTransferFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_valueTransferFiller.json
index ae60372e3..59934c477 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_valueTransferFiller.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_valueTransferFiller.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_valueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcall_000_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcall_000_OOGMAfterFiller.json
index 3e9d65778..7d6052fce 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcall_000_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcall_000_OOGMAfterFiller.json
@@ -2,10 +2,10 @@
     "callcallcall_000_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_1Filler.json
index 60e519514..b9279f0bb 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_1Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_1Filler.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_2Filler.json
index e3eb7f8eb..70ff1e55d 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_2Filler.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_3Filler.json
index 5cba2b814..aa7f687b2 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_3Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_3Filler.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_1Filler.json
index 7129d0a6e..f935db78b 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_1Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_1Filler.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_2Filler.json
index 0107c41d5..88fbce3b8 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_2Filler.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_3Filler.json
index aa1492029..d3ff4c2a6 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_3Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_3Filler.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1Filler.json
index cfc40e10d..f1fcbfff6 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1Filler.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2Filler.json
index e2fca3944..372879769 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2Filler.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_1Filler.json
index a27fdf372..8b16a129b 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_1Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_1Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_2Filler.json
index 0807cdf58..c06bc520a 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_2Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_3Filler.json
index 5186d0dce..7665165a3 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_3Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_3Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1Filler.json
index 85c5ce97b..b6446a6c1 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2Filler.json
index cd964fcde..75fccdd62 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3Filler.json
index fdfd2122b..773c0a148 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1Filler.json
index a6abcef84..97f929086 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2Filler.json
index 0574f2bc0..0cf30c93b 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3Filler.json
index dee50d14c..a7163c77e 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfterFiller.json
index 46eca7f90..13cb66e2a 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfterFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1Filler.json
index c77a6194d..936d0c236 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2Filler.json
index fd0b42ae7..bea32eced 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3Filler.json
index 236d034d9..3f930a4de 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3Filler.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json
index e9bace959..c61def654 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json
@@ -2,10 +2,10 @@
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json
index 00942a80c..167291223 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json
@@ -2,10 +2,10 @@
     "createInitFail_OOGduringInit" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [