upgrade eip158 to general tests

65 files changed, 65 insertions, 65 deletions

diff --git a/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json
index 08a144812..a89391388 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json
index 0fbba1b29..f31a630e4 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json
index 6ab036a5d..3daaa5958 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json
index 0c19e7161..d42b8a8e3 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json
index a5ebab054..d0a83ce97 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json
index ca0cfcccb..cce236326 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json
index 1f13b17e2..9e371f685 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json
index 5f33b5471..89f9ff2f2 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json
index 910c079e2..05e4f0c2b 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json
index 4d2dea789..99f9a4129 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json
index 300f817b7..3a8dfd26f 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json
index ee8002402..57cfeece9 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json
index 6e58dabc5..c3e189565 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json
index 585345274..c3cb73072 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json
index a65303a46..e337f2ad2 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json
index cb0cb2a83..03bca8a49 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json
index e062aac9c..622110727 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json
index 69b9b4c7a..d044bca6e 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json
index 9e8de02d8..32f6e8781 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json
index b3e21b183..afc05f417 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json
index 4202ca5f7..886847930 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json
index 2103c0126..c00986eb4 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json
index 102bdf0d9..87512b16f 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json
index 573f34c0a..47085ed9b 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json
index 84a279793..3134b2be6 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json
index ac70aafa6..83495fb9b 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json
index fd5945711..6c3611bc1 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json
index 462f4ee16..59d1fc8ea 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json
index 30163724b..86b4ec786 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json
index 7288239b6..55864fa5d 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json
index 8b5b131d7..ab642ad48 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json
index c05f645bc..59a5a0eaa 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json
index e02539000..5c202cb55 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json
index 00b773172..1acda5adf 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json
index d1f3f9ad8..e8340808b 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json
index 5a6ac5947..db232e222 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json
index 104683249..1aafc5717 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json
index 4fe96716e..8a80fb39a 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json
index 8413c062e..a27f60768 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json
index 296edb6ce..a9bb44431 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json
@@ -48,7 +48,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json
index 7f3302b78..c6e753b90 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json
index e4e8cdfd6..44d936934 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json
index 82ef6dcc7..72f71c522 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json
index 07038ac62..4869c7557 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json
index 1c87516fd..c99a72409 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json
index b2f957eec..cd9e67708 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json
index 54539a5aa..31284f3c5 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json
index d11e3d128..37abd3d0c 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json
index ee733589b..dcd0f9b8e 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json
@@ -47,7 +47,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json
index c5061dd28..df4b270f4 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json
index 1cba5dc1c..ae4afb5e7 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json
index c226ae3d3..4d91573cc 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json
index ce4fcc49e..b618e77cc 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json
index bf21b5ef9..b4abad604 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json
index 0c48df50d..eb242ea67 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json
index db53d81e4..a05e848d3 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json
index ce1b5a5db..1832b8966 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json
index 7e6e66dab..ec799e8f4 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json
index 729343a8e..bfb34b96c 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json
index 869cb5ccf..5edb1a68e 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json
index e5233e786..b52a1660b 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json
index 4adb84f87..d25b4096c 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json
index 05ea6ed66..07fba342a 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json
index a4f0e067f..0ae6d1d4f 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a764000a",
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json
index 0f217bccc..d90a17926 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json
@@ -46,7 +46,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Homestead",
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "balance" : "0x0de0b6b3a7640000",