f BDK: Account for TxBuilder using Amounts

Author: tnull

src/event.rs

@@ -41,7 +41,7 @@ use lightning_liquidity::lsps2::utils::compute_opening_fee;
 
 use bitcoin::blockdata::locktime::absolute::LockTime;
 use bitcoin::secp256k1::PublicKey;
-use bitcoin::OutPoint;
+use bitcoin::{Amount, OutPoint};
 
 use rand::{thread_rng, Rng};
 
@@ -418,9 +418,10 @@ where
 				let locktime = LockTime::from_height(cur_height).unwrap_or(LockTime::ZERO);
 
 				// Sign the final funding transaction and broadcast it.
+				let channel_amount = Amount::from_sat(channel_value_satoshis);
 				match self.wallet.create_funding_transaction(
 					output_script,
-					channel_value_satoshis,
+					channel_amount,
 					confirmation_target,
 					locktime,
 				) {

src/payment/onchain.rs

@@ -12,7 +12,7 @@ use crate::error::Error;
 use crate::logger::{log_error, log_info, FilesystemLogger, Logger};
 use crate::types::{ChannelManager, Wallet};
 
-use bitcoin::{Address, Txid};
+use bitcoin::{Address, Amount, Txid};
 
 use std::sync::{Arc, RwLock};
 
@@ -70,7 +70,9 @@ impl OnchainPayment {
 			);
 			return Err(Error::InsufficientFunds);
 		}
-		self.wallet.send_to_address(address, Some(amount_sats))
+
+		let amount = Amount::from_sat(amount_sats);
+		self.wallet.send_to_address(address, Some(amount))
 	}
 
 	/// Send an on-chain payment to the given address, draining all the available funds.

src/wallet/mod.rs

@@ -38,7 +38,9 @@ use bitcoin::psbt::Psbt;
 use bitcoin::secp256k1::ecdh::SharedSecret;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
 use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, Signing};
-use bitcoin::{ScriptBuf, Transaction, TxOut, Txid, WPubkeyHash, WitnessProgram, WitnessVersion};
+use bitcoin::{
+	Amount, ScriptBuf, Transaction, TxOut, Txid, WPubkeyHash, WitnessProgram, WitnessVersion,
+};
 
 use std::ops::{Deref, DerefMut};
 use std::sync::{Arc, Mutex};
@@ -137,7 +139,7 @@ where
 	}
 
 	pub(crate) fn create_funding_transaction(
-		&self, output_script: ScriptBuf, value_sats: u64, confirmation_target: ConfirmationTarget,
+		&self, output_script: ScriptBuf, amount: Amount, confirmation_target: ConfirmationTarget,
 		locktime: LockTime,
 	) -> Result<Transaction, Error> {
 		let fee_rate = self.fee_estimator.estimate_fee_rate(confirmation_target);
@@ -146,7 +148,7 @@ where
 		let mut tx_builder = locked_wallet.build_tx();
 
 		tx_builder
-			.add_recipient(output_script, value_sats)
+			.add_recipient(output_script, amount)
 			.fee_rate(fee_rate)
 			.nlocktime(locktime)
 			.enable_rbf();
@@ -217,7 +219,7 @@ where
 	/// If `amount_msat_or_drain` is `None` the wallet will be drained, i.e., all available funds will be
 	/// spent.
 	pub(crate) fn send_to_address(
-		&self, address: &bitcoin::Address, amount_msat_or_drain: Option<u64>,
+		&self, address: &bitcoin::Address, amount_or_drain: Option<Amount>,
 	) -> Result<Txid, Error> {
 		let confirmation_target = ConfirmationTarget::OnchainPayment;
 		let fee_rate = self.fee_estimator.estimate_fee_rate(confirmation_target);
@@ -226,9 +228,9 @@ where
 			let mut locked_wallet = self.inner.lock().unwrap();
 			let mut tx_builder = locked_wallet.build_tx();
 
-			if let Some(amount_sats) = amount_msat_or_drain {
+			if let Some(amount) = amount_or_drain {
 				tx_builder
-					.add_recipient(address.script_pubkey(), amount_sats)
+					.add_recipient(address.script_pubkey(), amount)
 					.fee_rate(fee_rate)
 					.enable_rbf();
 			} else {
@@ -272,12 +274,12 @@ where
 
 		let txid = tx.compute_txid();
 
-		if let Some(amount_sats) = amount_msat_or_drain {
+		if let Some(amount) = amount_or_drain {
 			log_info!(
 				self.logger,
 				"Created new transaction {} sending {}sats on-chain to address {}",
 				txid,
-				amount_sats,
+				amount.to_sat(),
 				address
 			);
 		} else {