From 346e829c149c5e4fcc46e465453e53e67ffe6b16 Mon Sep 17 00:00:00 2001
From: Dimitry <dimitry@ethereum.org>
Date: Wed, 28 Mar 2018 22:46:29 +0300
Subject: fix more tests with touch coinbase

---
 .../callOutput1Filler.json                         | 38 +++++++++++++++++-----
 .../callOutput2Filler.json                         | 38 +++++++++++++++++-----
 .../callOutput3FailFiller.json                     | 35 +++++++++++++++-----
 .../callOutput3Filler.json                         | 34 +++++++++++++++----
 .../callOutput3partialFailFiller.json              | 38 +++++++++++++++++-----
 .../callOutput3partialFiller.json                  | 38 +++++++++++++++++-----
 .../callcodeOutput1Filler.json                     | 22 ++++++++++++-
 .../callcodeOutput2Filler.json                     | 22 ++++++++++++-
 .../callcodeOutput3FailFiller.json                 | 22 ++++++++++++-
 .../callcodeOutput3Filler.json                     | 19 ++++++++++-
 .../callcodeOutput3partialFailFiller.json          | 22 ++++++++++++-
 .../callcodeOutput3partialFiller.json              | 22 ++++++++++++-
 .../CreateTransactionRevertedFiller.json           | 22 ++++++++++++-
 .../stTransactionTest/EmptyTransactionFiller.json  | 22 ++++++++++++-
 .../OverflowGasRequireFiller.json                  | 22 ++++++++++++-
 .../stTransactionTest/RefundOverflow2Filler.json   | 22 ++++++++++++-
 .../stTransactionTest/RefundOverflowFiller.json    | 22 ++++++++++++-
 .../SuicidesMixingCoinbaseFiller.json              |  7 ++--
 .../TransactionNonceCheck2Filler.json              | 21 +++++++++++-
 .../TransactionNonceCheckFiller.json               | 21 +++++++++++-
 .../TransactionToItselfNotEnoughFoundsFiller.json  | 21 +++++++++++-
 ...nsactionGasLimitIsTooLowWhenZeroCostFiller.json | 22 ++++++++++++-
 ...meRegistratorPerTxsNotEnoughGasAfterFiller.json | 25 +++++++++++++-
 ...eNameRegistratorPerTxsNotEnoughGasAtFiller.json | 21 +++++++++++-
 ...eRegistratorPerTxsNotEnoughGasBeforeFiller.json | 21 +++++++++++-
 25 files changed, 548 insertions(+), 71 deletions(-)

(limited to 'src')

diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json
index 470ed46d5..ac0aab6a4 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput1Filler.json
@@ -15,22 +15,45 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : [">=Byzantium", "Homestead"],
+                "network" : ["Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0"
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             },
@@ -44,14 +67,11 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-                            "0x01" : "0x00"
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
                         }
                     },
                     "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json
index 97c6479d2..42ec59cc3 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput2Filler.json
@@ -15,22 +15,45 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : ["Homestead", ">=Byzantium"],
+                "network" : ["Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0"
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             },
@@ -44,14 +67,11 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-                            "0x01" : "0x00"
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
                         }
                     },
                     "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json
index 8afd4e469..6578d7c9b 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3FailFiller.json
@@ -15,18 +15,38 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : ["Homestead", ">=Byzantium"],
+                "network" : ["Homestead"],
+                "result" : {
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    },
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -44,14 +64,11 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-                            "0x01" : "0x00"
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
                         }
                     },
                     "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json
index 4219ed40c..d2086eb3b 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3Filler.json
@@ -15,21 +15,45 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : ["Homestead", ">=Byzantium"],
+                "network" : ["Homestead"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00"
                         }
                     },
                     "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0"
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             },
@@ -48,8 +72,6 @@
                     },
                     "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
index 7598e7fb6..6389f4853 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
@@ -15,22 +15,45 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : ["Homestead", ">=Byzantium"],
+                "network" : ["Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0"
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             },
@@ -44,14 +67,11 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-                            "0x01" : "0x00"
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
                         }
                     },
                     "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json
index e33e9b9a5..2c88d5ced 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callOutput3partialFiller.json
@@ -15,20 +15,43 @@
                     "gas" : 0,
                     "value" : -1
                 },
-                "network" : ["Homestead", ">=Byzantium"],
+                "network" : ["Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
+                    },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0"
                     }
@@ -44,14 +67,11 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-                            "0x01" : "0x00"
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
                         }
                     },
                     "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
