upgrade eip158 to general tests

27 files changed, 332 insertions, 41 deletions

diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
index eaebdd879..dad14bf17 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
@@ -30,7 +30,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
@@ -38,6 +38,22 @@
                         }
                     }
                 }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x" : "0x0401",
+			    "0x01" : "0x01"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
index 7d903a475..6310606f8 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
@@ -32,7 +32,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
@@ -42,6 +42,23 @@
                         }
                     }
                 }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x" : "0x85",
+                            "0x01" : "0x01",
+                            "0x02" : "0x020789"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
index b7b96bcf7..07032979b 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
@@ -32,7 +32,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
@@ -42,6 +42,24 @@
                         }
                     }
                 }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x03e4",
+			    "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
index 0f7b5d847..032b750a0 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
index eaed0bf0a..ebde9a162 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
@@ -40,7 +40,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
index 5ba071334..50b839b21 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["Frontier", "EIP158"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
index 16885ad4f..f0ba9db68 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
@@ -30,7 +30,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
@@ -38,6 +38,22 @@
                         }
                     }
                 }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+			    "0x01" : "0x01"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
index 35ae35897..c14ab48f2 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
@@ -32,7 +32,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
@@ -42,6 +42,23 @@
                         }
                     }
                 }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x" : "0x85",
+                            "0x01" : "0x01",
+                            "0x02" : "0x020789"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
index afbd9fe31..1ace87f39 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["Frontier", "Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -29,10 +29,12 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
+			    "0x00" : "0x01",
+			    "0x01" : "0x01"
                         }
                     }
                 }
@@ -77,4 +79,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
index 8948f993e..578819b1c 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
@@ -8,6 +8,36 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : "Frontier",
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -47,4 +77,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
index 773f324d0..3da49c9d6 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
@@ -8,6 +8,36 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : "Frontier",
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -47,4 +77,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
index 20fa9ba59..6345fc112 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
@@ -8,6 +8,36 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : "Frontier",
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -47,4 +77,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
index 7fc5f0f22..8a9aad903 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
@@ -8,6 +8,36 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : "Frontier",
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -47,4 +77,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
index 8d5b5aae9..68652b5cd 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
@@ -8,6 +8,36 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : "Frontier",
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -47,4 +77,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
index 07637dea1..376a1a3c2 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
@@ -8,6 +8,36 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : "Frontier",
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -47,4 +77,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
index ccbcce94d..e78993d84 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["Frontier", "Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -29,10 +29,12 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
+			    "0x00" : "0x01",
+			    "0x01" : "0x01"
                         }
                     }
                 }
@@ -77,4 +79,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
index b22d2023c..f2b56e5ad 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
@@ -39,7 +39,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
index 565884e83..a81ef4987 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["Frontier", "Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -32,14 +32,16 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
+			    "0x00" : "0x01",
+			    "0x01" : "0x01"
                         }
                     },
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "3000000"
+                        "balance" : "61745"
                     }
                 }
             }
@@ -83,4 +85,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
index 8d5e80ed9..2065af69e 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
index 7492db961..feb7be590 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
@@ -30,7 +30,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
index 3a405262f..db35c2bbd 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
@@ -28,7 +28,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                         "balance" : "0x01",
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
index 5cf92eb76..4aa2c6be4 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
@@ -28,7 +28,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                         "balance" : "0x01",
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
index 99d34439c..7547a3dce 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
@@ -15,23 +15,22 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["Frontier", "Homestead"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                         "shouldnotexist" : "1"
                     }
                 }
             },
-            {
+	    {
                 "indexes" : {
                     "data" : -1,
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["EIP158"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
-                        "shouldnotexist" : "1"
                     }
                 }
             }
@@ -75,4 +74,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
index bd37a449e..46270f4a3 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
index 586d559b1..0e5216c77 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
index e8901b1be..088a56788 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
@@ -28,7 +28,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                         "balance" : "0x01",
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
index 79cee2441..9e85ba97d 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["Frontier"],
                 "result" : {
                     "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
                         "shouldnotexist" : "1"
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead"],
                 "result" : {
                     "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
                         "balance" : "0x01"
@@ -46,12 +46,34 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
+                        "shouldnotexist" : "1"
+                    },
+                    "13136008b64ff592819b2fa6d43f2835c452020e" : {
+                        "balance" : "0x00",
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
+                            "0x0b" : "0x01",
+                            "0x14" : "0x00"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "10000",
-                "code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6620186) \t\t\t\t    (MSTORE 64 0xa0f4600b55000000000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }",
+                "code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6620186) (MSTORE 64 0xa0f4600b55000000000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }",
                 "nonce" : "0",
                 "storage" : {
                 }