upgrade eip158 to general tests

19 files changed, 315 insertions, 42 deletions

diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund50_1Filler.json b/src/GeneralStateTestsFiller/stRefundTest/refund50_1Filler.json
index bb0791e7d..d3ede101d 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund50_1Filler.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund50_1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -68,4 +68,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund50_2Filler.json b/src/GeneralStateTestsFiller/stRefundTest/refund50_2Filler.json
index 8b75ebdd9..36fcd908c 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund50_2Filler.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund50_2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json
index 9fafdeb87..c1e8a243d 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json
@@ -30,6 +30,28 @@
                         "balance" : "54400"
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000",
+                            "0x0b" : "0x0de0b6b3a7640000"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "45960"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "54040"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json b/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json
index 64dceca38..fe7de2241 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json
@@ -29,6 +29,27 @@
                         "balance" : "61895"
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x0b" : "0x0de0b6b3a7640000"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "38485"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "61515"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json
index 18fc63137..2b927475e 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : {
-                    "data" : -1,
+                    "data" : 0,
                     "gas" : -1,
                     "value" : -1
                 },
@@ -21,15 +21,40 @@
                         "storage" : {
                             "0x0a" : "0x01",
                             "0x0b" : "0x01",
-                            "0x16" : "0x984476",
-                            "0x17" : "0x96bd58"
+                            "0x16" : "0x984376",
+                            "0x17" : "0x96bc55"
                         }
                     },
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "70566"
+                        "balance" : "70695"
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "9929434",
+                        "balance" : "9929305",
+                        "nonce" : "1"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x0a" : "0x01",
+                            "0x0b" : "0x01",
+                            "0x16" : "0x9843b6",
+                            "0x17" : "0x96a679"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "73493"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "9926507",
                         "nonce" : "1"
                     }
                 }
@@ -38,7 +63,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ [[ 22 ]] (GAS) [[ 10 ]] 1 [[ 11 ]] (CALL 500 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 ) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 [[ 7 ]] 0 [[ 8 ]] 0 [[ 23 ]] (GAS) }",
+                "code" : "{ [[ 22 ]] (GAS) [[ 10 ]] 1 [[ 11 ]] (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 ) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 [[ 7 ]] 0 [[ 8 ]] 0 [[ 23 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
                     "0x01" : "0x01",
@@ -68,7 +93,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x00000000000000000000000000000000000000000000000000000000000001f4", "0x0000000000000000000000000000000000000000000000000000000000010000"
             ],
             "gasLimit" : [
                 "10000000"
@@ -82,4 +107,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallAFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallAFiller.json
index a63bb1ebf..73c5e34f0 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallAFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallAFiller.json
@@ -36,6 +36,34 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "1000000000000000010",
+                        "storage" : {
+                            "0x" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "31730"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "1968260",
+                        "nonce" : "1"
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                        "storage" : {
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
@@ -79,4 +107,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_OOGFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_OOGFiller.json
index 86a66a7fd..c0d173e26 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "balance" : "1000000000000000000",
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json
index 002c9b72d..f263eb187 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json
@@ -36,6 +36,34 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "1000000000000000010",
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "31729"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "68261",
+                        "nonce" : "1"
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
@@ -79,4 +107,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json
index cb9c06525..fb4495fdb 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : {
-                    "data" : -1,
+                    "data" : 0,
                     "gas" : -1,
                     "value" : -1
                 },
@@ -25,10 +25,34 @@
                         }
                     },
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "20534"
+                        "balance" : "20663"
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "99979456",
+                        "balance" : "99979327",
+                        "nonce" : "1"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "2000000000000000010",
+                        "storage" : {
+                            "0x" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "23461"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "99976529",
                         "nonce" : "1"
                     }
                 }
