From 92cc4ac1cc6c8d86f8905c9fd1fe764a9df54dad Mon Sep 17 00:00:00 2001
From: Dimitry <dimitry@ethereum.org>
Date: Sat, 17 Feb 2018 00:06:31 +0300
Subject: fix stStaticCall

---
 .../static_ABAcallsSuicide1Filler.json             |  2 +-
 ...lContractToCreateContractOOGBonusGasFiller.json | 22 +++++++++
 ...atic_CallContractToCreateContractOOGFiller.json | 19 ++++++++
 .../static_CallEcrecover0_0inputFiller.json        | 15 ++++++
 .../stStaticCall/static_CheckOpcodes2Filler.json   |  4 +-
 .../stStaticCall/static_CheckOpcodes3Filler.json   | 54 ++++++++++++++++++++++
 .../stStaticCall/static_CheckOpcodes4Filler.json   | 17 +++++++
 .../stStaticCall/static_CheckOpcodes5Filler.json   | 18 ++++++++
 .../stStaticCall/static_CheckOpcodesFiller.json    | 36 +++++++++++++++
 ...CallThatAskForeGasThenTrabsactionHasFiller.json | 15 ++++++
 .../static_LoopCallsThenRevertFiller.json          | 15 ++++++
 ..._callcodecallcall_100_SuicideMiddle2Filler.json | 12 +++++
 ..._callcodecallcallcode_101_OOGMAfter2Filler.json | 12 +++++
 ...callcodecallcallcode_101_OOGMBefore2Filler.json | 12 +++++
 ...callcodecallcallcode_101_SuicideEnd2Filler.json | 12 +++++
 ...lcodecallcallcode_101_SuicideMiddle2Filler.json | 12 +++++
 ...callcodecallcallcode_ABCB_RECURSIVE2Filler.json | 24 ++++++++++
 .../static_callcodecallcodecall_1102Filler.json    | 24 ++++++++++
 ...tatic_callcodecallcodecall_110_OOGE2Filler.json | 24 ++++++++++
 ...callcodecallcodecall_110_OOGMBefore2Filler.json | 24 ++++++++++
 ...callcodecallcodecall_ABCB_RECURSIVE2Filler.json | 12 +++++
 ...static_refund_CallToSuicideNoStorageFiller.json |  2 +-
 .../static_refund_CallToSuicideTwiceFiller.json    | 20 ++++++++
 23 files changed, 403 insertions(+), 4 deletions(-)

(limited to 'src/GeneralStateTestsFiller/stStaticCall')

diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide1Filler.json
index d707e6e62..00c83b0bc 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide1Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
 	    {
                 "indexes" : {
-                    "data" : 1,
+                    "data" : -1,
                     "gas" : -1,
                     "value" : -1
                 },
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json
index 32ec6165a..c6663ef2d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json
@@ -35,6 +35,28 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "nonce" : "0",
+                        "storage" : {
+                            "0x00" : "0x00"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    },
+                    "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+                        "shouldnotexist" : "1"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGFiller.json
index 97560645c..2bd8ca0be 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGFiller.json
@@ -27,6 +27,25 @@
                         "nonce" : "1"
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : 1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "nonce" : "1",
+			"storage" : {
+			    "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+			}
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_0inputFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_0inputFiller.json
index deea62a6b..8b6a2b6cf 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_0inputFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_0inputFiller.json
@@ -9,6 +9,21 @@
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
+	    {
+                "indexes" : {
+                    "data" : 8,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x02" : "0x00"
+                        }
+                    }
+                }
+            },
             {
                 "indexes" : {
                     "data" : [0,1,4,5,6,7],
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json
index c2f9cb895..8da711b9f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes2Filler.json
@@ -12,7 +12,7 @@
             {
                 "indexes" : {
                     "data" : [0, 2, 3, 4],
-                    "gas" : 1,
+                    "gas" : -1,
                     "value" : -1
                 },
                 "network" : [">=Byzantium"],
@@ -30,7 +30,7 @@
 	    {
                 "indexes" : {
                     "data" : 1,
-                    "gas" : 1,
+                    "gas" : -1,
                     "value" : -1
                 },
                 "network" : [">=Byzantium"],
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json
index 21fb78c57..a62558e7d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes3Filler.json
@@ -9,6 +9,42 @@
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
+	    {
+                "indexes" : {
+                    "data" : [3],
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		       "nonce" : "1"
+		    },
+		    "1000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x01" : "0x00"
+		        }
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : [0, 2, 4],
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		       "nonce" : "1"
+		    },
+		    "1000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x01" : "0x01"
+		        }
+		    }
+                }
+            },
             {
                 "indexes" : {
                     "data" : [0, 2, 3, 4],
@@ -27,6 +63,24 @@
 		    }
                 }
             },
+            {
+                "indexes" : {
+                    "data" : [1],
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		       "nonce" : "1"
+		    },
+		    "1000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x01" : "0x00"
+		        }
+		    }
+                }
+            },
 	    {
                 "indexes" : {
                     "data" : 1,
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json
index baa3838cb..4bf9e49c1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes4Filler.json
@@ -31,6 +31,23 @@
 		    }
                 }
             },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		       "nonce" : "1"
+		    },
+		    "1000000000000000000000000000000000000000" : {
+		        "storage" : {
+		        }
+		    }
+                }
+            },
 	    {
                 "indexes" : {
                     "data" : -1,
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json
index 65abac8dd..e0e413b62 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodes5Filler.json
@@ -9,6 +9,24 @@
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		       "nonce" : "1"
+		    },
+		    "a000000000000000000000000000000000000002" : {
+		        "storage" : {
+		            "0x00" : "0x00"
+		        }
+		    }
+                }
+            },
             {
                 "indexes" : {
                     "data" : [0,1],
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json
index f09b2a35c..3eb8be028 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CheckOpcodesFiller.json
@@ -26,6 +26,42 @@
 		        }
 		    }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		       "nonce" : "1"
+		    },
+		    "1000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x01" : "0x00"
+		        }
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : 0,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		       "nonce" : "1"
+		    },
+		    "1000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x01" : "0x01"
+		        }
+		    }
+                }
             }
         ],
         "pre" :
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json
index 555f87be8..99c1a220a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json
@@ -23,6 +23,21 @@
 		        }
 		    }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : [0],
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+		        "storage" : {
+		            "0x01" : "0x01"
+		        }
+		    }
+                }
             }
         ],
         "pre" :
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsThenRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsThenRevertFiller.json
index 3d437ed5a..96215644f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsThenRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsThenRevertFiller.json
@@ -23,6 +23,21 @@
 		        }
 		    }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+		    "1000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x01" : "0x021070"
+		        }
+		    }
+                }
             }
         ],
         "pre" :
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_SuicideMiddle2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_SuicideMiddle2Filler.json
index 1ab62d9be..8ee062b76 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_SuicideMiddle2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_SuicideMiddle2Filler.json
@@ -20,6 +20,18 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : 1 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x2b801d"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json
index 970aa2026..1588ba916 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json
@@ -20,6 +20,18 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : 1 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x012957"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMBefore2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMBefore2Filler.json
index eaad0906f..7774b8f82 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMBefore2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMBefore2Filler.json
@@ -20,6 +20,18 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : 1 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x014339"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideEnd2Filler.json
index d28d972f8..4f357f39d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideEnd2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideEnd2Filler.json
@@ -20,6 +20,18 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : 1 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x2b8009"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideMiddle2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideMiddle2Filler.json
index 1ff4c8573..a1b01aba6 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideMiddle2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideMiddle2Filler.json
@@ -20,6 +20,18 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : 1 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x2b8009"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json
index 5d00f96fc..df5171ac3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json
@@ -32,6 +32,30 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : 0, "gas" : -1, "value" : 1 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01c74147"
+                        }
+                    }
+                }
+            },
+	    {
+                "indexes" : { "data" : 1, "gas" : -1, "value" : 1 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01c49f13"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_1102Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_1102Filler.json
index cbf410201..2072982d0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_1102Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_1102Filler.json
@@ -20,6 +20,30 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : 1 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x2d03d2"
+                        }
+                    }
+                }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : 2 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x2ce9a6"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGE2Filler.json
index 342c2ef87..f7ccd90d3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGE2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGE2Filler.json
@@ -20,6 +20,30 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : 1 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x018ecd"
+                        }
+                    }
+                }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : 2 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x0174a1"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMBefore2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMBefore2Filler.json
index 53ad5c9fc..d678bd884 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMBefore2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMBefore2Filler.json
@@ -20,6 +20,30 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : 1 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x014345"
+                        }
+                    }
+                }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : 2 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01201d"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json
index d40db3e67..90233b941 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json
@@ -20,6 +20,18 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : 1 },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01c7424a"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideNoStorageFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideNoStorageFiller.json
index e065d119d..7ccd180af 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideNoStorageFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideNoStorageFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
 	    {
                 "indexes" : {
-                    "data" : 1,
+                    "data" : -1,
                     "gas" : -1,
                     "value" : -1
                 },
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideTwiceFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideTwiceFiller.json
index d01b2d7eb..a9b10efe7 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideTwiceFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideTwiceFiller.json
@@ -28,6 +28,26 @@
 			"shouldnotexist" : "1"
 		    }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : 0,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "1000000000000000010",
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x01"
+                        }
+                    },
+		    "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+			"nonce" : "0"
+		    }
+                }
             }
         ],
         "pre" : {
-- 
cgit