fix(descriptor): reject bare descriptors in check_wallet_descriptor

src/descriptor/error.rs

@@ -44,6 +44,8 @@ pub enum Error {
     Hex(bitcoin::hex::HexToBytesError),
     /// The provided wallet descriptors are identical
     ExternalAndInternalAreTheSame,
+    /// Descriptor type is not supported by the wallet (e.g. bare or raw scripts have no address form)
+    UnsupportedDescriptorType,
 }
 
 impl From<crate::keys::KeyError> for Error {
@@ -84,6 +86,12 @@ impl fmt::Display for Error {
             Self::ExternalAndInternalAreTheSame => {
                 write!(f, "External and internal descriptors are the same")
             }
+            Self::UnsupportedDescriptorType => {
+                write!(
+                    f,
+                    "Descriptor type is not supported by the wallet; bare and raw scripts have no address form"
+                )
+            }
         }
     }
 }

src/descriptor/mod.rs

@@ -321,6 +321,22 @@
         ));
     }
 
+    // Reject descriptor types that have no standard address form (e.g. bare scripts, raw scripts).
+    // Using an allowlist guards against any future unsupported types as well.
+    match descriptor.desc_type() {
+        DescriptorType::Pkh
+        | DescriptorType::Wpkh
+        | DescriptorType::ShWpkh
+        | DescriptorType::Sh
+        | DescriptorType::ShSortedMulti
+        | DescriptorType::Wsh
+        | DescriptorType::ShWsh
+        | DescriptorType::ShWshSortedMulti
+        | DescriptorType::WshSortedMulti
+        | DescriptorType::Tr => {}
+        _ => return Err(DescriptorError::UnsupportedDescriptorType),
+    }
+
     // Run miniscript's sanity check, which will look for duplicated keys and other potential
     // issues.
     descriptor.sanity_check()?;
@@ -912,11 +928,29 @@
         let result = check_wallet_descriptor(&descriptor);
 
         assert!(result.is_err());
+
+        // Bare descriptors (e.g. pk()) have no standard address form and must be rejected.
+        let descriptor = Descriptor::<DescriptorPublicKey>::from_str(
+            "pk(tpubD6NzVbkrYhZ4XHndKkuB8FifXm8r5FQHwrN6oZuWCz13qb93rtgKvD4PQsqC4HP4yhV3tA2fqr2RbY5mNXfM7RxXUoeABoDtsFUq2zJq6YK/0/*)",
+        )
+        .expect("must parse");
+        assert_matches!(
+            check_wallet_descriptor(&descriptor),
+            Err(DescriptorError::UnsupportedDescriptorType)
+        );
+
+        // Raw script descriptors have no standard address form and must be rejected.
+        let descriptor = Descriptor::<DescriptorPublicKey>::from_str("raw(deadbeef)")
+            .expect("must parse");
+        assert_matches!(
+            check_wallet_descriptor(&descriptor),
+            Err(DescriptorError::UnsupportedDescriptorType)
+        );
     }
 
     #[test]
     fn test_sh_wsh_sortedmulti_redeemscript() {
         use miniscript::psbt::PsbtInputExt;
 
         let secp = Secp256k1::new();