Tweak transaction bumping sign_tx types for bindings

In bindings we can't practically pass a mutable transaction, and
instead need to pass an owned transaction and have the sign method
return a signed copy. We do this here only for the
`#[cfg(c_bindings)]` build mode.

Author: TheBlueMatt

lightning/src/events/bump_transaction.rs

@@ -467,9 +467,14 @@ pub trait CoinSelectionSource {
 		&self, claim_id: ClaimId, must_spend: &[Input], must_pay_to: &[TxOut],
 		target_feerate_sat_per_1000_weight: u32,
 	) -> Result<CoinSelection, ()>;
+	#[cfg(not(c_bindings))]
 	/// Signs and provides the full witness for all inputs within the transaction known to the
 	/// trait (i.e., any provided via [`CoinSelectionSource::select_confirmed_utxos`]).
 	fn sign_tx(&self, tx: &mut Transaction) -> Result<(), ()>;
+	#[cfg(c_bindings)]
+	/// Signs and provides the full witness for all inputs within the transaction known to the
+	/// trait (i.e., any provided via [`CoinSelectionSource::select_confirmed_utxos`]).
+	fn sign_tx(&self, tx: Transaction) -> Result<Transaction, ()>;
 }
 
 /// An alternative to [`CoinSelectionSource`] that can be implemented and used along [`Wallet`] to
@@ -480,10 +485,16 @@ pub trait WalletSource {
 	/// Returns a script to use for change above dust resulting from a successful coin selection
 	/// attempt.
 	fn get_change_script(&self) -> Result<Script, ()>;
+	#[cfg(not(c_bindings))]
 	/// Signs and provides the full [`TxIn::script_sig`] and [`TxIn::witness`] for all inputs within
 	/// the transaction known to the wallet (i.e., any provided via
 	/// [`WalletSource::list_confirmed_utxos`]).
 	fn sign_tx(&self, tx: &mut Transaction) -> Result<(), ()>;
+	#[cfg(c_bindings)]
+	/// Signs and provides the full [`TxIn::script_sig`] and [`TxIn::witness`] for all inputs within
+	/// the transaction known to the wallet (i.e., any provided via
+	/// [`WalletSource::list_confirmed_utxos`]).
+	fn sign_tx(&self, tx: Transaction) -> Result<Transaction, ()>;
 }
 
 /// A wrapper over [`WalletSource`] that implements [`CoinSelection`] by preferring UTXOs that would
@@ -629,9 +640,15 @@ where
 			.or_else(|_| do_coin_selection(true, true))
 	}
 
+	#[cfg(not(c_bindings))]
 	fn sign_tx(&self, tx: &mut Transaction) -> Result<(), ()> {
 		self.source.sign_tx(tx)
 	}
+
+	#[cfg(c_bindings)]
+	fn sign_tx(&self, tx: Transaction) -> Result<Transaction, ()> {
+		self.source.sign_tx(tx)
+	}
 }
 
 /// A handler for [`Event::BumpTransaction`] events that sources confirmed UTXOs from a
@@ -748,7 +765,13 @@ where
 		let unsigned_tx_weight = anchor_tx.weight() as u64 - (anchor_tx.input.len() as u64 * EMPTY_SCRIPT_SIG_WEIGHT);
 
 		log_debug!(self.logger, "Signing anchor transaction {}", anchor_txid);
-		self.utxo_source.sign_tx(&mut anchor_tx)?;
+		#[cfg(not(c_bindings))] {
+			self.utxo_source.sign_tx(&mut anchor_tx)?;
+		}
+		#[cfg(c_bindings)] {
+			anchor_tx = self.utxo_source.sign_tx(anchor_tx)?;
+		}
+
 		let signer = anchor_descriptor.derive_channel_signer(&self.signer_provider);
 		let anchor_sig = signer.sign_holder_anchor_input(&anchor_tx, 0, &self.secp)?;
 		anchor_tx.input[0].witness = anchor_descriptor.tx_input_witness(&anchor_sig);
@@ -812,7 +835,13 @@ where
 		let unsigned_tx_weight = htlc_tx.weight() as u64 - (htlc_tx.input.len() as u64 * EMPTY_SCRIPT_SIG_WEIGHT);
 
 		log_debug!(self.logger, "Signing HTLC transaction {}", htlc_tx.txid());
-		self.utxo_source.sign_tx(&mut htlc_tx)?;
+		#[cfg(not(c_bindings))] {
+			self.utxo_source.sign_tx(&mut htlc_tx)?;
+		}
+		#[cfg(c_bindings)] {
+			htlc_tx = self.utxo_source.sign_tx(htlc_tx)?;
+		}
+
 		let mut signers = BTreeMap::new();
 		for (idx, htlc_descriptor) in htlc_descriptors.iter().enumerate() {
 			let signer = signers.entry(htlc_descriptor.channel_derivation_parameters.keys_id)

lightning/src/util/test_utils.rs

@@ -1102,19 +1102,8 @@ impl TestWalletSource {
 	pub fn remove_utxo(&self, outpoint: bitcoin::OutPoint) {
 		self.utxos.borrow_mut().retain(|utxo| utxo.outpoint != outpoint);
 	}
-}
-
-impl WalletSource for TestWalletSource {
-    fn list_confirmed_utxos(&self) -> Result<Vec<Utxo>, ()> {
-		Ok(self.utxos.borrow().clone())
-    }
-
-    fn get_change_script(&self) -> Result<Script, ()> {
-		let public_key = bitcoin::PublicKey::new(self.secret_key.public_key(&self.secp));
-		Ok(Script::new_p2pkh(&public_key.pubkey_hash()))
-    }
 
-    fn sign_tx(&self, tx: &mut Transaction) -> Result<(), ()> {
+	fn do_sign_tx(&self, tx: &mut Transaction) -> Result<(), ()> {
 		let utxos = self.utxos.borrow();
 		for i in 0..tx.input.len() {
 			if let Some(utxo) = utxos.iter().find(|utxo| utxo.outpoint == tx.input[i].previous_output) {
@@ -1130,5 +1119,26 @@ impl WalletSource for TestWalletSource {
 			}
 		}
 		Ok(())
-    }
+	}
+}
+
+impl WalletSource for TestWalletSource {
+	fn list_confirmed_utxos(&self) -> Result<Vec<Utxo>, ()> {
+		Ok(self.utxos.borrow().clone())
+	}
+
+	fn get_change_script(&self) -> Result<Script, ()> {
+		let public_key = bitcoin::PublicKey::new(self.secret_key.public_key(&self.secp));
+		Ok(Script::new_p2pkh(&public_key.pubkey_hash()))
+	}
+
+	#[cfg(not(c_bindings))]
+	fn sign_tx(&self, tx: &mut Transaction) -> Result<(), ()> {
+		self.do_sign_tx(tx)
+	}
+	#[cfg(c_bindings)]
+	fn sign_tx(&self, mut tx: Transaction) -> Result<Transaction, ()> {
+		self.do_sign_tx(&mut tx)?;
+		Ok(tx)
+	}
 }