@@ -37,7 +61,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ [[ 0 ]] (CALL 500 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
+                "code" : "{ [[ 0 ]] (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
                 "nonce" : "0",
                 "storage" : {
                     "0x01" : "0x01"
@@ -60,7 +84,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x00000000000000000000000000000000000000000000000000000000000001f4", "0x0000000000000000000000000000000000000000000000000000000000010000"
             ],
             "gasLimit" : [
                 "10000000"
@@ -74,4 +98,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json
index 3fd062c66..be74a6859 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : {
-                    "data" : -1,
+                    "data" : 0,
                     "gas" : -1,
                     "value" : -1
                 },
@@ -25,19 +25,46 @@
                         }
                     },
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "20534"
+                        "balance" : "20663"
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "99979456",
+                        "balance" : "99979327",
                         "nonce" : "1"
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "2000000000000000010",
+                        "storage" : {
+                            "0x" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "23461"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "99976529",
+                        "nonce" : "1"
+                    },
+		    "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+			"shouldnotexist" : "1"
+		    }
+                }
             }
         ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ [[ 0 ]] (CALL 500 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
+                "code" : "{ [[ 0 ]] (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
                 "nonce" : "0",
                 "storage" : {
                     "0x01" : "0x01"
@@ -61,7 +88,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x00000000000000000000000000000000000000000000000000000000000001f4", "0x0000000000000000000000000000000000000000000000000000000000010000"
             ],
             "gasLimit" : [
                 "10000000"
@@ -75,4 +102,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json
index 605c840d7..f2b0359bb 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : {
-                    "data" : -1,
+                    "data" : 0,
                     "gas" : -1,
                     "value" : -1
                 },
@@ -25,19 +25,49 @@
                         }
                     },
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "20566"
+                        "balance" : "20697"
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "99979424",
+                        "balance" : "99979293",
                         "nonce" : "1"
-                    }
+                    },
+		    "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+			"shouldnotexist" : "1"
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "2000000000000000010",
+                        "storage" : {
+                            "0x" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "28649"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "99971341",
+                        "nonce" : "1"
+                    },
+		    "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+			"shouldnotexist" : "1"
+		    }
                 }
             }
         ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ [[ 0 ]] (CALL 500 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 ) (CALL 500 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
+                "code" : "{ [[ 0 ]] (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 ) (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 )}",
                 "nonce" : "0",
                 "storage" : {
                     "0x01" : "0x01"
@@ -61,7 +91,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x00000000000000000000000000000000000000000000000000000000000001f4", "0x0000000000000000000000000000000000000000000000000000000000010000"
             ],
             "gasLimit" : [
                 "10000000"
@@ -75,4 +105,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_NoOOG_1Filler.json b/src/GeneralStateTestsFiller/stRefundTest/refund_NoOOG_1Filler.json
index f6705da77..3714e81be 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_NoOOG_1Filler.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_NoOOG_1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_OOGFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_OOGFiller.json
index 43be23825..85d97a0fe 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "balance" : "1000000000000000000",
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json
index 55b301a9b..6a2dde5ed 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json
@@ -12,7 +12,7 @@
             {
                 "indexes" : {
                     "data" : -1,
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
                 "network" : ["Frontier", "Homestead"],
@@ -28,7 +28,35 @@
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "99989488",
                         "nonce" : "1"
-                    }
+                    },
+		    "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+			"shouldnotexist" : "1"
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "1000000000000000010",
+                        "storage" : {
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "27003"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "99972987",
+                        "nonce" : "1"
+                    },
+		    "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+			"shouldnotexist" : "1"
+		    }
                 }
             }
         ],
@@ -54,7 +82,7 @@
                 ""
             ],
             "gasLimit" : [
-                "21003"
+                "21003", "61003"
             ],
             "gasPrice" : "1",
             "nonce" : "0",
@@ -65,4 +93,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json
index 144f0d218..237e22d86 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                         "balance" : "21002"
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_changeNonZeroStorageFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_changeNonZeroStorageFiller.json
index 0b8715cf6..90d257edc 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_changeNonZeroStorageFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_changeNonZeroStorageFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "balance" : "1000000000000000010",
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_getEtherBackFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_getEtherBackFiller.json
index 8f38ba77d..c2cc465e2 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_getEtherBackFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_getEtherBackFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "balance" : "1000000000000000010",
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json
index a60c21167..9c8587761 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json
@@ -28,6 +28,26 @@
                         "nonce" : "1"
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000001" : {
+                        "shouldnotexist" : "1"
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "16724"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "283276",
+                        "nonce" : "1"
+                    }
+                }
             }
         ],
          "pre" : {
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json
index 75906c28e..b6f2c0282 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json
@@ -28,6 +28,26 @@
                         "nonce" : "1"
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000001" : {
+                        "shouldnotexist" : "1"
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "13771"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "286229",
+                        "nonce" : "1"
+                    }
+                }
             }
         ],
          "pre" : {