update general state tests fillers to suite blockchain

39 files changed, 120 insertions, 120 deletions

diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json
index feb61af1a..ee86aa86d 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json
@@ -2,10 +2,10 @@
     "Call1024BalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json
index e2736bfcf..edc932f45 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json
@@ -2,10 +2,10 @@
     "Call1024OOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json
index 5b07703d5..774e9ab98 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json
@@ -2,10 +2,10 @@
     "Call1024PreCalls" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json
index 5b43e9103..38c58252b 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json
@@ -2,10 +2,10 @@
     "CallLoseGasOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json
index 36a16285b..9b769f042 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json
@@ -2,10 +2,10 @@
     "CallRecursiveBombPreCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json
index 0419cd73a..f53ece3c7 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json
@@ -2,10 +2,10 @@
     "Callcode1024BalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json
index 3e27442cb..0dfe94485 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json
@@ -2,10 +2,10 @@
     "Callcode1024OOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json
index 10dc465c6..5b2b38e09 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json
@@ -2,10 +2,10 @@
     "CallcodeLoseGasOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput1Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput1Filler.json
index 9fd62f517..56824e0e9 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput1Filler.json
@@ -2,10 +2,10 @@
     "callOutput1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput2Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput2Filler.json
index 20c490b1c..ea6a51c0d 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput2Filler.json
@@ -2,10 +2,10 @@
     "callOutput2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3FailFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3FailFiller.json
index 1f6a848b2..b197595e8 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3FailFiller.json
@@ -2,10 +2,10 @@
     "callOutput3Fail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3Filler.json
index b61ecc18a..f15f28049 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3Filler.json
@@ -2,10 +2,10 @@
     "callOutput3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFailFiller.json
index b7bc6715f..2ece54f36 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFailFiller.json
@@ -2,10 +2,10 @@
     "callOutput3partialFail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFiller.json
index bfcb0f208..8ba539ecc 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFiller.json
@@ -2,10 +2,10 @@
     "callOutput3partial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndGasOOGFiller.json
index 603c8d0ae..45d68f22f 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndGasOOGFiller.json
@@ -2,10 +2,10 @@
     "callWithHighValueAndGasOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json
index 14f6429a9..60426fca4 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json
@@ -2,10 +2,10 @@
     "callWithHighValueAndOOGatTxLevel" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueFiller.json
index e31433172..a47f42331 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueFiller.json
@@ -2,10 +2,10 @@
     "callWithHighValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueOOGinCallFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueOOGinCallFiller.json
index e7bc1277b..8fcea5d77 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueOOGinCallFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueOOGinCallFiller.json
@@ -2,10 +2,10 @@
     "callWithHighValueOOGinCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput1Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput1Filler.json
index 4978e2e79..d8a3272f2 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput1Filler.json
@@ -2,10 +2,10 @@
     "callcodeOutput1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput2Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput2Filler.json
index 53aef1c15..7d069b37b 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput2Filler.json
@@ -2,10 +2,10 @@
     "callcodeOutput2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3FailFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3FailFiller.json
index 091214fb0..438a9a609 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3FailFiller.json
@@ -2,10 +2,10 @@
     "callcodeOutput3Fail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3Filler.json
index 1935ae399..a0a2379ba 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3Filler.json
@@ -2,10 +2,10 @@
     "callcodeOutput3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFailFiller.json
index d70044f13..61b4b6a4e 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFailFiller.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partialFail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFiller.json
index 913937428..7ea6ab968 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFiller.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOGFiller.json
index 4fc9a8b04..387dbbce6 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOGFiller.json
@@ -2,10 +2,10 @@
     "callcodeWithHighValueAndGasOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueFiller.json
index 2294eb33d..49f65940e 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueFiller.json
@@ -2,10 +2,10 @@
     "callcodeWithHighValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
index 96e8a50e3..cfb398699 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
@@ -2,10 +2,10 @@
     "createFailBalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "100000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
index ba6ea40f2..ad58180c9 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
@@ -2,10 +2,10 @@
     "createInitFailBadJumpDestination" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "100000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
index 8c83ce6d8..0bf73dab8 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
@@ -2,10 +2,10 @@
     "createInitFailStackSizeLargerThan1024" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "100000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
index ca764e201..ccccc33f2 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
@@ -2,10 +2,10 @@
     "createInitFailStackUnderflow" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "100000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
index ca24d6627..75f644a2b 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
@@ -2,10 +2,10 @@
     "createInitFailUndefinedInstruction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "100000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json
index b38325513..c9984e3a7 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json
@@ -2,10 +2,10 @@
     "createInitFail_OOGduringInit" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "100000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json
index 740cd15f9..502c0dd1f 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json
@@ -2,10 +2,10 @@
     "createInitOOGforCREATE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "100000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json
index 44a0c3041..83230127e 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json
@@ -2,10 +2,10 @@
     "createJS_ExampleContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
@@ -19,7 +19,7 @@
                     	    "0x01" : "0x42",
                     	    "0x02" : "0x23",
                     	    "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    	    "0x05" : "0x01"
+                    	    "0x05" : "0x03e8"
                 	}
                      }
             	}
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json
index a9b691743..9a4a84c7d 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json
@@ -1,11 +1,11 @@
 {
-    "createJS_ExampleContract" : {
+    "createJS_NoCollision" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
@@ -19,7 +19,7 @@
                     	    "0x01" : "0x42",
                     	    "0x02" : "0x23",
                     	    "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    	    "0x05" : "0x01"
+                    	    "0x05" : "0x03e8"
                 	}
                      }
             	}
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json
index 6b7bdbcbe..d9403746b 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxs" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json
index 889c01b69..492ec9f86 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxsNotEnoughGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
 	"expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGasFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGasFiller.json
index 0e9da35f7..793712a41 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGasFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGasFiller.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPreStore1NotEnoughGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "100000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHighFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHighFiller.json
index 02ece3c95..1283141d2 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHighFiller.json
@@ -2,10 +2,10 @@
     "createNameRegistratorendowmentTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [