Add flags support to script_(in)valid.json tests

Most of the flags aren't actually checked in scripteval, so this still has
basically all the script_invalid.json tests assocated with flags removed.

Author: petertodd

bitcoin/core/scripteval.py

@@ -40,7 +40,27 @@
 
 SCRIPT_VERIFY_P2SH = object()
 SCRIPT_VERIFY_STRICTENC = object()
+SCRIPT_VERIFY_DERSIG = object()
 SCRIPT_VERIFY_LOW_S = object()
+SCRIPT_VERIFY_NULLDUMMY = object()
+SCRIPT_VERIFY_SIGPUSHONLY = object()
+SCRIPT_VERIFY_MINIMALDATA = object()
+SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS = object()
+SCRIPT_VERIFY_CLEANSTACK = object()
+SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY = object()
+
+SCRIPT_VERIFY_FLAGS_BY_NAME = {
+    'P2SH': SCRIPT_VERIFY_P2SH,
+    'STRICTENC': SCRIPT_VERIFY_STRICTENC,
+    'DERSIG': SCRIPT_VERIFY_DERSIG,
+    'LOW_S': SCRIPT_VERIFY_LOW_S,
+    'NULLDUMMY': SCRIPT_VERIFY_NULLDUMMY,
+    'SIGPUSHONLY': SCRIPT_VERIFY_SIGPUSHONLY,
+    'MINIMALDATA': SCRIPT_VERIFY_MINIMALDATA,
+    'DISCOURAGE_UPGRADABLE_NOPS': SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS,
+    'CLEANSTACK': SCRIPT_VERIFY_CLEANSTACK,
+    'CHECKLOCKTIMEVERIFY': SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY,
+}
 
 class EvalScriptError(bitcoin.core.ValidationError):
     """Base class for exceptions raised when a script fails during EvalScript()
@@ -781,7 +801,15 @@ def VerifySignature(txFrom, txTo, inIdx):
         'MAX_STACK_ITEMS',
         'SCRIPT_VERIFY_P2SH',
         'SCRIPT_VERIFY_STRICTENC',
+        'SCRIPT_VERIFY_DERSIG',
         'SCRIPT_VERIFY_LOW_S',
+        'SCRIPT_VERIFY_NULLDUMMY',
+        'SCRIPT_VERIFY_SIGPUSHONLY',
+        'SCRIPT_VERIFY_MINIMALDATA',
+        'SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS',
+        'SCRIPT_VERIFY_CLEANSTACK',
+        'SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY',
+        'SCRIPT_VERIFY_FLAGS_BY_NAME',
         'EvalScriptError',
         'MaxOpCountError',
         'MissingOpArgumentsError',

bitcoin/tests/data/script_valid.json

@@ -726,6 +726,12 @@
     "P2SH",
     "P2SH(P2PK)"
 ],
+[
+    "0x47 0x304402204e2eb034be7b089534ac9e798cf6a2c79f38bcb34d1b179efd6f2de0841735db022071461beb056b5a7be1819da6a3e3ce3662831ecc298419ca101eb6887b5dd6a401 0x19 0x76a9147cf9c846cd4882efec4bf07e44ebdad495c94f4b88ac",
+    "HASH160 0x14 0x2df519943d5acc0ef5222091f9dfe3543f489a82 EQUAL",
+    "",
+    "P2SH(P2PKH), bad sig but no VERIFY_P2SH"
+],
 [
     "0 0x47 0x3044022051254b9fb476a52d85530792b578f86fea70ec1ffb4393e661bcccb23d8d63d3022076505f94a403c86097841944e044c70c2045ce90e36de51f7e9d3828db98a07501 0x47 0x304402200a358f750934b3feb822f1966bfcd8bbec9eeaa3a8ca941e11ee5960e181fa01022050bf6b5a8e7750f70354ae041cb68a7bade67ec6c3ab19eb359638974410626e01 0x47 0x304402200955d031fff71d8653221e85e36c3c85533d2312fc3045314b19650b7ae2f81002202a6bb8505e36201909d0921f01abff390ae6b7ff97bbf959f98aedeb0a56730901",
     "3 0x21 0x0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 0x21 0x038282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508 0x21 0x03363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640 3 CHECKMULTISIG",

bitcoin/tests/test_scripteval.py

@@ -68,12 +68,23 @@ def load_test_vectors(name):
             scriptSig = parse_script(scriptSig)
             scriptPubKey = parse_script(scriptPubKey)
 
-            yield (scriptSig, scriptPubKey, comment, test_case)
+            flag_set = set()
+            for flag in flags.split(','):
+                if flag == '' or flag == 'NONE':
+                    pass
 
+                else:
+                    try:
+                        flag = SCRIPT_VERIFY_FLAGS_BY_NAME[flag]
+                    except IndexError:
+                        raise Exception('Unknown script verify flag %r' % flag)
 
-class Test_EvalScript(unittest.TestCase):
-    flags = (SCRIPT_VERIFY_P2SH, SCRIPT_VERIFY_STRICTENC)
+                    flag_set.add(flag)
+
+            yield (scriptSig, scriptPubKey, flag_set, comment, test_case)
 
+
+class Test_EvalScript(unittest.TestCase):
     def create_test_txs(self, scriptSig, scriptPubKey):
         txCredit = CTransaction([CTxIn(COutPoint(), CScript([OP_0, OP_0]), nSequence=0xFFFFFFFF)],
                                 [CTxOut(0, scriptPubKey)],
@@ -84,20 +95,20 @@ def create_test_txs(self, scriptSig, scriptPubKey):
         return (txCredit, txSpend)
 
     def test_script_valid(self):
-        for scriptSig, scriptPubKey, comment, test_case in load_test_vectors('script_valid.json'):
+        for scriptSig, scriptPubKey, flags, comment, test_case in load_test_vectors('script_valid.json'):
             (txCredit, txSpend) = self.create_test_txs(scriptSig, scriptPubKey)
 
             try:
-                VerifyScript(scriptSig, scriptPubKey, txSpend, 0, flags=self.flags)
+                VerifyScript(scriptSig, scriptPubKey, txSpend, 0, flags)
             except ValidationError as err:
                 self.fail('Script FAILED: %r %r %r with exception %r' % (scriptSig, scriptPubKey, comment, err))
 
     def test_script_invalid(self):
-        for scriptSig, scriptPubKey, comment, test_case in load_test_vectors('script_invalid.json'):
+        for scriptSig, scriptPubKey, flags, comment, test_case in load_test_vectors('script_invalid.json'):
             (txCredit, txSpend) = self.create_test_txs(scriptSig, scriptPubKey)
 
             try:
-                VerifyScript(scriptSig, scriptPubKey, txSpend, 0, flags=self.flags)
+                VerifyScript(scriptSig, scriptPubKey, txSpend, 0, flags)
             except ValidationError:
                 continue