refill transaction tests with zeroSig

3 files changed, 293 insertions, 47 deletions

diff --git a/src/TransactionTestsFiller/EIP155/ttTransactionTestFiller.json b/src/TransactionTestsFiller/EIP155/ttTransactionTestFiller.json
index e63410b4a..a13a5b119 100644
--- a/src/TransactionTestsFiller/EIP155/ttTransactionTestFiller.json
+++ b/src/TransactionTestsFiller/EIP155/ttTransactionTestFiller.json
@@ -1083,7 +1083,6 @@
         }
     },
 
-
     "ZeroSigTransaction" : {
 	"expect" : "invalid",
 	"blocknumber" : "2675000",
@@ -1099,5 +1098,90 @@
             "r" : "0",
             "s" : "0"
         }
+    },
+
+    "ZeroSigTransaction" : {
+	"expect" : "invalid",
+	"blocknumber" : "2675000",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "1",
+            "r" : "0",
+            "s" : "0"
+        }
+    },
+
+    "ZeroSigTransaction" : {
+	"expect" : "invalid",
+	"blocknumber" : "2675000",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "2",
+            "r" : "0",
+            "s" : "0"
+        }
+    },
+
+    "ZeroSigTransaction" : {
+	"expect" : "invalid",
+	"blocknumber" : "2675000",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "3",
+            "r" : "0",
+            "s" : "0"
+        }
+    },
+
+    "ZeroSigTransaction" : {
+	"expect" : "invalid",
+	"blocknumber" : "2675000",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "4",
+            "r" : "0",
+            "s" : "0"
+        }
+    },
+
+    "ZeroSigTransaction" : {
+	"expect" : "invalid",
+	"blocknumber" : "2675000",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "5",
+            "r" : "0",
+            "s" : "0"
+        }
     }
 }
diff --git a/src/TransactionTestsFiller/Metropolis/ttMetropolisTestFiller.json b/src/TransactionTestsFiller/Metropolis/ttMetropolisTestFiller.json
index f0f4433b4..df1f31e50 100644
--- a/src/TransactionTestsFiller/Metropolis/ttMetropolisTestFiller.json
+++ b/src/TransactionTestsFiller/Metropolis/ttMetropolisTestFiller.json
@@ -153,7 +153,7 @@
     },
 
     "ZeroSigTransaction" : {
-	"expect" : "valid",
+	"expect" : "invalid",
 	"blocknumber" : "3000000",
 	"sender" : "ffffffffffffffffffffffffffffffffffffffff",
         "transaction" :
@@ -170,7 +170,7 @@
         }
     },
 
-    "ZeroSigTransaction2" : {
+    "ZeroSigTransactionV1" : {
 	"expect" : "valid",
 	"blocknumber" : "3000000",
 	"sender" : "ffffffffffffffffffffffffffffffffffffffff",
@@ -182,9 +182,171 @@
             "nonce" : "3",
             "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : "10",
+            "v" : "1",
+            "r" : "0",
+            "s" : "0"
+        }
+    },
+
+    "ZeroSigTransactionV2" : {
+	"expect" : "invalid",
+	"blocknumber" : "3000000",
+	"sender" : "ffffffffffffffffffffffffffffffffffffffff",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "2",
+            "r" : "0",
+            "s" : "0"
+        }
+    },
+
+    "ZeroSigTransactionV3" : {
+	"expect" : "invalid",
+	"blocknumber" : "3000000",
+	"sender" : "ffffffffffffffffffffffffffffffffffffffff",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "3",
+            "r" : "0",
+            "s" : "0"
+        }
+    },
+
+    "ZeroSigTransactionV4" : {
+	"expect" : "invalid",
+	"blocknumber" : "3000000",
+	"sender" : "ffffffffffffffffffffffffffffffffffffffff",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "4",
+            "r" : "0",
+            "s" : "0"
+        }
+    },
+
+    "ZeroSigTransaction2" : {
+	"expect" : "invalid",
+	"blocknumber" : "3000000",
+	"sender" : "ffffffffffffffffffffffffffffffffffffffff",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
             "v" : "0000000000",
             "r" : "00000000000000",
             "s" : "0000000000"
         }
