more staticcall tests update

2 files changed, 201 insertions, 6 deletions

diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckCallCostOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckCallCostOOGFiller.json
new file mode 100644
index 000000000..8ae8b78b9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckCallCostOOGFiller.json
@@ -0,0 +1,85 @@
+{
+    "static_CheckCallCostOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : ["Metropolis"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		       "nonce" : "1"
+		    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+		        "balance" : "21700"
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Metropolis"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		       "nonce" : "1"
+		    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+		        "balance" : "21733"
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "1000000000000000000000000000000000000000" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ (STATICCALL 100 0x2000000000000000000000000000000000000000 0 0 0 0) }",
+		"storage": {
+		}
+            },
+	    "2000000000000000000000000000000000000000" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ (MSTORE 1 1) }",
+		"storage": {
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+		""
+            ],
+            "gasLimit" : [
+                "21700", "21800"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json
index 83321c2bb..56b58834a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json
@@ -11,9 +11,9 @@
         "expect" : [
             {
                 "indexes" : {
-                    "data" : -1,
+                    "data" : [0,1],
                     "gas" : 1,
-                    "value" : 0
+                    "value" : -1
                 },
                 "network" : ["Metropolis"],
                 "result" : {
@@ -26,6 +26,60 @@
 		        }
 		    }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : [2],
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Metropolis"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		       "nonce" : "1"
+		    },
+		    "3000000000000000000000000000000000000001" : {
+		        "storage" : {
+		            "0x00" : "0x01"
+		        }
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : [3],
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Metropolis"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		       "nonce" : "1"
+		    },
+		    "4000000000000000000000000000000000000001" : {
+		        "storage" : {
+		            "0x00" : "0x01"
+		        }
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : [4],
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Metropolis"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		       "nonce" : "1"
+		    },
+		    "5000000000000000000000000000000000000001" : {
+		        "storage" : {
+		            "0x00" : "0x01"
+		        }
+		    }
+                }
             }
         ],
         "pre" :
@@ -48,14 +102,42 @@
 	    "1000000000000000000000000000000000000001" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (CALL 100000 0xa000000000000000000000000000000000000002 0 0 0 0 0) }",
+		"code" : "{ (MSTORE 0 0xb000000000000000000000000000000000000002) (CALL 100000 0xa000000000000000000000000000000000000002 0 0 32 0 0) }",
+		"storage": {
+		}
+            },
+	    "2000000000000000000000000000000000000001" : {
+                "balance" : "10",
+		"nonce" : "0",
+		"code" : "{ (MSTORE 0 0xb000000000000000000000000000000000000002) (CALL 100000 0xa000000000000000000000000000000000000002 10 0 32 0 0) }",
+		"storage": {
+		}
+            },
+	    "3000000000000000000000000000000000000001" : {
+                "balance" : "10",
+		"nonce" : "0",
+		"code" : "{ (MSTORE 0 0xc300000000000000000000000000000000000002) (CALLCODE 100000 0xa000000000000000000000000000000000000002 0 0 32 0 0) }",
+		"storage": {
+		}
+            },
+	    "4000000000000000000000000000000000000001" : {
+                "balance" : "10",
+		"nonce" : "0",
+		"code" : "{ (MSTORE 0 0xc400000000000000000000000000000000000002) (CALLCODE 100000 0xa000000000000000000000000000000000000002 1 0 32 0 0) }",
+		"storage": {
+		}
+            },
+	    "5000000000000000000000000000000000000001" : {
+                "balance" : "10",
+		"nonce" : "0",
+		"code" : "{ (MSTORE 0 0xc500000000000000000000000000000000000002) (DELEGATECALL 100000 0xa000000000000000000000000000000000000002 0 32 0 0) }",
 		"storage": {
 		}
             },
 	    "a000000000000000000000000000000000000002" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ [[ 0 ]] (CALL 50000 0xb000000000000000000000000000000000000002 0 0 0 0 0) }",
+		"code" : "{ [[ 0 ]] (STATICCALL 50000 (CALLDATALOAD 0) 0 0 0 0) }",
 		"storage": {
 		}
             },
@@ -63,7 +145,31 @@
                 "balance" : "0",
 		"nonce" : "0",
 		"code" : "check ORIGIN, CALLER, ADDRESS, CALLVALUE inside staticcall",
-		"code" : "{ [[ 12 ]] 12 }",
+		"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": {
+		}
+            },
+	    "c300000000000000000000000000000000000002" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"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": {
+		}
+            },
+	    "c400000000000000000000000000000000000002" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"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": {
+		}
+            },
+	    "c500000000000000000000000000000000000002" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"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": {
 		}
             }
@@ -73,7 +179,11 @@
 		"0 - call | callcode | delegatecall -> staticcall -> check "
 	    ],
             "data" : [
-		"0x0000000000000000000000001000000000000000000000000000000000000001"
+		"0x0000000000000000000000001000000000000000000000000000000000000001",
+		"0x0000000000000000000000002000000000000000000000000000000000000001",
+		"0x0000000000000000000000003000000000000000000000000000000000000001",
+		"0x0000000000000000000000004000000000000000000000000000000000000001",
+		"0x0000000000000000000000005000000000000000000000000000000000000001"
             ],
             "gasLimit" : [
                 "50000", "335000"