update fillers for stDelegatecallTestHomestead

34 files changed, 43 insertions, 416 deletions

diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
index 363281677..9fc260c7c 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
@@ -15,21 +15,6 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x00"
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
                 "network" : ["Homestead"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -45,7 +30,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158", "EIP150"],
+                "network" : [">=Byzantium"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
index 8258609d4..4825cd7f9 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
@@ -15,23 +15,6 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00",
-                            "0x02" : "0x00"
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
                 "network" : ["Homestead"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -49,7 +32,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158", "EIP150"],
+                "network" : [">=Byzantium"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
index 42e1af38e..961ce032c 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
@@ -15,23 +15,6 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
                 "network" : ["Homestead"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -49,7 +32,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158", "EIP150"],
+                "network" : [">=Byzantium"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
index 116dd3942..e8868ec0d 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
@@ -15,23 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x02" : "0x00"
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
index 91b40f5dd..d144409bd 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
@@ -15,32 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
-                        }
-                    },
-                    "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
-                        }
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "1"
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
index 26899fc58..382e58ed4 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "EIP158", "EIP150"],
+                "network" : ["Frontier", ">=Byzantium"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
index 78de1eda9..ce174b75a 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
@@ -15,21 +15,6 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x00"
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
                 "network" : ["Homestead"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -45,7 +30,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158", "EIP150"],
+                "network" : [">=Byzantium", "EIP150"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
index 194c82ac5..1d5d3b191 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
@@ -15,23 +15,6 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00",
-                            "0x02" : "0x00"
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
                 "network" : ["Homestead"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -49,7 +32,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158", "EIP150"],
+                "network" : [">=Byzantium", "EIP150"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json
index 8a3d8e897..470ed46d5 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Byzantium", "Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -40,7 +40,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json
index ee21ae515..97c6479d2 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -40,7 +40,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json
index 74844711a..8afd4e469 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json
@@ -15,7 +15,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -40,7 +40,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json
index 7f0bd4149..4219ed40c 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json
@@ -15,7 +15,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -39,7 +39,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
index 3a030458d..7598e7fb6 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
@@ -15,7 +15,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -40,7 +40,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json
index 1393422d4..e33e9b9a5 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json
@@ -15,7 +15,7 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -40,7 +40,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
index 71e32679f..21a8313f9 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -29,7 +29,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158", "EIP150"],
+                "network" : [">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
index 223f8e428..17cbf6a64 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
@@ -15,21 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
index 34e07de9d..686876f18 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
@@ -15,21 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
index 353b394f6..72fa7ce3e 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
@@ -15,21 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
index ccf7539ff..4dc066443 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
@@ -15,21 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
index 2a304abbf..d7a1b223b 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
@@ -15,21 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
index 6769f1e7d..180a4e0fb 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
@@ -15,21 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
index d0b4a95e7..4402bff71 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
@@ -29,7 +29,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158", "EIP150"],
+                "network" : [">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
index 47d1a0c93..15d749ddd 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
@@ -15,31 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "1000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00",
-                            "0x02" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000001" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00",
-                            "0x02" : "0x00"
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
index adcf97cd7..e4f742e52 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -32,7 +32,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158", "EIP150"],
+                "network" : [">=Byzantium", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
index 5e2237037..95795d632 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
@@ -15,23 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
index e0c630e2b..694225321 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
@@ -15,22 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "1000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x00"
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
index 2a98e15c4..4c20dede2 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
@@ -15,20 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "13136008b64ff592819b2fa6d43f2835c452020e" : {
-                        "shouldnotexist" : "1"
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                         "balance" : "0x01",
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
index 42510c8ed..fb605730c 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
@@ -15,20 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "13136008b64ff592819b2fa6d43f2835c452020e" : {
-                        "shouldnotexist" : "1"
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                         "balance" : "0x01",
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
index 170b86d15..f4e45c7a0 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Homestead"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                         "shouldnotexist" : "1"
@@ -28,7 +28,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158", "EIP150"],
+                "network" : [">=Byzantium", "EIP150"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                     }
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json
index c1c050dab..529cc0f8a 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json
@@ -15,32 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
-                        }
-                    },
-                    "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
-                        }
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "1"
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
index 93bf46216..e046321c3 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
@@ -15,23 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
index 1819dc5d4..67d803292 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
@@ -15,23 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
-                        }
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
index 3f7a5eed6..a00e9965e 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
@@ -15,20 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "13136008b64ff592819b2fa6d43f2835c452020e" : {
-                        "shouldnotexist" : "1"
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["Homestead", ">=Byzantium"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                         "balance" : "0x01",
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
index 14340c016..d65de2b69 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
@@ -15,22 +15,6 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
-                "result" : {
-                    "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
-                        "shouldnotexist" : "1"
-                    },
-                    "13136008b64ff592819b2fa6d43f2835c452020e" : {
-                        "shouldnotexist" : "1"
-                    }
-                }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
                 "network" : ["Homestead"],
                 "result" : {
                     "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
@@ -53,7 +37,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : [">=EIP158"],
                 "result" : {
                     "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
                         "shouldnotexist" : "1"