index 17cbf6a64..579d33db2 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput1Filler.json
@@ -9,17 +9,37 @@
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Homestead"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
             {
                 "indexes" : {
                     "data" : -1,
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", ">=Byzantium"],
+                "network" : [">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
                         }
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
index 686876f18..65bddbd13 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput2Filler.json
@@ -15,11 +15,31 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", ">=Byzantium"],
+                "network" : ["Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
                         }
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
index 72fa7ce3e..126b8e86f 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3FailFiller.json
@@ -15,11 +15,31 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", ">=Byzantium"],
+                "network" : ["Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
                         }
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
index 4dc066443..481fd2454 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3Filler.json
@@ -15,7 +15,24 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", ">=Byzantium"],
+                "network" : ["Homestead"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
index d7a1b223b..08a892af5 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFailFiller.json
@@ -15,11 +15,31 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", ">=Byzantium"],
+                "network" : ["Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
                         }
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
index 180a4e0fb..a6992d5cf 100644
--- a/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/callcodeOutput3partialFiller.json
@@ -15,11 +15,31 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", ">=Byzantium"],
+                "network" : ["Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
                         }
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Byzantium"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json
index e18100db2..70fa987cc 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/CreateTransactionRevertedFiller.json
@@ -15,11 +15,31 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Frontier"],
+                "network" : ["<EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "132000",
                         "nonce" : "0"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "132000",
+                        "nonce" : "0"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json
index 2650602c6..541c51797 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/EmptyTransactionFiller.json
@@ -15,11 +15,31 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Frontier"],
+                "network" : ["<EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "100000",
                         "nonce" : "0"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "100000",
+                        "nonce" : "0"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json
index ec9a841d1..8717d7a46 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json
@@ -15,11 +15,31 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Frontier"],
+                "network" : ["<EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
                         "nonce" : "0"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+                        "nonce" : "0"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json
index c90e79fda..7f7090d5c 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflow2Filler.json
@@ -15,11 +15,31 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Frontier"],
+                "network" : ["<EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "400",
                 	"nonce" : "0"
+                    },
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "400",
+                	"nonce" : "0"
+                    },
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json
index d8cdc0213..786a0ed1b 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/RefundOverflowFiller.json
@@ -15,11 +15,31 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Frontier"],
+                "network" : ["<EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "400",
                         "nonce" : "0"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "400",
+                        "nonce" : "0"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json
index ecedb6efb..5b238a719 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json
@@ -24,7 +24,10 @@
                 	"balance" : "1010"
             	    },
 		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-			"shouldnotexist" : "1"
+			"balance" : "0",
+			"nonce" : "0",
+			"code" : "",
+			"storage" : {}
 		    }
                 }
             },
@@ -34,7 +37,7 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : ["EIP150", ">=EIP158"],
+                "network" : [">=EIP158"],
                 "result" : {
 	            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 	"nonce" : "1"
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json
index 1dfda2ea5..9e1a18c69 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheck2Filler.json
@@ -15,10 +15,29 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Frontier"],
+                "network" : ["<EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json
index 763c18fcb..dc006e8c8 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionNonceCheckFiller.json
@@ -15,10 +15,29 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Frontier"],
+                "network" : ["<EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "10"
+                    },
+	            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "10"
+                    },
+	            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json
index d6ce4ecc1..a6961ee20 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/TransactionToItselfNotEnoughFoundsFiller.json
@@ -15,10 +15,29 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Frontier"],
+                "network" : ["<EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "22000"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "22000"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json
index f406cca9d..4a8a9f74d 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCostFiller.json
@@ -15,11 +15,31 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : [">=Frontier"],
+                "network" : ["<EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "33000",
                         "nonce" : "0"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "33000",
+                        "nonce" : "0"
+                    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfterFiller.json b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfterFiller.json
index c2f0edd24..8a5e1444b 100644
--- a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfterFiller.json
@@ -33,7 +33,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP150", ">=EIP158"],
+                "network" : ["Homestead", "EIP150"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0de0b6b3a7640000",
@@ -41,6 +41,29 @@
                             "nonce" : "0x00",
                             "storage" : {
                             }
+                        },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0"
+                        }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "shouldnotexist" : "1"
                         }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAtFiller.json b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAtFiller.json
index c8b5b3233..8883e5e78 100644
--- a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAtFiller.json
+++ b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAtFiller.json
@@ -33,10 +33,29 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP150", ">=EIP158"],
+                "network" : ["Homestead", "EIP150"],
                 "result" : {
                     "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                             "shouldnotexist" : "1"
+		     },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0"
+		     }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                            "shouldnotexist" : "1"
+		     },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "shouldnotexist" : "1"
 		     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBeforeFiller.json b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBeforeFiller.json
index 834aa0b43..f03699cff 100644
--- a/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBeforeFiller.json
@@ -33,10 +33,29 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP150", ">=EIP158"],
+                "network" : ["Homestead", "EIP150"],
                 "result" : {
                         "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                             "shouldnotexist" : "1"
+                        },
+		 	"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0"
+                        }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                        "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                            "shouldnotexist" : "1"
+                        },
+		 	"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "shouldnotexist" : "1"
                         }
                 }
             }
-- 
cgit v1.2.3