f - Avoid cloning cancellation scripts

Consume cancellation transactions.

This avoids cloning output scripts during wallet cancellation.

Co-Authored-By: HAL 9000

Author: tnull

src/event.rs

@@ -1648,7 +1648,7 @@ where
 							})
 							.collect(),
 					};
-					if let Err(e) = self.wallet.cancel_tx(&tx) {
+					if let Err(e) = self.wallet.cancel_tx(tx) {
 						log_error!(self.logger, "Failed reclaiming unused addresses: {}", e);
 						return Err(ReplayEvent());
 					}

src/wallet/mod.rs

@@ -524,7 +524,7 @@ impl Wallet {
 		Ok(address_info.address)
 	}
 
-	pub(crate) fn cancel_tx(&self, tx: &Transaction) -> Result<(), Error> {
+	pub(crate) fn cancel_tx(&self, tx: Transaction) -> Result<(), Error> {
 		let mut locked_wallet = self.inner.lock().expect("lock");
 		let mut locked_persister = self.persister.lock().expect("lock");
 
@@ -538,12 +538,10 @@ impl Wallet {
 	}
 
 	fn cancel_tx_inner(
-		locked_wallet: &mut PersistedWallet<KVStoreWalletPersister>, tx: &Transaction,
+		locked_wallet: &mut PersistedWallet<KVStoreWalletPersister>, tx: Transaction,
 	) {
-		for txout in &tx.output {
-			if let Some((keychain, index)) =
-				locked_wallet.derivation_of_spk(txout.script_pubkey.clone())
-			{
+		for txout in tx.output {
+			if let Some((keychain, index)) = locked_wallet.derivation_of_spk(txout.script_pubkey) {
 				// This mirrors the removed BDK helper: it only frees superficial usage marks.
 				locked_wallet.unmark_used(keychain, index);
 			}
@@ -702,7 +700,7 @@ impl Wallet {
 			None,
 		)?;
 
-		Self::cancel_tx_inner(&mut locked_wallet, &tmp_psbt.unsigned_tx);
+		Self::cancel_tx_inner(&mut locked_wallet, tmp_psbt.unsigned_tx);
 
 		Ok(max_amount)
 	}
@@ -732,7 +730,7 @@ impl Wallet {
 			Some(&shared_input),
 		)?;
 
-		Self::cancel_tx_inner(&mut locked_wallet, &tmp_psbt.unsigned_tx);
+		Self::cancel_tx_inner(&mut locked_wallet, tmp_psbt.unsigned_tx);
 
 		Ok(splice_amount)
 	}
@@ -788,7 +786,7 @@ impl Wallet {
 							e
 						})?;
 
-					Self::cancel_tx_inner(&mut locked_wallet, &tmp_psbt.unsigned_tx);
+					Self::cancel_tx_inner(&mut locked_wallet, tmp_psbt.unsigned_tx);
 
 					let mut tx_builder = locked_wallet.build_tx();
 					tx_builder