update

Author: Camillarhi

bindings/ldk_node.udl

@@ -13,20 +13,13 @@ dictionary Config {
 	u64 probing_liquidity_limit_multiplier;
 	AnchorChannelsConfig? anchor_channels_config;
 	SendingParameters? sending_parameters;
-	RebroadcastPolicy rebroadcast_policy;
 };
 
 dictionary AnchorChannelsConfig {
 	sequence<PublicKey> trusted_peers_no_reserve;
 	u64 per_channel_reserve_sats;
 };
 
-dictionary RebroadcastPolicy {
-	u64 min_rebroadcast_interval;
-	u32 max_broadcast_attempts;
-	f32 backoff_factor;
-};
-
 dictionary BackgroundSyncConfig {
 	u64 onchain_wallet_sync_interval_secs;
 	u64 lightning_wallet_sync_interval_secs;
@@ -239,9 +232,9 @@ interface OnchainPayment {
 	[Throws=NodeError]
 	Txid send_all_to_address([ByRef]Address address, boolean retain_reserve, FeeRate? fee_rate);
 	[Throws=NodeError]
-	void rebroadcast_transaction(Txid txid);
+	void rebroadcast_transaction(PaymentId payment_id);
 	[Throws=NodeError]
-	Txid bump_fee_rbf(Txid txid, u64 fee_bump_increment);
+	Txid bump_fee_rbf(PaymentId payment_id);
 };
 
 interface FeeRate {

src/config.rs

@@ -182,16 +182,6 @@ pub struct Config {
 	/// **Note:** If unset, default parameters will be used, and you will be able to override the
 	/// parameters on a per-payment basis in the corresponding method calls.
 	pub sending_parameters: Option<SendingParameters>,
-	/// Policy for controlling transaction rebroadcasting behavior.
-	///
-	/// This policy determines how and when unconfirmed transactions are rebroadcast to the network
-	/// to improve confirmation reliability.
-	///
-	/// ### Default Behavior
-	/// - Minimum interval: 300 seconds (5 minutes)
-	/// - Maximum attempts: 24
-	/// - Exponential backoff factor: 1.5 (50% increase each attempt)
-	pub rebroadcast_policy: RebroadcastPolicy,
 }
 
 impl Default for Config {
@@ -206,7 +196,6 @@ impl Default for Config {
 			anchor_channels_config: Some(AnchorChannelsConfig::default()),
 			sending_parameters: None,
 			node_alias: None,
-			rebroadcast_policy: RebroadcastPolicy::default(),
 		}
 	}
 }

src/ffi/types.rs

@@ -12,7 +12,7 @@
 
 pub use crate::config::{
 	default_config, AnchorChannelsConfig, BackgroundSyncConfig, ElectrumSyncConfig,
-	EsploraSyncConfig, MaxDustHTLCExposure, RebroadcastPolicy,
+	EsploraSyncConfig, MaxDustHTLCExposure,
 };
 pub use crate::graph::{ChannelInfo, ChannelUpdateInfo, NodeAnnouncementInfo, NodeInfo};
 pub use crate::liquidity::{LSPS1OrderStatus, LSPS2ServiceConfig, OnchainPaymentInfo, PaymentInfo};

src/payment/onchain.rs

@@ -14,6 +14,7 @@ use crate::types::{ChannelManager, Wallet};
 use crate::wallet::OnchainSendAmount;
 
 use bitcoin::{Address, Txid};
+use lightning::ln::channelmanager::PaymentId;
 
 use std::sync::{Arc, RwLock};
 
@@ -128,8 +129,8 @@ impl OnchainPayment {
 	/// automatic background job to handle it.
 	///
 	/// updating the attempt count and last broadcast time for the transaction in the payment store.
-	pub fn rebroadcast_transaction(&self, txid: Txid) -> Result<(), Error> {
-		self.wallet.rebroadcast_transaction(txid)?;
+	pub fn rebroadcast_transaction(&self, payment_id: PaymentId) -> Result<(), Error> {
+		self.wallet.rebroadcast_transaction(payment_id)?;
 		Ok(())
 	}
 
@@ -139,12 +140,11 @@ impl OnchainPayment {
 	/// specified increment to improve its chances of confirmation. The original transaction must
 	/// be signaling RBF replaceability for this to succeed.
 	///
-	/// `fee_bump_increment` specifies the additional fee amount in satoshis to add to the
-	/// transaction. The new transaction will have the same outputs as the original but with a
+	/// The new transaction will have the same outputs as the original but with a
 	/// higher fee, resulting in faster confirmation potential.
 	///
 	/// Returns the Txid of the new replacement transaction if successful.
-	pub fn bump_fee_rbf(&self, txid: Txid, fee_bump_increment: u64) -> Result<Txid, Error> {
-		self.wallet.bump_fee_rbf(txid, fee_bump_increment)
+	pub fn bump_fee_rbf(&self, payment_id: PaymentId) -> Result<Txid, Error> {
+		self.wallet.bump_fee_rbf(payment_id)
 	}
 }

src/payment/store.rs

@@ -376,7 +376,7 @@ pub enum PaymentKind {
 		/// Last broadcast attempt timestamp (UNIX seconds)
 		last_broadcast_time: Option<u64>,
 		/// Number of broadcast attempts
-		broadcast_attempts: u32,
+		broadcast_attempts: Option<u32>,
 	},
 	/// A [BOLT 11] payment.
 	///
@@ -477,7 +477,7 @@ impl_writeable_tlv_based_enum!(PaymentKind,
 		(2, status, required),
 		(4, raw_tx, option),
 		(10, last_broadcast_time, option),
-		(12, broadcast_attempts, required),
+		(12, broadcast_attempts, option),
 	},
 	(2, Bolt11) => {
 		(0, hash, required),
@@ -570,7 +570,7 @@ pub(crate) struct PaymentDetailsUpdate {
 	pub status: Option<PaymentStatus>,
 	pub confirmation_status: Option<ConfirmationStatus>,
 	pub last_broadcast_time: Option<Option<u64>>,
-	pub broadcast_attempts: Option<u32>,
+	pub broadcast_attempts: Option<Option<u32>>,
 }
 
 impl PaymentDetailsUpdate {
@@ -607,7 +607,7 @@ impl From<&PaymentDetails> for PaymentDetailsUpdate {
 			PaymentKind::Onchain { status, last_broadcast_time, broadcast_attempts, .. } => {
 				(Some(status), last_broadcast_time, broadcast_attempts)
 			},
-			_ => (None, None, 0),
+			_ => (None, None, None),
 		};
 
 		let counterparty_skimmed_fee_msat = match value.kind {