+    },
+
+    "ZeroSigTransaction3" : {
+	"expect" : "valid",
+	"blocknumber" : "3000000",
+	"sender" : "ffffffffffffffffffffffffffffffffffffffff",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "1",
+            "r" : "00000000000000",
+            "s" : "0000000000"
+        }
+    },
+
+    "ZeroSigTransactionVp1" : {
+	"expect" : "valid",
+	"blocknumber" : "3000000",
+	"sender" : "ffffffffffffffffffffffffffffffffffffffff",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "000000000001",
+            "r" : "0",
+            "s" : "0"
+        }
+    },
+
+    "ZeroSigTransactionVp2" : {
+	"expect" : "invalid",
+	"blocknumber" : "3000000",
+	"sender" : "ffffffffffffffffffffffffffffffffffffffff",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "000000000002",
+            "r" : "0",
+            "s" : "0"
+        }
+    },
+
+    "ZeroSigTransactionVp3" : {
+	"expect" : "invalid",
+	"blocknumber" : "3000000",
+	"sender" : "ffffffffffffffffffffffffffffffffffffffff",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "000000000003",
+            "r" : "0",
+            "s" : "0"
+        }
+    },
+
+    "ZeroSigTransactionVp4" : {
+	"expect" : "invalid",
+	"blocknumber" : "3000000",
+	"sender" : "ffffffffffffffffffffffffffffffffffffffff",
+        "transaction" :
+        {
+            "data" : "0x",
+            "gasLimit" : "51000",
+            "gasPrice" : "1",
+            "nonce" : "3",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : "10",
+            "v" : "000000000004",
+            "r" : "0",
+            "s" : "0"
+        }
     }
 }
diff --git a/src/TransactionTestsFiller/Metropolis/ttTransactionTestZeroSigFiller.json b/src/TransactionTestsFiller/Metropolis/ttTransactionTestZeroSigFiller.json
index abdb85569..92808fd30 100644
--- a/src/TransactionTestsFiller/Metropolis/ttTransactionTestZeroSigFiller.json
+++ b/src/TransactionTestsFiller/Metropolis/ttTransactionTestZeroSigFiller.json
@@ -10,7 +10,7 @@
             "nonce" : "3",
             "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : "10",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -43,7 +43,7 @@
             "nonce" : "3",
             "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : "10",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -213,7 +213,7 @@
             "nonce" : "0",
             "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : "10",
-            "v" : "0",
+            "v" : "1",
             "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a02c3",
             "s" : "0"
         }
@@ -230,7 +230,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "10",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -247,7 +247,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "10",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -264,7 +264,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "10",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -281,7 +281,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "10",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -298,7 +298,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "10",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -315,7 +315,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "10",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0",
             "extrafield" : "128472387293"
@@ -331,7 +331,7 @@
             "gasPrice" : "1",
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -348,7 +348,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -366,7 +366,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639936",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -383,7 +383,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140"
         }
@@ -400,7 +400,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0x7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a0"
         }
@@ -417,7 +417,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0x7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a1"
         }
@@ -451,7 +451,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0x01"
         }
@@ -468,7 +468,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"
         }
@@ -485,7 +485,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f0000"
         }
@@ -502,7 +502,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd03641410000",
             "s" : "0"
         }
@@ -519,7 +519,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140",
             "s" : "0"
         }
@@ -536,7 +536,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141",
             "s" : "0"
         }
@@ -570,7 +570,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0x01",
             "s" : "0"
         }
@@ -587,7 +587,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "000000000000000000",
             "s" : "0"
         }
@@ -621,7 +621,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0x0000000000000000000000000000"
         }
@@ -638,7 +638,7 @@
             "nonce" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "0",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -655,7 +655,7 @@
             "nonce" : "4294967296",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "0",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -672,7 +672,7 @@
             "nonce" : "115792089237316195423570985008687907853269984665640564039457584007913129639936",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -690,7 +690,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "0",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -707,7 +707,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "0",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -724,7 +724,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "0",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -741,7 +741,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "0",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -758,7 +758,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "0",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -775,7 +775,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -792,7 +792,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -809,7 +809,7 @@
 		"nonce" : "0",
 		"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
 		"value" : "11",
-		"v" : "0",
+		"v" : "1",
 		"r" : "0",
 		"s" : "0"
 	}
@@ -826,7 +826,7 @@
 		"nonce" : "0",
 		"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
 		"value" : "11",
-		"v" : "0",
+		"v" : "1",
 		"r" : "0",
 		"s" : "0"
 	}
@@ -844,7 +844,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -861,7 +861,7 @@
             "nonce" : "54",
             "to" : "0x0000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "11",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -878,7 +878,7 @@
             "nonce" : "0",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : "0",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -895,7 +895,7 @@
             "nonce" : "0",
             "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b1c",
             "value" : "10",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -912,7 +912,7 @@
             "nonce" : "0",
             "to" : "b9331677e6ebf",
             "value" : "10",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -929,7 +929,7 @@
             "nonce" : "0",
             "to" : "0x000000000000000000000000000b9331677e6ebf",
             "value" : "10",
-            "v" : "0",
+            "v" : "1",
             "r" : "0",
             "s" : "0"
         }
@@ -946,7 +946,7 @@
             "data": "0x",
             "r": "0",
             "s": "0",
-            "v": "0",
+            "v": "1",
             "value": "0"
         }
     },
@@ -962,7 +962,7 @@
             "data": "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
             "r" : "0",
             "s" : "0",
-            "v": "0",
+            "v": "1",
             "value": "0"
         }
     }