upgrade eip158 to general tests

11 files changed, 234 insertions, 9 deletions

diff --git a/src/GeneralStateTestsFiller/stSpecialTest/BadStateRootTxFiller.json b/src/GeneralStateTestsFiller/stSpecialTest/BadStateRootTxFiller.json
index 4a2f74c1a..8ae244463 100644
--- a/src/GeneralStateTestsFiller/stSpecialTest/BadStateRootTxFiller.json
+++ b/src/GeneralStateTestsFiller/stSpecialTest/BadStateRootTxFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "1976363",
diff --git a/src/GeneralStateTestsFiller/stSpecialTest/JUMPDEST_AttackFiller.json b/src/GeneralStateTestsFiller/stSpecialTest/JUMPDEST_AttackFiller.json
index 2e0222a84..08e0d77e2 100644
--- a/src/GeneralStateTestsFiller/stSpecialTest/JUMPDEST_AttackFiller.json
+++ b/src/GeneralStateTestsFiller/stSpecialTest/JUMPDEST_AttackFiller.json
@@ -18,6 +18,16 @@
 			"nonce" : "1"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "999999999999650900",
+			"nonce" : "1"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json b/src/GeneralStateTestsFiller/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json
index 9c3f45212..7968d2576 100644
--- a/src/GeneralStateTestsFiller/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json
+++ b/src/GeneralStateTestsFiller/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json
@@ -18,6 +18,16 @@
 			"nonce" : "1"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "999999999999648329",
+			"nonce" : "1"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stSpecialTest/OverflowGasMakeMoneyFiller.json b/src/GeneralStateTestsFiller/stSpecialTest/OverflowGasMakeMoneyFiller.json
index abad15975..f065d0d08 100644
--- a/src/GeneralStateTestsFiller/stSpecialTest/OverflowGasMakeMoneyFiller.json
+++ b/src/GeneralStateTestsFiller/stSpecialTest/OverflowGasMakeMoneyFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "1000"
diff --git a/src/GeneralStateTestsFiller/stSpecialTest/StackDepthLimitSECFiller.json b/src/GeneralStateTestsFiller/stSpecialTest/StackDepthLimitSECFiller.json
index 347a5b7b4..81841e4e8 100644
--- a/src/GeneralStateTestsFiller/stSpecialTest/StackDepthLimitSECFiller.json
+++ b/src/GeneralStateTestsFiller/stSpecialTest/StackDepthLimitSECFiller.json
@@ -24,7 +24,7 @@
             },
 	    {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Homestead"],
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
                     "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                         "balance" : "0x0a",
diff --git a/src/GeneralStateTestsFiller/stSpecialTest/block504980Filler.json b/src/GeneralStateTestsFiller/stSpecialTest/block504980Filler.json
index 8b779a186..9b3b876d2 100644
--- a/src/GeneralStateTestsFiller/stSpecialTest/block504980Filler.json
+++ b/src/GeneralStateTestsFiller/stSpecialTest/block504980Filler.json
@@ -8,6 +8,177 @@
             "currentTimestamp" : 1,
             "previousHash" : "9ff4de714e01da9f8b61992efdab9b51ca14ac42d43f4c24df1d002a1239b1e9"
         },
