fix: preserve output metadata in try_finalize_psbt

Author: reez

src/wallet/mod.rs

@@ -1922,14 +1922,18 @@ impl Wallet {
             .unwrap_or_else(|| self.chain.tip().height());
 
         Ok(self
-            .try_finalize_psbt_with(psbt, |_, input| {
-                Some((
-                    current_height,
-                    confirmation_heights
-                        .get(&input.previous_output.txid)
-                        .copied(),
-                ))
-            })?
+            .try_finalize_psbt_with(
+                psbt,
+                |_, input| {
+                    Some((
+                        current_height,
+                        confirmation_heights
+                            .get(&input.previous_output.txid)
+                            .copied(),
+                    ))
+                },
+                true,
+            )?
             .is_finalized())
     }
 
@@ -1942,13 +1946,14 @@ impl Wallet {
         &self,
         psbt: &mut Psbt,
     ) -> Result<FinalizePsbtOutcome, IndexOutOfBoundsError> {
-        self.try_finalize_psbt_with(psbt, |_, _| None)
+        self.try_finalize_psbt_with(psbt, |_, _| None, false)
     }
 
     fn try_finalize_psbt_with<F>(
         &self,
         psbt: &mut Psbt,
         mut wallet_timelocks: F,
+        clear_output_derivations: bool,
     ) -> Result<FinalizePsbtOutcome, IndexOutOfBoundsError>
     where
         F: FnMut(usize, &bitcoin::TxIn) -> Option<(u32, Option<u32>)>,
@@ -2037,9 +2042,8 @@ impl Wallet {
             }
         }
 
-        // Clear derivation paths from outputs.
         let finalized = FinalizePsbtOutcome::new(outcomes);
-        if finalized.is_finalized() {
+        if clear_output_derivations && finalized.is_finalized() {
             for output in &mut psbt.outputs {
                 output.bip32_derivation.clear();
                 output.tap_key_origins.clear();

tests/wallet.rs

@@ -1628,10 +1628,15 @@ fn test_try_finalize_psbt_outcomes() {
             )
             .unwrap();
         assert!(!is_final);
+        let output_bip32_derivations = psbt
+            .outputs
+            .iter()
+            .map(|output| output.bip32_derivation.clone())
+            .collect::<Vec<_>>();
         assert!(
-            psbt.outputs
+            output_bip32_derivations
                 .iter()
-                .any(|output| !output.bip32_derivation.is_empty()),
+                .any(|derivation| !derivation.is_empty()),
             "expected wallet-owned outputs to retain derivation data before finalization"
         );
 
@@ -1646,10 +1651,13 @@ fn test_try_finalize_psbt_outcomes() {
             psbt.inputs[0].final_script_sig.is_some()
                 || psbt.inputs[0].final_script_witness.is_some()
         );
-        assert!(psbt
-            .outputs
-            .iter()
-            .all(|output| output.bip32_derivation.is_empty()));
+        assert_eq!(
+            psbt.outputs
+                .iter()
+                .map(|output| output.bip32_derivation.clone())
+                .collect::<Vec<_>>(),
+            output_bip32_derivations
+        );
 
         let finalized = wallet.try_finalize_psbt(&mut psbt).unwrap();