Rename duplicated keys in filler JSON files

22 files changed, 46 insertions, 53 deletions

diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json
index 89c0d33ad..9babdb9dd 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json
@@ -40,7 +40,7 @@
             },
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"code" : "This indicates that a call from transaction was initiated",
+		"// code" : "This indicates that a call from transaction was initiated",
                 "code" : "{ (MSTORE 1 1) }",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
index fadc575ee..ea85195d7 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
@@ -58,7 +58,7 @@
             },
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"code" : "This indicates that a call from transaction was initiated",
+		"// code" : "This indicates that a call from transaction was initiated",
                 "code" : "{[[1]]12}",
                 "nonce" : "0",
                 "storage" : {
@@ -66,7 +66,7 @@
             },
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"code" : "This indicates that a call from transaction was initiated",
+		"// code" : "This indicates that a call from transaction was initiated",
                 "code" : "{[[1]]12}",
                 "nonce" : "0",
                 "storage" : {
@@ -74,7 +74,7 @@
             },
 	    "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"code" : "This indicates that a call from transaction was initiated",
+		"// code" : "This indicates that a call from transaction was initiated",
                 "code" : "{ (MSTORE 1 1) }",
                 "nonce" : "0",
                 "storage" : {
@@ -82,7 +82,7 @@
             },
 	    "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"code" : "This indicates that a call from transaction was initiated",
+		"// code" : "This indicates that a call from transaction was initiated",
                 "code" : "{(MSTORE 1 1) }",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json
index 0e17db365..6c92cdc9c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json
@@ -40,7 +40,7 @@
             },
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"code" : "This indicates that a call from transaction was initiated",
+		"// code" : "This indicates that a call from transaction was initiated",
                 "code" : "{[[1]]12}",
                 "nonce" : "0",
                 "storage" : {
@@ -48,7 +48,7 @@
             },
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"code" : "This indicates that a call from transaction was initiated",
+		"// code" : "This indicates that a call from transaction was initiated",
                 "code" : "{ (MSTORE 1 1) }",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
index 08f5f29be..87ce19b50 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
@@ -49,7 +49,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ [[0]]12 (STATICCALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}",
+		"// code" : "{ [[0]]12 (STATICCALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0)}",
 		"code" : "{ [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[2]] (GAS) [[3]] (STATICCALL 60000 (SLOAD 1) 0 0 0 0) [[100]] (GAS) }",
 		"storage": {
 		}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json
index 9ee79f5e6..2ff2dd54e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json
@@ -77,8 +77,8 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "By new EIP150 rules this transaction would be executed even if call consumes more gas then transaction has.",
-		"code" : "Staticcall goes oog and eats 600k gas",
+		"//0 code" : "By new EIP150 rules this transaction would be executed even if call consumes more gas then transaction has.",
+		"//1 code" : "Staticcall goes oog and eats 600k gas",
 		"code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (STATICCALL 600000 0x1000000000000000000000000000000000000103 0 0 0 0)) (SSTORE 10 (CALLCODE 600000 0x1000000000000000000000000000000000000103 0 0 0 0 0)) }",
 		"storage": {
 		}
@@ -86,7 +86,7 @@
 	    "1000000000000000000000000000000000000103" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "should be 12 in the post state",
+		"// code" : "should be 12 in the post state",
 		"code" : "{ (SSTORE 0 0x12) } ",
 		"storage": {
 		}
@@ -94,8 +94,8 @@
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "By new EIP150 rules this transaction would be executed even if call consumes more gas then transaction has.",
-		"code" : "Staticcall goes oog and eats 600k gas",
+		"//0 code" : "By new EIP150 rules this transaction would be executed even if call consumes more gas then transaction has.",
+		"//1 code" : "Staticcall goes oog and eats 600k gas",
 		"code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (STATICCALL 600000 0x2000000000000000000000000000000000000103 0 0 0 0)) (SSTORE 10 (CALLCODE 600000 0x1000000000000000000000000000000000000103 0 0 0 0 0)) }",
 		"storage": {
 		}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json
