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

---
 .../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 +++++++++++++++++++++-
 10 files changed, 191 insertions(+), 11 deletions(-)

(limited to 'src/GeneralStateTestsFiller/stTransactionTest')

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"
                     }
                 }
             }
-- 
cgit v1.2.3