descriptor: allow x-only pubkeys and add test case for a tr() descriptor

Author: Jamie C. Driver

main/descriptor.c

@@ -24,9 +24,9 @@ static const uint8_t CURRENT_DESCRIPTOR_RECORD_VERSION = 0;
 #define MIN_DESCRIPTOR_BYTES_LEN (2 + 2 + 4 + 1 + 0 + 0)
 
 // Stack size required for miniscript parsing.
-// Allow 1k, plus 1k per 'depth' level, plus 4k for handling the
+// Allow 2k, plus 1k per 'depth' level, plus 4k for handling the
 // public keys which are expected to be at the end of most branches.
-#define DESCRIPTOR_PARSE_STACK_SIZE(depth) ((depth + 5) * 1024)
+#define DESCRIPTOR_PARSE_STACK_SIZE(depth) ((depth + 6) * 1024)
 
 // We reject generating addresses from descriptors more than a certain depth, as this process
 // is recursive and so can use unbounded amounts of stack.  This protects us against a badly-
@@ -251,11 +251,7 @@ static bool parse_descriptor(const char* name, const descriptor_data_t* descript
         *errmsg = "Descriptors with private keys are not supported";
         goto fail;
     }
-    if (features & WALLY_MS_IS_X_ONLY) {
-        JADE_LOGE("Descriptor '%s' appears to contain x-only keys (taproot?)", name);
-        *errmsg = "Descriptors with x-only keys are not supported";
-        goto fail;
-    }
+
     if (!(features & WALLY_MS_IS_RANGED)) {
         JADE_LOGE("Descriptor '%s' appears not to contain any wildcards", name);
         *errmsg = "Descriptors without any wildcards are not supported";
@@ -329,9 +325,7 @@ bool descriptor_get_signers(const char* name, const descriptor_data_t* descripto
             *errmsg = "Failed to get key features";
             goto cleanup;
         }
-        if ((key_features
-                & (WALLY_MS_IS_PRIVATE | WALLY_MS_IS_UNCOMPRESSED | WALLY_MS_IS_RAW | WALLY_MS_IS_X_ONLY
-                    | WALLY_MS_IS_PARENTED))
+        if ((key_features & (WALLY_MS_IS_PRIVATE | WALLY_MS_IS_UNCOMPRESSED | WALLY_MS_IS_RAW | WALLY_MS_IS_PARENTED))
             != WALLY_MS_IS_PARENTED) {
             *errmsg = "Invalid key features";
             goto cleanup;

test_data/descriptor_tr.json

@@ -0,0 +1,22 @@
+{
+  "input": {
+    "network": "localtest",
+    "descriptor_name": "test_descriptor",
+    "descriptor": "tr(@0/<0;1>/*)",
+    "datavalues": {
+      "@0": "[e3ebcc79/86'/1'/0']tpubDCXH5giLNcN6MfDQwvskJVJMT4HemX3LKmKFac5xe9rzaFVkiUbx8wrPAt9NGKW2yXS8XsnqYm6FSP36WD4fnhNr5CweqaRwZcknepxtc9d"
+    }
+  },
+  "address_tests": [
+    {
+      "branch": 0,
+      "pointer": 0,
+      "expected_address": "bcrt1pem42zy9qwlr9vynrtg0m5gqvz99txm5slx4dmkyfe6uhyskzz8qshv7x9n"
+    },
+    {
+      "branch": 0,
+      "pointer": 1,
+      "expected_address": "bcrt1psu9scqlwhpjv7nv0ecslpda3uwrghf7h03edux4wzyefsvtpasfsjhkkkd"
+    }
+  ]
+}

test_jade.py

@@ -540,6 +540,7 @@ def _get_test_cases(pattern):
 MULTI_REG_SS_TESTS = "multisig_reg_ss_*.json"
 MULTI_REG_FILE_TESTS = "multisig_file_*.json"
 MULTI_REG_BAD_FILE_TESTS = "multisig_bad_file_*.json"
+DESCRIPTOR_REG_TESTS = "descriptor_*.json"
 DESCRIPTOR_REG_SS_TESTS = "descriptor_ss_*.json"
 SIGN_MSG_TESTS = "msg_*.json"
 SIGN_MSG_FILE_TESTS = "msgfile_*.json"
@@ -3341,8 +3342,8 @@ def test_generic_multisig_ss_signer(jadeapi):
         _check_multisig_registration(jadeapi, multisig_data)
 
 
-def test_miniscript_descriptor_registration(jadeapi):
-    for descriptor_data in _get_test_cases(DESCRIPTOR_REG_SS_TESTS):
+def test_miniscript_descriptor_registration(jadeapi, pattern):
+    for descriptor_data in _get_test_cases(pattern):
         # Register the descriptor
         inputdata = descriptor_data['input']
         rslt = jadeapi.register_descriptor(inputdata['network'],
@@ -3398,10 +3399,6 @@ def test_miniscript_descriptor_registration(jadeapi):
                 assert rslt == addr_test['expected_address']
 
 
-def test_miniscript_descriptor_registration_ss_signer(jadeapi):
-    test_miniscript_descriptor_registration(jadeapi)  # for now ...
-
-
 def test_12word_mnemonic(jadeapi):
     # Short sanity-test of 12-word mnemonic
     rslt = jadeapi.set_mnemonic(TEST_MNEMONIC_12)
@@ -3674,7 +3671,7 @@ def run_api_tests(jadeapi, isble, qemu, authuser=False):
     test_generic_multisig_files(jadeapi)
 
     # Test descriptor wallets
-    test_miniscript_descriptor_registration(jadeapi)
+    test_miniscript_descriptor_registration(jadeapi, DESCRIPTOR_REG_TESTS)
 
     # Get (receive) green-addresses, get-xpub, and sign-message
     test_get_greenaddress_receive_address(jadeapi)
@@ -3708,9 +3705,7 @@ def run_api_tests(jadeapi, isble, qemu, authuser=False):
     test_generic_multisig_ss_signer(jadeapi)
 
     # Test the descriptor wallets again, using a second signer
-    # NOTE: some of these tests assume 'test_miniscript_descriptor_registration()' test
-    # has already been run, to register the descriptors for the test mnemonic signer
-    test_miniscript_descriptor_registration_ss_signer(jadeapi)
+    test_miniscript_descriptor_registration(jadeapi, DESCRIPTOR_REG_SS_TESTS)
 
     test_get_singlesig_receive_address(jadeapi)
     test_sign_liquid_tx(jadeapi, has_psram, has_ble, SIGN_LIQUID_TXN_SINGLE_SIG_TESTS)