index 09a0cc6e1..f485c0412 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json
@@ -95,7 +95,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "ordinal call should work but on second depth it has call that asks more gas than left",
+		"// code" : "ordinal call should work but on second depth it has call that asks more gas than left",
 		"code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (STATICCALL 200000 0x1000000000000000000000000000000000000107 0 0 0 0)) } ",
 		"storage": {
 		}
@@ -110,7 +110,7 @@
 	    "1000000000000000000000000000000000000108" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "should be set in the post state",
+		"// code" : "should be set in the post state",
 		"code" : "{ (SSTORE 8 (GAS))} ",
 		"storage": {
 		}
@@ -118,7 +118,7 @@
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "ordinal call should work but on second depth it has call that asks more gas than left",
+		"// code" : "ordinal call should work but on second depth it has call that asks more gas than left",
 		"code" : "{ (SSTORE 8 (GAS)) (SSTORE 9 (STATICCALL 200000 0x2000000000000000000000000000000000000107 0 0 0 0)) } ",
 		"storage": {
 		}
@@ -133,7 +133,7 @@
 	    "2000000000000000000000000000000000000108" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "should be set in the post state",
+		"// code" : "should be set in the post state",
 		"code" : "{ (MSTORE 8 (GAS))} ",
 		"storage": {
 		}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json
index 6dbec98aa..1630aa1ce 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json
@@ -38,7 +38,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "OOG Call transaction has less gas then in example above",
+		"// code" : "OOG Call transaction has less gas then in example above",
 		"code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 600000 0x1000000000000000000000000000000000000113 0 32 0 0) [[ 1 ]] (GAS) } ",
 		"storage": {
 		}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json
index 1be6aa0f5..ca89ad48d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json
@@ -44,7 +44,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "OOG Call because call goes OOG on second level",
+		"// code" : "OOG Call because call goes OOG on second level",
 		"code" : "{ (SSTORE 9 (STATICCALL 600000 0x1000000000000000000000000000000000000110 0 0 0 0)) [[ 10 ]] (GAS) } ",
 		"storage": {
 		}
@@ -52,7 +52,7 @@
 	    "1000000000000000000000000000000000000110" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "Inner CaLL goes OOG on EIP150",
+		"// code" : "Inner CaLL goes OOG on EIP150",
 		"code" : "{ (MSTORE 8 (GAS)) (MSTORE 9 (STATICCALL 600000 0x1000000000000000000000000000000000000111 0 0 0 0)) } ",
 		"storage": {
 		}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json
index 5e90de689..5d6298bc1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json
@@ -58,7 +58,7 @@
 	    "1000000000000000000000000000000000000000" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
+		"// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
 		"code" : "{ [[1]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }",
 		"storage": {
 		}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json
index abca1bfcc..6f59e78f9 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json
@@ -112,7 +112,7 @@
 	    "1000000000000000000000000000000000000000" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
+		"// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
 		"code" : "{ [[1]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }",
 		"storage": {
 		}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json
index a93a469ae..04b3223c1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json
@@ -84,7 +84,7 @@
 	    "1000000000000000000000000000000000000000" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
+		"// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
 		"code" : "{ [[1]] (STATICCALL 100000 0x1000000000000000000000000000000000000001 0 0 0 0) [[2]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 0 0) [[3]] (CALLER) [[4]] (CALLVALUE) [[5]] (ORIGIN) [[6]] (ADDRESS) }",
 		"storage": {
 		}
@@ -99,7 +99,7 @@
 	    "1000000000000000000000000000000000000002" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
+		"// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
 		"code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000000 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x1000000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
 		"storage": {
 		}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json
index 50657c599..9dd9bed32 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json
@@ -112,7 +112,7 @@
 	    "1000000000000000000000000000000000000000" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
+		"// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
 		"code" : "{ [[1]] (CALL 250000 (CALLDATALOAD 0) 0 0 0 0 0) }",
 		"storage": {
 		}
