Account for FeeRate in OnchainSend.

Author: G8XSU

ldk-server-cli/src/main.rs

@@ -32,6 +32,8 @@ enum Commands {
 		amount_sats: Option<u64>,
 		#[arg(long)]
 		send_all: Option<bool>,
+		#[arg(long)]
+		fee_rate_sat_per_vb: Option<u64>,
 	},
 	Bolt11Receive {
 		#[arg(short, long)]
@@ -100,9 +102,16 @@ async fn main() {
 		Commands::OnchainReceive => {
 			handle_response_result(client.onchain_receive(OnchainReceiveRequest {}).await);
 		},
-		Commands::OnchainSend { address, amount_sats, send_all } => {
+		Commands::OnchainSend { address, amount_sats, send_all, fee_rate_sat_per_vb } => {
 			handle_response_result(
-				client.onchain_send(OnchainSendRequest { address, amount_sats, send_all }).await,
+				client
+					.onchain_send(OnchainSendRequest {
+						address,
+						amount_sats,
+						send_all,
+						fee_rate_sat_per_vb,
+					})
+					.await,
 			);
 		},
 		Commands::Bolt11Receive { description, description_hash, expiry_secs, amount_msat } => {

ldk-server-protos/src/api.rs

@@ -83,6 +83,10 @@ pub struct OnchainSendRequest {
 	/// See more: <https://docs.rs/ldk-node/latest/ldk_node/payment/struct.OnchainPayment.html#method.send_all_to_address>
 	#[prost(bool, optional, tag = "3")]
 	pub send_all: ::core::option::Option<bool>,
+	/// If `fee_rate_sat_per_vb` is set it will be used on the resulting transaction. Otherwise we'll retrieve
+	/// a reasonable estimate from BitcoinD.
+	#[prost(uint64, optional, tag = "4")]
+	pub fee_rate_sat_per_vb: ::core::option::Option<u64>,
 }
 /// The response `content` for the `OnchainSend` API, when HttpStatusCode is OK (200).
 /// When HttpStatusCode is not OK (non-200), the response `content` contains a serialized `ErrorResponse`.

ldk-server-protos/src/proto/api.proto

@@ -84,6 +84,10 @@ message OnchainSendRequest {
   // the counterparty to spend the Anchor output after channel closure.
   // See more: https://docs.rs/ldk-node/latest/ldk_node/payment/struct.OnchainPayment.html#method.send_all_to_address
   optional bool send_all = 3;
+
+  // If `fee_rate_sat_per_vb` is set it will be used on the resulting transaction. Otherwise we'll retrieve
+  // a reasonable estimate from BitcoinD.
+  optional uint64 fee_rate_sat_per_vb = 4;
 }
 
 // The response `content` for the `OnchainSend` API, when HttpStatusCode is OK (200).

ldk-server/src/api/onchain_send.rs

@@ -1,5 +1,5 @@
 use crate::service::Context;
-use ldk_node::bitcoin::Address;
+use ldk_node::bitcoin::{Address, FeeRate};
 use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};
 use std::str::FromStr;
 
@@ -12,13 +12,15 @@ pub(crate) fn handle_onchain_send_request(
 		.map_err(|_| ldk_node::NodeError::InvalidAddress)?
 		.require_network(context.node.config().network)
 		.map_err(|_| ldk_node::NodeError::InvalidAddress)?;
+
+	let fee_rate = request.fee_rate_sat_per_vb.map(FeeRate::from_sat_per_vb).flatten();
 	let txid = match (request.amount_sats, request.send_all) {
 		(Some(amount_sats), None) => {
-			context.node.onchain_payment().send_to_address(&address, amount_sats)?
+			context.node.onchain_payment().send_to_address(&address, amount_sats, fee_rate)?
 		},
 		// Retain existing api behaviour to not retain reserves on `send_all_to_address`.
 		(None, Some(true)) => {
-			context.node.onchain_payment().send_all_to_address(&address, false)?
+			context.node.onchain_payment().send_all_to_address(&address, false, fee_rate)?
 		},
 		_ => return Err(ldk_node::NodeError::InvalidAmount),
 	};