+        "expect" : [
+            {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["Frontier", "Homestead", "EIP158"],
+                "result" : {
+                    "0000000000000000000000000000000000000000" : {
+                            "balance" : "0x01"
+                        },
+                        "0000000000000000000000000000000000000001" : {
+                            "balance" : "0x01"
+                        },
+                        "0000000000000000000000000000000000000002" : {
+                            "balance" : "0x01"
+                        },
+                        "0000000000000000000000000000000000000003" : {
+                            "balance" : "0x01"
+                        },
+                        "0000000000000000000000000000000000000004" : {
+                            "balance" : "0x01"
+                        },
+                        "0ea65418d7bf32680f55572c943a94b590804998" : {
+                            "balance" : "0x00",
+			    "nonce" : "0x00",
+                            "storage" : {
+                                "0x065d5efdfcc0fba693dc9e467f633097ffdc97401901463ad0e28855486d1edf" : "0xb9d69098a6acfe0c6411bcaaf430f78d363a9adc32b78bc2e15ccd6e883e9784",
+                                "0x12643ff300762717d27efb567b82c65560d7b43249d908504e5510863ab82aac" : "0x154cf60e137c594516a065149610b6a3989396a42581d5fd8919e711c55da225",
+                                "0x1489023d18c5d10427c4aa8dc726e840eb5ae7f604a8e9243c61634fb009e4d7" : "0x04",
+                                "0x1489023d18c5d10427c4aa8dc726e840eb5ae7f604a8e9243c61634fb009e4d8" : "0x01",
+                                "0x1489023d18c5d10427c4aa8dc726e840eb5ae7f604a8e9243c61634fb009e4da" : "0xe365736b",
+                                "0x1489023d18c5d10427c4aa8dc726e840eb5ae7f604a8e9243c61634fb009e4db" : "0x0f69b5",
+                                "0x1489023d18c5d10427c4aa8dc726e840eb5ae7f604a8e9243c61634fb009e4dc" : "0x629e",
+                                "0x1489023d18c5d10427c4aa8dc726e840eb5ae7f604a8e9243c61634fb009e4dd" : "0x60",
+                                "0x1489023d18c5d10427c4aa8dc726e840eb5ae7f604a8e9243c61634fb009e4e0" : "0x2200",
+                                "0x1489023d18c5d10427c4aa8dc726e840eb5ae7f604a8e9243c61634fb009e4e4" : "0x146000000000000000000000000000000000000000000000000000000000",
+                                "0x1489023d18c5d10427c4aa8dc726e840eb5ae7f604a8e9243c61634fb009e4e6" : "0xe365736b00000000000000000000000000000000000000000000000000000000",
+                                "0x1489023d18c5d10427c4aa8dc726e840eb5ae7f604a8e9243c61634fb009e4e7" : "0x0f69b500000000000000000000000000000000000000000000000000000000",
+                                "0x1489023d18c5d10427c4aa8dc726e840eb5ae7f604a8e9243c61634fb009e4e8" : "0x629e00000000000000000000000000000000000000000000000000000000",
+                                "0x1489023d18c5d10427c4aa8dc726e840eb5ae7f604a8e9243c61634fb009e4e9" : "0x6000000000000000000000000000000000000000000000000000000000",
+                                "0x19efb13d6576359514ace5211988a8d51379fa88ccd2b886b409f842b13d7932" : "0xc849cc595b452d11c206d2eb8cdfa06de211e3ff19ee0e0276dc857c05d4fe",
+                                "0x1b37e91bf8580c7c6bcf8cdff25c7ed78180124a94af6f30c40d476a3d079ad6" : "0xaba4cd295118a482a0a62579e35e4ba5bdd76146cc9e4d96172fce8be8977ab4",
+                                "0x2bf9fd8facdd6fd9c84657f5ad7381a5aecf670cda68cb3c5829b6532c865506" : "0x53098a1d111586dbcc0d051846284f5803c63c313e7f7e6d84430435d11d4c50",
+                                "0x3111bfd25728c0adfad0f8c1ad79cb1b91167267deca98de88f156ed25caeedc" : "0xad393086f30b49511b08fdd27ac78810b084c7cd7de6ac354f614c18ea9e7df4",
+                                "0x3379e7ae125c5c5d623d1d993c1459b61d6723b1c30d1aa026c48f6a6155b8ea" : "0x8c4183732567a99a8a718e363391e102532f9a640e42968cf2354d9acc908bb0",
+                                "0x34cabe0c7e64a2caa93fd8d6a0defc07acb9d44b13430fa3ae9282fffd40dee2" : "0x01",
+                                "0x34cabe0c7e64a2caa93fd8d6a0defc07acb9d44b13430fa3ae9282fffd40dee3" : "0x01",
+                                "0x34cabe0c7e64a2caa93fd8d6a0defc07acb9d44b13430fa3ae9282fffd40dee4" : "0x01",
+                                "0x34cabe0c7e64a2caa93fd8d6a0defc07acb9d44b13430fa3ae9282fffd40dee5" : "0x01",
+                                "0x39050607fe892059a6344ab0f594f382fb0b345cab373497246dbe86fe7e14e7" : "0x2b3bca833e482737e7e47b1568e6f890f8e1666490d38fe130abd6f0ccb109cf",
+                                "0x417be8bc6791807372e0222a350bb8a5d67bbc8d7595c301d8a5a8372cfdcef1" : "0xabd4971b4605a7155802f70e08298b1ceb0e4e4eaccccd348f77a77227f73a7f",
+                                "0x41e9a54b3ee0c276aa076babb161de12b0f8916b47f8f6fb85cc387cf34696dd" : "0x22f2f444ebda9d2913ffef5059b039ec9b5876aa71821991c2515bf79f64935e",
+                                "0x45ceb8da6fb8936592d3bce4883f1a6a34d636f559e0a1070a5802a65ac39bd5" : "0x57a5122ff3bf737b0de0f9f08011a8648c19e43ff071fb7086234723c9383f1f",
+                                "0x4aa6b934608a45c8f53a945c05ddee1814a3b9f63a048fc7ad3d47e67156f024" : "0xd03862becedada67b4825a0238f3e67495ccb595cd7d08f1bd5d3160644b9299",
+                                "0x4b8b58f0b0e326a5907d1a810e5ff31e05b4cab45125b776db8577e7dbc46bce" : "0x2f0000000000000000",
+                                "0x4c33460347337bfc7df08bf182988301b7b426a27a67f1c6c634f637c60e87ac" : "0xbab4ab2ad4eafe7c84ef6a8cd69157d9ce6b843793a2cd0877b8e91f63cb2d4d",
+                                "0x58da0c0c256bba101ce36fad8bf838717a57e6ab850a191dc9c09da9ce56bf1b" : "0x05",
+                                "0x5cb38b16db1d632086d4af695de7f5f242a6e40947067f96edd566fe2ac438ef" : "0x6d0be832b2007ea28cda705b73922cbf9794c5a25b89bd2f28b7347ed2b96c86",
+                                "0x64a9621cc4ba92bf738c55010c609dfaa3972a1138c30b5adcef1ba2363b360e" : "0xd7953bfe8cb591f129fd0862a9e9c421151e2b5831560ff5215d23f751364b35",
+                                "0x696664a5f0ab5acd9304a377fb684f2d3fe6bb60b8a95cb2bdbb57db767e7a84" : "0x154cf60e137c594516a065149610b6a3989396a42581d5fd8919e711c55da225",
+                                "0x69ad1d19e617936abdf05133bf268dc8ced6b518f22b249b5860967d07006487" : "0x8c803b48b383ddabd1b3afe858efb48c203229b7317dd76149dddab4253b858a",
+                                "0x70b3bf53996fac325eb67608a4eeb0cd0b55def6255d7ed42ad28ec07238b5d6" : "0x45e9723e9232b37207ecac1c97b8647d053625a578d450f7456280b2ff8efc27",
+                                "0x7a9dcee62e3e02cc8e020f372df2efdeb835f091c1ef1dbe221072d1095aabd2" : "0x2f0000000000000000",
+                                "0x7e4d8c0f6d8abb4ce1ae45b254046aceedabfa9548851b8b5d3e2c0637c985fd" : "0x0b",
+                                "0x7e95f3cc3315d289c52253baaba29b1b00c86816e6b788d50795279a8baa00db" : "0x45e9723e9232b37207ecac1c97b8647d053625a578d450f7456280b2ff8efc27",
+                                "0x8da187157087529ee4e9c381f8e3149c56acf3bdfda29b8b9b4532f24b83f5fe" : "0x8c4183732567a99a8a718e363391e102532f9a640e42968cf2354d9acc908bb0",
+                                "0x9001f91ddaef87bc067886e874c0749998c9b58b2ec8472ca014ca8b55f88578" : "0x0fb76974eefca01f33fb38646c2d3c1536f1a763d7aff53ab7f877d4c5ea7fd0",
+                                "0x9ed0cedd2a9a78d949f40019f53d10031aef6ed342c97e01fc03b481ee56b3cb" : "0x04",
+                                "0x9fddf1db29caa5c1239edd86e9e0835cdfe41f7253ec78f62d3da8558d6f3cd7" : "0x104eef8fa35bf39f677d81855bc0b9f42317f32792e98e95e4df441deb634211",
+                                "0xa0953566119395c11186b334805fc1a16175ecac0ecc93ae0322264f0dc2e40d" : "0x10c5a00466ab7c0adae1e93537cc275ea8cf23ff509d5466a1fd6f56b0a61d1b",
+                                "0xaa0dbf8241ef3ae07c254e6869e84895ba2be0779a7f261c8308a3114be1c54a" : "0x04",
+                                "0xaffe808b495d13a14391ce5f27c211c36da12826969cd7841ee0d81e5b900e2d" : "0x01",
+                                "0xaffe808b495d13a14391ce5f27c211c36da12826969cd7841ee0d81e5b900e2e" : "0x01",
+                                "0xb4a2b68c48ef78aeb641ee538fad51781022fd23ed9d93d211017db6a02376ce" : "0x0fbc06642245cf2fed7ed46ea0a18a7185830b6f2c4e0a4ca55246041e8bfa72",
+                                "0xba8d79990898383919e437f2458b93b340072c89d963808d9e04f51858e3c5ec" : "0x41d2cac534d90a0dbd199117481a63e32cc11411dab2eaa36c91c0eec62823cf",
+                                "0xbb3bc1a2015123750df57d4ceff7e28cb847910b79b34841de905b59a8bb177c" : "0x734417eb19e1873427257f1ea1594748c16cfa866a7b7cf896e281f2ec774a40",
+                                "0xbf30cdcb83ab2bd5f5eee691ffa4107b58b75ba6a5c2e6754d4c5c0437f2876c" : "0x05",
+                                "0xc2a26b80067fc36b8268b0d5b31afff953fa91cebea39f191e2763d6e71259b9" : "0x02a43c547fe8de2400d2a141016550e8bae058d41164247c099e787ddd40e789",
+                                "0xc98339d275eef16e0562ca8521212cef61aa0f39b12e2a27502aaa97a9e5e70f" : "0x5a3de2a5c268cdb75f4b01507aa80c4e4a1bc67bcb0df265bbb00060774e5978",
+                                "0xcbd6ae6bd61bc9270ec836f1919b3268113abe076c7febfdb8cf573b199ce9a9" : "0xf402b17773c1f7534034ee58dc0d2a3421470a7a67daf4fa790dc3b420eef790",
+                                "0xd2c8cbb562fccd0c9a3d0d491b7f65cc6a89856498f933427d9d21b745b9d50e" : "0x3625a26fdb7b747501f1ee2500f98c49d9cd290383a21254587c3c49d2805321",
+                                "0xd66f52a4e24585238ccc03443b2fdb8b2b100259bc7260f39097c7c339211ffe" : "0x1641851904381915c86b60df7e288896fb5f8ebad65d594829fb9f2b59cd1da6",
+                                "0xd8f720c05a5526dd621d1831ae122abddd3dfecd8b63b0ba4c92fa7b2ade44ff" : "0xad393086f30b49511b08fdd27ac78810b084c7cd7de6ac354f614c18ea9e7df4",
+                                "0xdc22d3171b82817c910bbeac1f8b50c8de99f8c524f172aef3491981bd5ed4fb" : "0x94b8cba4ea090d1c392fbc94b82fb9ef9f468a15bbc537f4d051776f4d422b1d",
+                                "0xdce8adbdefa929dbe60245f359446db4174c62824b42e5d4d9e7b834b4d61deb" : "0x2c9069845b2e74c577ff1cd18df6bc452805f527a9ee91fd4a059e0408b5dea6",
+                                "0xdd9493073db9e42fd955e834c89a74089f99196186ee0b2688124989be00d196" : "0x01",
+                                "0xdd9493073db9e42fd955e834c89a74089f99196186ee0b2688124989be00d197" : "0x01",
+                                "0xdd9493073db9e42fd955e834c89a74089f99196186ee0b2688124989be00d198" : "0x01",
+                                "0xdd9493073db9e42fd955e834c89a74089f99196186ee0b2688124989be00d199" : "0x01",
+                                "0xdd9493073db9e42fd955e834c89a74089f99196186ee0b2688124989be00d19a" : "0x01",
+                                "0xe54f074c81bfa60b5bf413934c108086298b77291560edfeead8aa1232e95236" : "0x0f40aaa24323c9e6983ccffafeebe4b426509b901e8c98b8a40d881804804e6b",
+                                "0xe66c0f55f66c752edf73027d45b7b1ae729ae15e1c67c362dbc6f25edf8d76ff" : "0x01",
+                                "0xe983d899f807bbcb5881f2ddf875b2ebb5cb8a7a4e77a8c98a40aaae6a468735" : "0x6d0be832b2007ea28cda705b73922cbf9794c5a25b89bd2f28b7347ed2b96c86",
+                                "0xed7d6e2d40fbd5046412ffad1c45b63d87c6197182d6dbc66bb1e5c6e4ded5c7" : "0xaba4cd295118a482a0a62579e35e4ba5bdd76146cc9e4d96172fce8be8977ab4",
+                                "0xf043b5a1952847579f233706a8f130889a484d2da3e574fdd5859f05aaf52111" : "0x02",
+                                "0xf40f4cfdacb62dd799f36b580349fac1f4a4caf8dd3383cc387c35adb6574e21" : "0x2f0000000000000000",
+                                "0xf60fa6e25e9028a6dc6b26bbc1eadae3da157df0d1d6f6628bc33cad68a7e455" : "0x2d7d00618c059ebe40593b9497c633e1ac6e161dadbd5bb734c2663cd3e8a8e1",
+                                "0xfd280ac5182d5b2366122f38acfa6dc471240ffde9d5feb985ce7a2325c960e7" : "0x03"
+                            }
+                        },
+                        "142a6927cf0060133187ba8a8e74d641438f0c1c" : {
+                            "balance" : "0x00",
+                            "code" : "0x600061031f537c01000000000000000000000000000000000000000000000000000000006000350473c9ae5868651bf7b7db6e360217db49ce4e69c07e602052730ea65418d7bf32680f55572c943a94b5908049986040526327138bfb81141561038d57600435608052601c6044599059016000905201637a66d7ca601c8203526080516004820152602060e06024836000602051602d5a03f15060e051905060a052601c604459905901600090520163c60409c6601c820352608051600482015260206101206024836000602051602d5a03f150610120519050430561010052600061014052600061016052600061018052600260a051016101005112151561010a576001610140525b60006101a052610100516101c0525b606461010051016101c051121561018457601c606459905901600090520163cc1c944e601c82035260805160048201526101c051602482015260206101e06044836000604051602d5a03f1506101e05190506101a051016101a05260016101c051016101c052610119565b6005601c606459905901600090520163cc1c944e601c820352608051600482015260a051602482015260206102006044836000604051602d5a03f1506102005190501280156101d357806101db565b600a6101a051125b9050156101eb57610140516101ee565b60005b1561033657601c604459905901600090520163c5476efe601c820352608051600482015260206102406024836000602051602d5a03f15061024051905050601c6064599059016000905201637265802d601c82035260805160048201526000602482015260206102606044836000602051602d5a03f15061026051905050601c606459905901600090520163c286273a601c82035260805160048201526000602482015260206102806044836000602051602d5a03f15061028051905050601c6044599059016000905201637a66d7ca601c820352608051600482015260206102a06024836000602051602d5a03f1506102a051905060a052601c608459905901600090520163bb8e4196601c820352608051600482015260a051602482015261010051604482015260206102c06064836000604051602d5a03f1506102c051905050610343565b6001610160526001610180525b61014051156103555761016051610358565b60005b156103665761018051610369565b60005b1561037f5760016102e05260206102e0f361038c565b6000610300526020610300f35b5b50",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "nonce" : "0x01"
+                        },
+                        "c9ae5868651bf7b7db6e360217db49ce4e69c07e" : {
+                            "balance" : "0x00",
+                            "code" : "0x600061083f537c010000000000000000000000000000000000000000000000000000000060003504637a66d7ca8114156100665760043560405260606060599059016000905260008152604051816020015260008160400152809050205460605260206060f35b63c60409c68114156100a55760043560405260606060599059016000905260008152604051816020015260018160400152809050205460a052602060a0f35b63186335768114156100e45760043560405260606060599059016000905260008152604051816020015260028160400152809050205460e052602060e0f35b63b3903c8a8114156101bc57600435604052606060605990590160009052600081526040518160200152600581604001528090502054610120526101205180602002602001599059016000905281815260208101905090506101605260006101c0525b610120516101c051121561019f57608060805990590160009052600081526040518160200152600481604001526101c051816060015280905020546101c05160200261016051015260016101c051016101c052610147565b6101605160206040820352602060208203510260400160408203f3505b636824e0fb8114156101fd57600435604052606060605990590160009052600081526040518160200152600581604001528090502054610220526020610220f35b633db16be381141561023e57600435604052606060605990590160009052600081526040518160200152600681604001528090502054610260526020610260f35b63c33878588114156102e05760006102a0526000546102c0526102c05180602002602001599059016000905281815260208101905090506102e0525b6102c0516102a05112156102c357604060405990590160009052600181526102a051816020015280905020546102a0516020026102e051015260016102a051016102a05261027a565b6102e05160206040820352602060208203510260400160408203f3505b63175c63228114156102fa57600054610380526020610380f35b63d861f2b4811415610336576004356103a052604060405990590160009052600181526103a051816020015280905020546103c05260206103c0f35b63b0dab01f81141561044f57600435610400526024356104205260443561044052606435610460526000606060605990590160009052600081526104005181602001526001816040015280905020541415610441576104205160606060599059016000905260008152610400518160200152600081604001528090502055610440516060606059905901600090526000815261040051816020015260018160400152809050205561046051606060605990590160009052600081526104005181602001526006816040015280905020556104005160406040599059016000905260018152600054816020015280905020556001600054016000556001610520526020610520f361044e565b6000610540526020610540f35b5b63aac2ffb58114156104b95760043560405260016060606059905901600090526000815260405181602001526002816040015280905020540160606060599059016000905260008152604051816020015260028160400152809050205560016105a05260206105a0f35b637265802d811415610507576004356040526024356105c0526105c0516060606059905901600090526000815260405181602001526002816040015280905020556001610600526020610600f35b63c5476efe811415610571576004356040526001606060605990590160009052600081526040518160200152600081604001528090502054016060606059905901600090526000815260405181602001526000816040015280905020556001610660526020610660f35b63c551e31e81141561063b576004356040526024356106805260606060599059016000905260008152604051816020015260058160400152809050205461012052610680516080608059905901600090526000815260405181602001526004816040015261012051816060015280905020556001606060605990590160009052600081526040518160200152600581604001528090502054016060606059905901600090526000815260405181602001526005816040015280905020556001610720526020610720f35b633d90504581141561067c57600435604052606060605990590160009052600081526040518160200152600381604001528090502054610740526020610740f35b631cda01ef8114156106e65760043560405260016060606059905901600090526000815260405181602001526003816040015280905020540160606060599059016000905260008152604051816020015260038160400152809050205560016107c05260206107c0f35b63c286273a811415610734576004356040526024356107e0526107e0516060606059905901600090526000815260405181602001526003816040015280905020556001610820526020610820f35b50",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x01",
+                                "0x0a4470e9d0419df71f6257fcdfd2c0a3bad96a23f5ab414bc10aaf1a31a536a7" : "0xb4876148229c22bd2291f1a4f5468c8c789b23639370c4d447f270ba341dbbec",
+                                "0x16ef4193a274568d283ff919c299729e07696d9ada48187b81d68e12e7b962de" : "0x0a103c04e7ecb9b3395f77c7b0cad28e62c85f042de4767ccc6c005e6f47f8d4",
+                                "0x1f1866e966f321b84535705846689749d34d5dc02994613e2931973c605d9e93" : "0xc723d0aa4a60529fe42277c8094aa19263aff36650136efc5edfd0785d457634",
+                                "0x252a4ec7133643fddcdb22a86c415f78b2dd251f18d1efcd6a44acf590c4ae72" : "0x9caf94b82715869e71d3cee986094ea612f0258570b7e5ef47b5d09e9515322b",
+                                "0x41b451e8d86d28add758cbd3f48a18fd04b11a80288c1dc434a5bf2d8fb1ca64" : "0xb602498f12a8b4af3a1fca357cea6b19bcd163dfec1d845364ce1395f7c21fa7",
+                                "0x491d10658c1ec762152d8ad2d890ad59111b1ee7b4bc25736046923d3534d9a5" : "0x629e",
+                                "0x5b0e8552efd72a845e47318abbbef9dc9fcdfe0d1a06cda44494401301581511" : "0xfbc98f4017ae5c20459daadaa6bee519b6de871d3dbaa9ab3f34340fef4cb643",
+                                "0x5b672a107ba6fab01cbddf079042e9f6176a8e6f154584fc4df4b15674c9456e" : "0x1603da41d610854d85536b37d000e5eb7ca09786c43f50e7441c0afbff1de0a9",
+                                "0x605b934bd26c9ecdf7029a7dc062d3a6b87338511cff96e0c5f13de9eea3462e" : "0xf0d24f3d0eda573fc5d43e3d0680993c51293752cd6de205040d3197f412f475",
+                                "0x618355e25491dfe86175f9d9b3147e4d680aa561d98384e3621dc6a3088b0846" : "0x6b2e6d2d5deb27dffec973f23af4caf111e66d1397f467dbbedf5ab2192fb6b6",
+                                "0x65112936bec0f1e84fda6623fb54e12baadc8a4a208c8c4eb3ed5e79cbd7e85f" : "0xa59ac24e3e0663413d0f87516ba8fb44c6c3e14da8eaabbde80f8ee285f65934",
+                                "0x687cb2122de7bacf42b9cd380b04ff2a2ce92a0b63706a9a78263b3ce86f3313" : "0x0200000000000000",
+                                "0x72a539b064c98d29a514ee55694225e05fb41fe63e5fe710e4536bd9ba3591b4" : "0x338ecfe6c523ed1184918b19584d97dd1095ecaadc49c7ba9da62b8b513026e0",
+                                "0x7aeb0a0ce8882a12d853078382a2bc72f7a94af6109f167de37b36c0a7deb828" : "0x4c428400ea8a7bd7c46ba9895b508770efa4551f0d793e1beb1207da01d9962f",
+                                "0x7c8f4a98e086f64e28c75f54712b5d44bec3c29b5c70519e8880d3046a5618dc" : "0xaafc1f2601752b114d722070f75539bfec7faf49f0d48a48d27862f0c3b09903",
+                                "0x809c325f50acf5787776e960985e72443b4330ad1e2f466557fffee16ba51d44" : "0xb940a56e64b5b661d87919b8ef03640ec077a6d72dd0b524adedaa7ddc91ff7a",
+                                "0x84e4a80d33c5d2abd2b0a5aec0fdc5eaeed90ab31db556e404a81718ea286e39" : "0x1c",
+                                "0x877305412fa2486f563c457b744e5c8b1e4d0eca73371de5e771f2abc263f4dc" : "0x7088a36f67276d475aa62127cfde9790cc802fdf3a54df49461a25eb8bf15707",
+                                "0x922a8f2fc1cbe67c8acc6a8a720983c366d71d3e2e78e3048949ebc913ea611a" : "0x50fb9f913ca102534bb0a8eb8ebf19c68dfd16ffe5e207bcc580084cd4ecd8b4",
+                                "0x987cb9ecfd8ce499d9d0e9e6b7da29617aa02774a34f4a8ea54442f44a1e1936" : "0x5179f98f555f1e9f1d4a335d16f41154579a53e361e9859269b6fa74ea9c7d21",
+                                "0xada5013122d395ba3c54772283fb069b10426056ef8ca54750cb9bb552a59e7d" : "0x0f69b5",
+                                "0xb16b117660f31197087f4d6fe50d3d4579152244956f753f9653ccf85f4b35c4" : "0x830272e3bb35226b047244cbdc46f1b6b864a280461e7a592f70e0863f4f1d33",
+                                "0xb1f1aaedfb83c7755a2bffc9e2557f1723f9abe5642397963e76248c9209af57" : "0xe9be955c5fbfcd846d7425eaea05ce897786aefad99665342cbf30761b352526",
+                                "0xb7bd50fdf7b043411c9ac33f0af2cebc69c393eb0b91f4976946f9c7b15ad0da" : "0xfccca0e7832bae9afe799a6d6177dc3869fa6c5b5105f8df6f365de5723820ec",
+                                "0xbc96058eb03504ee6f5c0a9582f8720d99a6e9738b171499507facff0b2c0b5b" : "0x9db6a4f2766b51013b8d2f9038131d1bb4af725d019d111d7e26ff96c023b23f",
+                                "0xc186c4f377b7f13892ade9656acd1522aa1f8ac151ac4f62457b5073241d79fc" : "0x7289738fef00f1770eeb098db9bd486c01ac12398d79cdf935514a128c585c51",
+                                "0xcae57ae3017972d63effd8eae44f5054402c3e890d154b905ed6b5b533327fa9" : "0xd2e4bf465e61993d13089b940a7c55017a5117d8e43e4115550a139e1d4b3e3a",
+                                "0xcf569ee7bf3accc0f893dffd04f1a757f373efe80893eff504fb3678f688ec1d" : "0x03",
+                                "0xd69b7284545a9f5275df64ce94848dc954fcb8a8b525e7ac801517c12a75af84" : "0x4202995350abae303b43e564aa79121a30b5f1aea31f69cd25e07dd3fa64dce7",
+                                "0xd8f6f90f51e657690ee28d1cc80d81bc1b89290065891fdd853d09caaaf756aa" : "0x01",
+                                "0xde72f8eed43cc2a5a3eaa51483d14b17dc92bb26c154ae184cee4b4895011edc" : "0x47ce2b6fdb72c3fabb9c74f82c1e3e522bcd42e614fd85c208ac3c4c840cea72",
+                                "0xe0e687ddf317f3d2b209ae3884148eff0f636e16827f82eded14ada8fc603009" : "0xfa7c8939f9b033162cf8d75ea69671bb8a27041bd4cdc76594e61e99333cb041",
+                                "0xe8cda339d72a1a350b62f1e3fa52e254c395cc9fdd9f60adb21c7633fbdab531" : "0x128c4fdf4801a30eae99dd58f0f3ff5ca65f71b66a9ac0f38dd450fb24b4aaaa",
+                                "0xec5e7f54fa5e516e616b04f9d5a0ee433a80e09ed47d7e5269afd76c05ff251e" : "0x14",
+                                "0xf9a3bf5f2ccb903ee1a7644113b794db0260de404fb8f11203e75a7fff151618" : "0xbd94773c0d85c68240ae8dfd53d9d33cd137509bfc5d3433381299df768c8377"
+                            }
+                        },
+                        "e509e3a93beb1eba72f8cb8d25f93a85e2d54afb" : {
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0f299dbbe3a7a5d949fe794e9a47b3106699c8110ff986eb84921c183e69e7f0" : "0x2f0000000000000000",
+                                "0x1edcd36f61cae5dc6414157dfbadf9f11ca013ac763e27f8af55feaa8a239c89" : "0x01",
+                                "0x689082d076ec3c02cbe4b99f6d9833e3c4a161072fd42fb7649eee5189a67ccc" : "0x63524e3fe4791aefce1e932bbfb3fdf375bfad89",
+                                "0xaf1d6676be3ab502a59d91f6f5c49baffc15b2cfc65a41c4d96857c0f535adba" : "0x01d60000000000000000",
+                                "0xdf1a770f69d93d1719292f384fdb4da22c0e88aef2ba462bff16674bc7848730" : "0x1c11aa45c792e202e9ffdc2f12f99d0d209bef70",
+                                "0xec5e7f54fa5e516e616b04f9d5a0ee433a80e09ed47d7e5269afd76c05ff251e" : "0x02"
+                            }
+                        },
+                        "f1562e1c0d0baa3ea746442bb7f11153fcf5cfda" : {
+                            "code" : "0x600061067f537c010000000000000000000000000000000000000000000000000000000060003504632f300bee8114156100ac576004356040526024356060526044356080526002608051018080602002602001599059016000905281815260208101905090506801000000000000000081526060516080516020028201526001604051036001608051016020028201528060206040820352602060208203510260400160408203f35050505b63a647a5b98114156102c85736599059016000905236600482376004356020820101610100526024356020820101610160526044356020820101610180526064356101a05260843560805250602061010051035180806020026020015990590160009052818152602081019050905060005b6101a0518112156101d557600060005b608051811215610162578060200261010051015181608051850201602002610160510151028201915060018101905061012e565b50680100000000000000008105905060005b6080518112156101c857700100000000000000000000000000000000836020026101805101518260805186020160200261016051015184020205816020028501510381602002850152600181019050610174565b505060018101905061011e565b50600060005b60805181121561020357806020028301518160200284015102820191506001810190506101db565b5068010000000000000000810590506002810560005b600b81121561024257600282680100000000000000008502058301059150600181019050610219565b5060005b60805181121561027657816801000000000000000082602002860151020581602002850152600181019050610246565b5050506001608051602002610100510151036080516020028201526001608051016020026101005101516001608051016020028201528060206040820352602060208203510260400160408203f35050505b635b18022981141561037957365990590160009052366004823760043560208201016103005260243560208201016103205260443560805250600060005b60805181121561033f57680100000000000000008160200261032051015182602002610300510151020582019150600181019050610306565b6000610320515114151561036657610320515168010000000000000000830205915061036b565b600091505b81610380526020610380f350505b63f4ca7dc481141561057157365990590160009052366004823760043560208201016103a05260243560208201016103c0526044356101a0526064356080525060206103c051035160026080510a806020026020015990590160009052818152602081019050905060005b60805181121561044d5760005b6080518112156104415768010000000000000000816020026103a0510151836020026103a051015102058160805184020160200284015101816080518402016020028401526001810190506103f1565b506001810190506103e4565b81905090508180602002602001599059016000905281815260208101905090506080516101a05102806020026020015990590160009052818152602081019050905060005b6101a05181121561051e5760005b6080518112156105125760005b608051811215610506576801000000000000000082608051830201602002870151826080518602016020026103c051015102058260805185020160200285015101826080518502016020028501526001810190506104ad565b506001810190506104a0565b50600181019050610492565b819050905060005b848112156105525780602002820151816020026103c05101510381602002840152600181019050610526565b508160206040820352602060208203510260400160408203f350505050505b63232b273481141561069d57365990590160009052366004823760043560208201016106205260243560208201016102805260443560208201016103c052606435610640526084356101a05260a435608052506000610280515112156106025760005b6080518112156106005780602002610280510151600003816020026102805101526001810190506105d4565b505b60005b6101a05181121561067f5760005b60805181121561067357680100000000000000006801000000000000000082602002610280510151610640510205826080518502016020026103c05101510205826020026106205101510182602002610620510152600181019050610613565b50600181019050610605565b6106205160206040820352602060208203510260400160408203f350505b50",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        }
+                }
+            }
+        ],
         "pre" : {
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
@@ -228,4 +399,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSpecialTest/gasPrice0Filler.json b/src/GeneralStateTestsFiller/stSpecialTest/gasPrice0Filler.json
index 20737e1e9..eaba12f5a 100644
--- a/src/GeneralStateTestsFiller/stSpecialTest/gasPrice0Filler.json
+++ b/src/GeneralStateTestsFiller/stSpecialTest/gasPrice0Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSpecialTest/makeMoneyFiller.json b/src/GeneralStateTestsFiller/stSpecialTest/makeMoneyFiller.json
index 03aa2304d..aa95984de 100644
--- a/src/GeneralStateTestsFiller/stSpecialTest/makeMoneyFiller.json
+++ b/src/GeneralStateTestsFiller/stSpecialTest/makeMoneyFiller.json
@@ -23,6 +23,21 @@
                         "balance" : "1000000000000000000"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "999999999999999987"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "931546"
+                    },
+                    "aaaaaaaaace5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "1000000000000000023"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stSpecialTest/sha3_dejaFiller.json b/src/GeneralStateTestsFiller/stSpecialTest/sha3_dejaFiller.json
index eba37fa0a..8faf35d2b 100644
--- a/src/GeneralStateTestsFiller/stSpecialTest/sha3_dejaFiller.json
+++ b/src/GeneralStateTestsFiller/stSpecialTest/sha3_dejaFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "999999999999900000"
diff --git a/src/GeneralStateTestsFiller/stSpecialTest/txCost-sec73Filler.json b/src/GeneralStateTestsFiller/stSpecialTest/txCost-sec73Filler.json
index 33c40b843..85d1e6e02 100644
--- a/src/GeneralStateTestsFiller/stSpecialTest/txCost-sec73Filler.json
+++ b/src/GeneralStateTestsFiller/stSpecialTest/txCost-sec73Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "1000000000000000000",
diff --git a/src/GeneralStateTestsFiller/stSpecialTest/tx_e1c174e2Filler.json b/src/GeneralStateTestsFiller/stSpecialTest/tx_e1c174e2Filler.json
index f4dca3bdb..03a60f0a3 100644
--- a/src/GeneralStateTestsFiller/stSpecialTest/tx_e1c174e2Filler.json
+++ b/src/GeneralStateTestsFiller/stSpecialTest/tx_e1c174e2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["Frontier", "Homestead"],
                 "result" : {
                     "0dc02922f33e45537411b9f92a1dcc9750ba9932" : {
                         "storage" : {
@@ -27,6 +27,25 @@
                         "nonce" : "0x19"
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "0dc02922f33e45537411b9f92a1dcc9750ba9932" : {
+                        "storage" : {
+                            "0x160000000000000000000000000000000000000000" : "0x01"
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "998612851578200764",
+                        "nonce" : "0x19"
+                    }
+                }
             }
         ],
         "pre" : {
@@ -63,4 +82,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}