@@ -162,7 +162,7 @@
 	    "b000000000000000000000000000000000000002" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
+		"// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
 		"code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0xa000000000000000000000000000000000000002 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0xb000000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
 		"storage": {
 		}
@@ -170,7 +170,7 @@
 	    "c300000000000000000000000000000000000002" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
+		"// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
 		"code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x3000000000000000000000000000000000000001 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0xc300000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
 		"storage": {
 		}
@@ -178,7 +178,7 @@
 	    "c400000000000000000000000000000000000002" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
+		"// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
 		"code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x4000000000000000000000000000000000000001 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0xc400000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
 		"storage": {
 		}
@@ -186,7 +186,7 @@
 	    "c500000000000000000000000000000000000002" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
+		"// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
 		"code" : "{ (if (= 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0x5000000000000000000000000000000000000001 (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= 0xc500000000000000000000000000000000000002 (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }",
 		"storage": {
 		}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json
index c66eb4a5c..669a84783 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json
@@ -76,7 +76,7 @@
 	    "1000000000000000000000000000000000000000" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
+		"// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
 		"code" : "{ [[1]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }",
 		"storage": {
 		}
@@ -91,7 +91,7 @@
 	    "1000000000000000000000000000000000000002" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
+		"// code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
 		"code" : "{ (STATICCALL 100000 0x1000000000000000000000000000000000000003 0 0 0 0) }",
 		"storage": {
 		}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json
index e4d101902..90421070c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json
@@ -34,8 +34,8 @@
             },
 	    "a000000000000000000000000000000000000000" : {
                 "balance" : "10",
-		"//code" : "create in init code on depth = 1024. account should not be created",
-                "//code" : "{ (JUMPI 61 (EQ (CALLDATALOAD 0) 1023)) (MSTORE 0 (+ (CALLDATALOAD 0) 1)) (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 32 0 0) (JUMPI 81 (LT (MLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}",
+		"//0 code" : "create in init code on depth = 1024. account should not be created",
+                "//1 code" : "{ (JUMPI 61 (EQ (CALLDATALOAD 0) 1023)) (MSTORE 0 (+ (CALLDATALOAD 0) 1)) (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 32 0 0) (JUMPI 81 (LT (MLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}",
 		"code" : "0x6103ff60003514603d57600160003501600052600060006020600073a0000000000000000000000000000000000000005afa5061041a600051106051575b66600060006002f0600052600760196003f0505b",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json
index a52aebd66..648ec564e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json
@@ -37,8 +37,8 @@
             },
 	    "a000000000000000000000000000000000000000" : {
                 "balance" : "10",
-		"//code" : "create in init code on depth = 1023. account would be created",
-                "//code" : "{ (JUMPI 61 (EQ (CALLDATALOAD 0) 1022)) (MSTORE 0 (+ (CALLDATALOAD 0) 1)) (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 32 0 0) (JUMPI 81 (LT (CALLDATALOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}",
+		"//0 code" : "create in init code on depth = 1023. account would be created",
+                "//1 code" : "{ (JUMPI 61 (EQ (CALLDATALOAD 0) 1022)) (MSTORE 0 (+ (CALLDATALOAD 0) 1)) (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 32 0 0) (JUMPI 81 (LT (CALLDATALOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}",
 		"code" : "0x6103fe60003514603d57600160003501600052600060006020600073a0000000000000000000000000000000000000005afa5061041a600035106051575b66600060006002f0600052600760196003f0505b",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json
index f0af42dc8..cf426c2f3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callBasicFiller.json
@@ -52,7 +52,7 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-		"code" : "Static call success",
+		"// code" : "Static call success",
                 "code" : "{  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) [[ 1 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callCreate3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callCreate3Filler.json
index 31629adef..91b5c78ce 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callCreate3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callCreate3Filler.json
@@ -33,8 +33,8 @@
             },
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-		"code" : "{ (STATICCALL 100000 (ADDRESS) 0 0 0 0) } ",
-		"code" : "{  (MSTORE 0 0x600060006000600030620186a0fa) (RETURN 18 14) }",
+		"//0 code" : "{ (STATICCALL 100000 (ADDRESS) 0 0 0 0) } ",
+		"//1 code" : "{  (MSTORE 0 0x600060006000600030620186a0fa) (RETURN 18 14) }",
                 "code" : "{  (MSTORE 0 0x6d600060006000600030620186a0fa600052600e6012f3) [[ 0 ]] (CREATE 1 9 23)  [[ 1 ]] (STATICCALL 30000 (SLOAD 0) 0 0 0 0) [[ 2 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callCreateFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callCreateFiller.json
index e48d422db..cbe331b46 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callCreateFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callCreateFiller.json
@@ -47,13 +47,6 @@
                 "storage" : {
                 }
             },
-	   "1000000000000000000000000000000000000002" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  (CALLCODE 150000 0x1000000000000000000000000000000000000002 0 0 0 0 0) }",
-                "nonce" : "0",
-                "storage" : {
-                }
-            },
 	   "1000000000000000000000000000000000000003" : {
                 "balance" : "1000000000000000000",
                 "code" : "{  (DELEGATECALL 150000 0x1000000000000000000000000000000000000002 0 0 0 0) }",
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToCallCodeOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToCallCodeOpCodeCheckFiller.json
index 89f175581..e8488a45d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callToCallCodeOpCodeCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToCallCodeOpCodeCheckFiller.json
@@ -24,7 +24,7 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-		"code" : "Static call success",
+		"// code" : "Static call success",
                 "code" : "{  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)  }",
                 "nonce" : "0",
                 "storage" : {
@@ -32,7 +32,7 @@
             },
 	    "1000000000000000000000000000000000000001" : {
                 "balance" : "1000000000000000000",
-		"code" : "Static call success",
+		"// code" : "Static call success",
                 "code" : "{  (MSTORE 0 (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 1) ) }",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToCallOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToCallOpCodeCheckFiller.json
index ecd00caf9..334584a8a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callToCallOpCodeCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToCallOpCodeCheckFiller.json
@@ -24,7 +24,7 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-		"code" : "Static call success",
+		"// code" : "Static call success",
                 "code" : "{  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)  }",
                 "nonce" : "0",
                 "storage" : {
@@ -32,7 +32,7 @@
             },
 	    "1000000000000000000000000000000000000001" : {
                 "balance" : "1000000000000000000",
-		"code" : "Static call success",
+		"// code" : "Static call success",
                 "code" : "{  (MSTORE 0 (CALL 100000 0x1000000000000000000000000000000000000002 0 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 1) ) }",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
index e9acc0602..1f70fc96a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
@@ -24,7 +24,7 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-		"code" : "Static call succeed",
+		"// code" : "Static call succeed",
                 "code" : "{  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)  }",
                 "nonce" : "0",
                 "storage" : {
@@ -32,7 +32,7 @@
             },
 	    "1000000000000000000000000000000000000001" : {
                 "balance" : "1000000000000000000",
-		"code" : "Static call success",
+		"// code" : "Static call success",
                 "code" : "{  (MSTORE 0 (DELEGATECALL 100000 0x1000000000000000000000000000000000000002 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 1) ) }",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json
index e8d242cc7..c187d8c55 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callToStaticOpCodeCheckFiller.json
@@ -24,7 +24,7 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-		"code" : "Static call success",
+		"// code" : "Static call success",
                 "code" : "{  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)  }",
                 "nonce" : "0",
                 "storage" : {
@@ -32,7 +32,7 @@
             },
 	    "1000000000000000000000000000000000000001" : {
                 "balance" : "1000000000000000000",
-		"code" : "Static call success",
+		"// code" : "Static call success",
                 "code" : "{  (MSTORE 0 (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 1) ) }",
                 "nonce" : "0",
                 "storage" : {