finish eip150 tests to GeneralStateTests

43 files changed, 115 insertions, 39 deletions

diff --git a/src/GeneralStateTestsFiller/stTransactionTest/ContractStoreClearsOOGFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/ContractStoreClearsOOGFiller.json
index 00eb88d96..404d4d2fb 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/ContractStoreClearsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/ContractStoreClearsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "1"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/ContractStoreClearsSuccessFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/ContractStoreClearsSuccessFiller.json
index 3617f5e6b..a691a7c78 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/ContractStoreClearsSuccessFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/ContractStoreClearsSuccessFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "d2571607e241ecf590ed94b12d87c94babe36db6" : {
                         "balance" : "10",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/CreateMessageRevertedFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/CreateMessageRevertedFiller.json
index b3f139d9e..928f2dbbb 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/CreateMessageRevertedFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/CreateMessageRevertedFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "1"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/CreateMessageSuccessFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/CreateMessageSuccessFiller.json
index 1d9381a6c..68d515154 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/CreateMessageSuccessFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/CreateMessageSuccessFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "100",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json
index f257ded78..cfc93da09 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "132000",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json
index 9b3597238..a8b26f24f 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionSuccessFiller.json
@@ -32,6 +32,23 @@
                     "gas" : -1,
                     "value" : -1
                 },
+                "network" : ["EIP150"],
+                "result" : {
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "100",
+                        "code" : "0x60e060020a600035048063f8a8fd6d14601457005b601a6020565b60006000f35b56",
+                        "nonce" : "0",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
                 "network" : ["EIP158"],
                 "result" : {
                     "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json
index 31d8943c3..be7d69f51 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction2Filler.json
@@ -35,6 +35,26 @@
                     "gas" : -1,
                     "value" : -1
                 },
+                "network" : ["EIP150"],
+                "result" : {
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "nonce" : "0"
+                    },
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "code" : "0x"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "100000",
+                        "nonce" : "1"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
                 "network" : ["EIP158"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction3Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction3Filler.json
index 457afd4ba..3f931a826 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction3Filler.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransaction3Filler.json
@@ -35,7 +35,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158"],
+                "network" : ["Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                         "balance" : "53000"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json
index b80c12e1d..c6fb6d852 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "100000",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/HighGasLimitFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/HighGasLimitFiller.json
index c02d803bb..fac6986ec 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/HighGasLimitFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/HighGasLimitFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "1"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimit2Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimit2Filler.json
index 3ac732a83..de5b23978 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimit2Filler.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimit2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimitFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimitFiller.json
index b4f458c0a..1563411fc 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimitFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimitFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimitSuccessFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimitSuccessFiller.json
index 640089cc6..6e5abb59d 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimitSuccessFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimitSuccessFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "1",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/InternlCallStoreClearsOOGFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/InternlCallStoreClearsOOGFiller.json
index e8028e858..3883bbc6a 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/InternlCallStoreClearsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/InternlCallStoreClearsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "0000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/InternlCallStoreClearsSuccesFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/InternlCallStoreClearsSuccesFiller.json
index 37f9e96cd..06dbf729d 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/InternlCallStoreClearsSuccesFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/InternlCallStoreClearsSuccesFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "0000000000000000000000000000000000000000" : {
                         "balance" : "1",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequire2Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequire2Filler.json
index effecbb54..2530e7bd5 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequire2Filler.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequire2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "115792089237316195423570985008687907853269984665640564039457584007913127916415",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json
index ce75c582e..e86a2aceb 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json
index 5966a205b..76e8300d1 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "400",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json
index c3188dcf7..ab2c0587f 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "400",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOGFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOGFiller.json
index e6a611e3f..0ed069b5b 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "0000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccessFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccessFiller.json
index f32ba0671..21a549ca6 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccessFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccessFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "0000000000000000000000000000000000000000" : {
                         "balance" : "1",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/StoreGasOnCreateFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/StoreGasOnCreateFiller.json
index 048217f06..8eb2bba50 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/StoreGasOnCreateFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/StoreGasOnCreateFiller.json
@@ -30,7 +30,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP150", "EIP158"],
                 "result" : {
                     "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json
index 9f2a286e1..fdcd5d2fb 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "0000000000000000000000000000000000000000" : {
                         "balance" : "20",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json
index 9ece83724..c8b1fa978 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP150", "EIP158"],
                 "result" : {
                     "0000000000000000000000000000000000000001" : {
                         "shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json
index 1e53a2816..7d6640c54 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "0000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json
index f831ca98e..884eeb2ff 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json
@@ -30,7 +30,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP150", "EIP158"],
                 "result" : {
                     "0000000000000000000000000000000000000001" : {
                         "balance" : "1",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json
index 5fa4f6285..3018a810e 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json
@@ -32,7 +32,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "108988",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json
index 441331238..b3955664f 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json
@@ -34,7 +34,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : ["EIP150", "EIP158"],
                 "result" : {
 	            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 	"nonce" : "1"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json
index ef23c9df2..f61531e33 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "0000000000000000000000000000000000000000" : {
                         "code" : "0x6001ff",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionDataCosts652Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionDataCosts652Filler.json
index a45554f00..d99c46a82 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionDataCosts652Filler.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionDataCosts652Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                         "balance" : "21652"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1Filler.json
index fffb608f6..67d91fe26 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1Filler.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "100000",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimitFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimitFiller.json
index d00ef8ee8..c8b4dcea0 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimitFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimitFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "10"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseNotEnoughFoundsFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseNotEnoughFoundsFiller.json
index c2b4339ff..76fd4e85a 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseNotEnoughFoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionFromCoinbaseNotEnoughFoundsFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "22000"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json
index b18b2ed1c..65428f775 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json
index 87b245be9..5e20c8b46 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "10"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToEmptyFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToEmptyFiller.json
index d1318cab7..226d420e7 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToEmptyFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                         "code" : "0x"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToZeroFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToZeroFiller.json
index 31948d7db..bd4d637a4 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionSendingToZeroFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "0000000000000000000000000000000000000000" : {
                         "balance" : "1"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionToAddressh160minusOneFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionToAddressh160minusOneFiller.json
index 963244981..bac96dbd3 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionToAddressh160minusOneFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionToAddressh160minusOneFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "ffffffffffffffffffffffffffffffffffffffff" : {
                         "balance" : "100"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfFiller.json
index 8ae56c0ae..72efc5efe 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "79000",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json
index 7e22a1bcd..e6e98498c 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "22000"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json
index 06ff34045..9a3657425 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP158"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "33000",
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostFiller.json
index 062ddb52d..f939013ee 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostFiller.json
@@ -35,6 +35,26 @@
                     "gas" : -1,
                     "value" : -1
                 },
+                "network" : ["EIP150"],
+                "result" : {
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "nonce" : "0"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "42100",
+                        "nonce" : "1"
+                    },
+                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "900"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
                 "network" : ["EIP158"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostWithDataFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostWithDataFiller.json
index 6387ad8e6..b7825b512 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostWithDataFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionZeroCostWithDataFiller.json
@@ -34,6 +34,25 @@
                     "gas" : -1,
                     "value" : -1
                 },
+                "network" : ["EIP150"],
+                "result" : {
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "nonce" : "0"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    },
+                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "900"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
                 "network" : ["EIP158"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {