fix: better handle invalid XOnlyPks

bin/strata-client/src/extractor.rs

@@ -592,6 +592,7 @@ mod tests {
             let random_buf = generate_valid_xonly_pk_buf32();
             let dest_addr = XOnlyPk::new(random_buf);
             let dest_descriptor = dest_addr
+                .expect("infallible due to generate_valid_xonly_pk_buf32")
                 .to_descriptor()
                 .expect("infallible due to generate_valid_xonly_pk_buf32");
 

crates/bridge-tx-builder/src/withdrawal.rs

@@ -220,7 +220,10 @@ mod tests {
 
         let user_pk = XOnlyPk::new(Buf32(pubkeys[user_index].x_only_public_key().0.serialize()));
 
-        let user_descriptor = user_pk.to_descriptor().expect("infallible");
+        let user_descriptor = user_pk
+            .expect("infallible")
+            .to_descriptor()
+            .expect("infallible");
 
         let assigned_operator_idx = assigned_operator_idx as OperatorIdx;
 
@@ -281,13 +284,14 @@ mod tests {
             "use separate indexes for user and assigned operator"
         );
 
-        let user_pk = XOnlyPk::new(Buf32(pubkeys[user_index].x_only_public_key().0.serialize()));
-        let user_descriptor = user_pk.to_descriptor();
+        let user_pk =
+            XOnlyPk::new(Buf32(pubkeys[user_index].x_only_public_key().0.serialize())).unwrap();
+        let user_descriptor = user_pk.to_descriptor().unwrap();
         let assigned_operator_idx = assigned_operator_idx as OperatorIdx;
 
         let withdrawal_info = CooperativeWithdrawalInfo::new(
             deposit_outpoint,
-            user_descriptor.unwrap(),
+            user_descriptor,
             assigned_operator_idx,
             0,
         );
@@ -325,13 +329,14 @@ mod tests {
             "use separate indexes for user and assigned operator"
         );
 
-        let user_pk = XOnlyPk::new(Buf32(pubkeys[user_index].x_only_public_key().0.serialize()));
-        let user_descriptor = user_pk.to_descriptor();
+        let user_pk =
+            XOnlyPk::new(Buf32(pubkeys[user_index].x_only_public_key().0.serialize())).unwrap();
+        let user_descriptor = user_pk.to_descriptor().unwrap();
         let assigned_operator_idx = assigned_operator_idx as OperatorIdx;
 
         let withdrawal_info = CooperativeWithdrawalInfo::new(
             deposit_outpoint,
-            user_descriptor.unwrap(),
+            user_descriptor,
             assigned_operator_idx,
             0,
         );

crates/primitives/src/l1/btc.rs

@@ -712,8 +712,12 @@ pub struct XOnlyPk(Buf32);
 
 impl XOnlyPk {
     /// Construct a new [`XOnlyPk`] directly from a [`Buf32`].
-    pub fn new(val: Buf32) -> Self {
-        Self(val)
+    pub fn new(val: Buf32) -> Result<Self, ParseError> {
+        if Self::is_valid_xonly_public_key(&val) {
+            Ok(Self(val))
+        } else {
+            Err(ParseError::InvalidPoint(val))
+        }
     }
 
     /// Get the underlying [`Buf32`].
@@ -761,6 +765,11 @@ impl XOnlyPk {
         Descriptor::new_p2tr(&self.to_xonly_public_key().serialize())
             .map_err(|_| ParseError::InvalidPoint(self.0))
     }
+
+    /// Checks if the [`Buf32`] is a valid [`XOnlyPublicKey`].
+    fn is_valid_xonly_public_key(buf: &Buf32) -> bool {
+        XOnlyPublicKey::from_slice(buf.as_bytes()).is_ok()
+    }
 }
 
 impl TryFrom<XOnlyPk> for Descriptor {
@@ -1332,7 +1341,7 @@ mod tests {
 
     #[test]
     fn test_xonly_pk_to_descriptor() {
-        let xonly_pk = XOnlyPk::new(Buf32::from([2u8; 32]));
+        let xonly_pk = XOnlyPk::new(Buf32::from([2u8; 32])).unwrap();
         let descriptor = xonly_pk.to_descriptor().unwrap();
         assert_eq!(descriptor.type_tag(), DescriptorType::P2tr);