EIP150 to GeneralTests Convertion

34 files changed, 427 insertions, 39 deletions

diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
index dad14bf17..b5f621d0b 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
@@ -45,7 +45,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP158", "EIP150"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
index 6310606f8..3ae1fbee4 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024OOGFiller.json
@@ -49,7 +49,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP158", "EIP150"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
index 07032979b..d4c46f8d6 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
@@ -49,7 +49,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP158", "EIP150"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
index 032b750a0..79c199edb 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
index ebde9a162..e6533bcea 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
@@ -40,7 +40,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
index 50b839b21..c95e9a0f1 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "EIP158"],
+                "network" : ["Frontier", "EIP158", "EIP150"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
index f0ba9db68..779a9b33a 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024Filler.json
@@ -45,7 +45,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP158", "EIP150"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
index c14ab48f2..c3fb2d985 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
@@ -49,7 +49,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP158", "EIP150"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json
index 4ec659df5..833b8dce8 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json
@@ -8,6 +8,58 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : "ALL",
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP158", "EIP150"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -36,7 +88,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000"
+                "1100000", "900000"
             ],
             "gasPrice" : "0",
             "nonce" : "0",
@@ -47,4 +99,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json
index 6ba074484..4bfc9f170 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json
@@ -8,6 +8,58 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : ["ALL"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP158", "EIP150"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -36,7 +88,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000"
+                "1100000", "900000"
             ],
             "gasPrice" : "0",
             "nonce" : "0",
@@ -47,4 +99,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json
index a31bb5909..ccf2f97c4 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json
@@ -8,6 +8,58 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : "ALL",
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP158", "EIP150"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -36,7 +88,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000"
+                "1100000", "900000"
             ],
             "gasPrice" : "0",
             "nonce" : "0",
@@ -47,4 +99,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json
index 0cfacc707..f51662866 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json
@@ -8,6 +8,56 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : ["ALL"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0"
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0",
+                            "0x01" : "0"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP158", "EIP150"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0",
+                            "0x01" : "0"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -36,7 +86,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000"
+                "1100000", "900000"
             ],
             "gasPrice" : "0",
             "nonce" : "0",
@@ -47,4 +97,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
index 5878679a3..7db2c0291 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
@@ -8,6 +8,58 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : "ALL",
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP158", "EIP150"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -36,7 +88,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000"
+                "1100000", "900000"
             ],
             "gasPrice" : "0",
             "nonce" : "0",
@@ -47,4 +99,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json
index 4d55f90c8..5357a8f08 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json
@@ -8,6 +8,58 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : "ALL",
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP158", "EIP150"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -36,7 +88,7 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000"
+                "1100000", "900000"
             ],
             "gasPrice" : "0",
             "nonce" : "0",
@@ -47,4 +99,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
index 1ace87f39..05fc8711c 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
@@ -29,7 +29,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
index 578819b1c..907ea612a 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
@@ -29,7 +29,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
index 3da49c9d6..589a46b05 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
@@ -29,7 +29,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
index 6345fc112..faffeead4 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
@@ -29,7 +29,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
index 8a9aad903..59cb29da3 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
@@ -29,7 +29,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
index 68652b5cd..49469ff81 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
@@ -29,7 +29,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
index 376a1a3c2..b2f460403 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
@@ -29,7 +29,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
index e78993d84..a29ae633d 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
@@ -29,7 +29,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
index f2b56e5ad..f074f250d 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
@@ -39,7 +39,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
index a81ef4987..30a2bc92f 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
@@ -32,7 +32,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
index 2065af69e..c2ac9c260 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallBasicFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
index feb7be590..c888a9fbf 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
@@ -30,7 +30,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
index db35c2bbd..2ab064072 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
@@ -28,7 +28,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                         "balance" : "0x01",
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
index 4aa2c6be4..f0de4758c 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
@@ -28,7 +28,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                         "balance" : "0x01",
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
index 7547a3dce..6fd8bbdf7 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
@@ -28,7 +28,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP158", "EIP150"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                     }
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json
index b652e09cf..eee3633f9 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json
@@ -8,6 +8,58 @@
             "currentTimestamp" : 1,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "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"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0"
+                        }
+                    },
+                    "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                        "storage" : {
+                            "0x00" : "0",
+                            "0x01" : "0"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
+            }
+        ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
@@ -47,4 +99,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
index 46270f4a3..590f23499 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
index 0e5216c77..af41ee244 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
index 088a56788..08687506e 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
@@ -28,7 +28,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP158", "EIP150"],
                 "result" : {
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
                         "balance" : "0x01",
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
index 9e85ba97d..990b3b1a9 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
@@ -68,6 +68,32 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP150"],
+                "result" : {
+                    "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
+                            "balance" : "0x01",
+                            "code" : "0x600160005533601455",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                    },
+                    "13136008b64ff592819b2fa6d43f2835c452020e" : {
+                        "balance" : "0x00",
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x0a" : "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6",
+                            "0x0b" : "0x01",
+                            "0x14" : "0x1000000000000000000000000000000000000000"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {