Refactor TransactionType with channel context

We add the `ChannelId` as context to the just-added `TransactionType`
enum.

Co-Authored-By: HAL 9000

Signed-off-by: Elias Rohrer <dev@tnull.de>

Author: tnull

fuzz/src/chanmon_consistency.rs

@@ -37,7 +37,7 @@ use lightning::blinded_path::message::{BlindedMessagePath, MessageContext, Messa
 use lightning::blinded_path::payment::{BlindedPaymentPath, ReceiveTlvs};
 use lightning::chain;
 use lightning::chain::chaininterface::{
-	BroadcastType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
+	TransactionType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
 };
 use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
 use lightning::chain::transaction::OutPoint;
@@ -161,7 +161,7 @@ pub struct TestBroadcaster {
 	txn_broadcasted: RefCell<Vec<Transaction>>,
 }
 impl BroadcasterInterface for TestBroadcaster {
-	fn broadcast_transactions(&self, txs: &[(&Transaction, BroadcastType)]) {
+	fn broadcast_transactions(&self, txs: &[(&Transaction, TransactionType)]) {
 		for (tx, _broadcast_type) in txs {
 			self.txn_broadcasted.borrow_mut().push((*tx).clone());
 		}

fuzz/src/full_stack.rs

@@ -34,7 +34,7 @@ use lightning::blinded_path::message::{BlindedMessagePath, MessageContext, Messa
 use lightning::blinded_path::payment::{BlindedPaymentPath, ReceiveTlvs};
 use lightning::chain;
 use lightning::chain::chaininterface::{
-	BroadcastType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
+	TransactionType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
 };
 use lightning::chain::chainmonitor;
 use lightning::chain::transaction::OutPoint;
@@ -186,7 +186,7 @@ struct TestBroadcaster {
 	txn_broadcasted: Mutex<Vec<Transaction>>,
 }
 impl BroadcasterInterface for TestBroadcaster {
-	fn broadcast_transactions(&self, txs: &[(&Transaction, BroadcastType)]) {
+	fn broadcast_transactions(&self, txs: &[(&Transaction, TransactionType)]) {
 		let owned_txs: Vec<Transaction> = txs.iter().map(|(tx, _)| (*tx).clone()).collect();
 		self.txn_broadcasted.lock().unwrap().extend(owned_txs);
 	}

lightning-liquidity/.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+rustflags = ["--cfg=lsps1_service"]

lightning-liquidity/src/lsps2/service.rs

@@ -40,7 +40,7 @@ use crate::prelude::{new_hash_map, HashMap};
 use crate::sync::{Arc, Mutex, MutexGuard, RwLock};
 use crate::utils::async_poll::dummy_waker;
 
-use lightning::chain::chaininterface::{BroadcastType, BroadcasterInterface};
+use lightning::chain::chaininterface::{BroadcasterInterface, TransactionType};
 use lightning::events::HTLCHandlingFailureType;
 use lightning::ln::channelmanager::{AChannelManager, FailureCode, InterceptId};
 use lightning::ln::msgs::{ErrorAction, LightningError};
@@ -2038,7 +2038,7 @@ where
 			if let Some(funding_tx) = jit_channel.get_funding_tx() {
 				self.tx_broadcaster.broadcast_transactions(&[(
 					funding_tx,
-					BroadcastType::Funding { channel_ids: vec![ch_id] },
+					TransactionType::Funding { channel_ids: vec![ch_id] },
 				)]);
 			}
 		}

lightning/src/chain/chaininterface.rs

@@ -25,7 +25,7 @@ use bitcoin::transaction::Transaction;
 /// This is used to provide context about the type of transaction being broadcast, which may be
 /// useful for logging, filtering, or prioritization purposes.
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub enum BroadcastType {
+pub enum TransactionType {
 	/// A funding transaction establishing a new channel.
 	Funding {
 		/// The IDs of the channels being funded.
@@ -94,9 +94,9 @@ pub trait BroadcasterInterface {
 	/// Bitcoin transaction packages are defined in BIP 331 and here:
 	/// <https://github.com/bitcoin/bitcoin/blob/master/doc/policy/packages.md>
 	///
-	/// Each transaction is paired with a [`BroadcastType`] indicating the class of transaction
+	/// Each transaction is paired with a [`TransactionType`] indicating the class of transaction
 	/// being broadcast, which may be useful for logging, filtering, or prioritization.
-	fn broadcast_transactions(&self, txs: &[(&Transaction, BroadcastType)]);
+	fn broadcast_transactions(&self, txs: &[(&Transaction, TransactionType)]);
 }
 
 /// An enum that represents the priority at which we want a transaction to confirm used for feerate

lightning/src/chain/onchaintx.rs

@@ -24,7 +24,7 @@ use bitcoin::transaction::Transaction;
 
 use crate::chain::chaininterface::ConfirmationTarget;
 use crate::chain::chaininterface::{
-	BroadcastType, BroadcasterInterface, FeeEstimator, LowerBoundedFeeEstimator,
+	BroadcasterInterface, FeeEstimator, LowerBoundedFeeEstimator, TransactionType,
 };
 use crate::chain::channelmonitor::ANTI_REORG_DELAY;
 use crate::chain::package::{PackageSolvingData, PackageTemplate};
@@ -537,7 +537,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 							if tx.is_fully_signed() {
 								let log_start = if feerate_was_bumped { "Broadcasting RBF-bumped" } else { "Rebroadcasting" };
 								log_info!(logger, "{} onchain {}", log_start, log_tx!(tx.0));
-								broadcaster.broadcast_transactions(&[(&tx.0, BroadcastType::Claim { channel_id: self.channel_id })]);
+								broadcaster.broadcast_transactions(&[(&tx.0, TransactionType::Claim { channel_id: self.channel_id })]);
 							} else {
 								log_info!(logger, "Waiting for signature of unsigned onchain transaction {}", tx.0.compute_txid());
 							}
@@ -884,7 +884,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 					OnchainClaim::Tx(tx) => {
 						if tx.is_fully_signed() {
 							log_info!(logger, "Broadcasting onchain {}", log_tx!(tx.0));
-							broadcaster.broadcast_transactions(&[(&tx.0, BroadcastType::Claim { channel_id: self.channel_id })]);
+							broadcaster.broadcast_transactions(&[(&tx.0, TransactionType::Claim { channel_id: self.channel_id })]);
 						} else {
 							log_info!(logger, "Waiting for signature of unsigned onchain transaction {}", tx.0.compute_txid());
 						}
@@ -1105,7 +1105,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 					OnchainClaim::Tx(bump_tx) => {
 						if bump_tx.is_fully_signed() {
 							log_info!(logger, "Broadcasting RBF-bumped onchain {}", log_tx!(bump_tx.0));
-							broadcaster.broadcast_transactions(&[(&bump_tx.0, BroadcastType::Claim { channel_id: self.channel_id })]);
+							broadcaster.broadcast_transactions(&[(&bump_tx.0, TransactionType::Claim { channel_id: self.channel_id })]);
 						} else {
 							log_info!(logger, "Waiting for signature of RBF-bumped unsigned onchain transaction {}",
 								bump_tx.0.compute_txid());
@@ -1208,7 +1208,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 					OnchainClaim::Tx(bump_tx) => {
 						if bump_tx.is_fully_signed() {
 							log_info!(logger, "Broadcasting onchain {}", log_tx!(bump_tx.0));
-							broadcaster.broadcast_transactions(&[(&bump_tx.0, BroadcastType::Claim { channel_id: self.channel_id })]);
+							broadcaster.broadcast_transactions(&[(&bump_tx.0, TransactionType::Claim { channel_id: self.channel_id })]);
 						} else {
 							log_info!(logger, "Waiting for signature of unsigned onchain transaction {}", bump_tx.0.compute_txid());
 						}

lightning/src/events/bump_transaction/mod.rs

@@ -18,7 +18,7 @@ use core::future::Future;
 use core::ops::Deref;
 
 use crate::chain::chaininterface::{
-	compute_feerate_sat_per_1000_weight, fee_for_weight, BroadcastType, BroadcasterInterface,
+	compute_feerate_sat_per_1000_weight, fee_for_weight, BroadcasterInterface, TransactionType,
 };
 use crate::chain::ClaimId;
 use crate::io_extras::sink;
@@ -790,7 +790,7 @@ where
 				package_target_feerate_sat_per_1000_weight);
 			self.broadcaster.broadcast_transactions(&[(
 				&commitment_tx,
-				BroadcastType::Commitment { channel_id },
+				TransactionType::Commitment { channel_id },
 			)]);
 			return Ok(());
 		}
@@ -959,8 +959,8 @@ where
 				commitment_tx.compute_txid()
 			);
 			self.broadcaster.broadcast_transactions(&[
-				(&commitment_tx, BroadcastType::Commitment { channel_id }),
-				(&anchor_tx, BroadcastType::Anchor { channel_id }),
+				(&commitment_tx, TransactionType::Commitment { channel_id }),
+				(&anchor_tx, TransactionType::Anchor { channel_id }),
 			]);
 			return Ok(());
 		}
@@ -1196,7 +1196,7 @@ where
 			log_info!(self.logger, "Broadcasting {}", log_tx!(htlc_tx));
 			self.broadcaster.broadcast_transactions(&[(
 				&htlc_tx,
-				BroadcastType::HtlcResolution { channel_id },
+				TransactionType::HtlcResolution { channel_id },
 			)]);
 		}
 

lightning/src/ln/channelmanager.rs

@@ -39,7 +39,8 @@ use crate::blinded_path::payment::{AsyncBolt12OfferContext, Bolt12OfferContext,
 use crate::blinded_path::NodeIdLookUp;
 use crate::chain;
 use crate::chain::chaininterface::{
-	BroadcastType, BroadcasterInterface, ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator,
+	BroadcasterInterface, ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator,
+	TransactionType,
 };
 use crate::chain::channelmonitor::{
 	Balance, ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateStep, MonitorEvent,
@@ -6550,7 +6551,7 @@ where
 		);
 		self.tx_broadcaster.broadcast_transactions(&[(
 			funding_tx,
-			BroadcastType::Funding { channel_ids: vec![channel.context().channel_id()] },
+			TransactionType::Funding { channel_ids: vec![channel.context().channel_id()] },
 		)]);
 		{
 			let mut pending_events = self.pending_events.lock().unwrap();
@@ -9488,7 +9489,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 					log_info!(self.logger, "Broadcasting batch funding tx {}", tx.compute_txid());
 					self.tx_broadcaster.broadcast_transactions(&[(
 						&tx,
-						BroadcastType::Funding { channel_ids: batch_channel_ids },
+						TransactionType::Funding { channel_ids: batch_channel_ids },
 					)]);
 				}
 			}
@@ -10157,7 +10158,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 				log_info!(logger, "Broadcasting funding transaction with txid {}", tx.compute_txid());
 				self.tx_broadcaster.broadcast_transactions(&[(
 					&tx,
-					BroadcastType::Funding { channel_ids: vec![channel.context.channel_id()] },
+					TransactionType::Funding { channel_ids: vec![channel.context.channel_id()] },
 				)]);
 			}
 		}
@@ -11621,7 +11622,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 			log_info!(logger, "Broadcasting {}", log_tx!(broadcast_tx));
 			self.tx_broadcaster.broadcast_transactions(&[(
 				&broadcast_tx,
-				BroadcastType::CooperativeClose { channel_id: msg.channel_id },
+				TransactionType::CooperativeClose { channel_id: msg.channel_id },
 			)]);
 			let _ = self.handle_error(err, *counterparty_node_id);
 		}
@@ -12951,7 +12952,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 						log_info!(logger, "Broadcasting closing tx {}", log_tx!(broadcast_tx));
 						self.tx_broadcaster.broadcast_transactions(&[(
 							&broadcast_tx,
-							BroadcastType::CooperativeClose { channel_id },
+							TransactionType::CooperativeClose { channel_id },
 						)]);
 					}
 				} else {
@@ -13082,7 +13083,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 										log_info!(logger, "Broadcasting {}", log_tx!(tx));
 										self.tx_broadcaster.broadcast_transactions(&[(
 											&tx,
-											BroadcastType::CooperativeClose { channel_id },
+											TransactionType::CooperativeClose { channel_id },
 										)]);
 										false
 									} else {

lightning/src/util/sweep.rs

@@ -9,7 +9,7 @@
 //! sweeping them.
 
 use crate::chain::chaininterface::{
-	BroadcastType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
+	BroadcasterInterface, ConfirmationTarget, FeeEstimator, TransactionType,
 };
 use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ARCHIVAL_DELAY_BLOCKS};
 use crate::chain::{self, BestBlock, Confirm, Filter, Listen, WatchedOutput};
@@ -597,7 +597,7 @@ where
 		// Persistence completely successfully. If we have a spending transaction, we broadcast it.
 		if let Some((spending_tx, channel_ids)) = spending_tx_and_chan_id {
 			self.broadcaster
-				.broadcast_transactions(&[(&spending_tx, BroadcastType::Sweep { channel_ids })]);
+				.broadcast_transactions(&[(&spending_tx, TransactionType::Sweep { channel_ids })]);
 		}
 
 		Ok(())

lightning/src/util/test_utils.rs

@@ -14,7 +14,7 @@ use crate::chain;
 use crate::chain::chaininterface;
 #[cfg(any(test, feature = "_externalize_tests"))]
 use crate::chain::chaininterface::FEERATE_FLOOR_SATS_PER_KW;
-use crate::chain::chaininterface::{BroadcastType, ConfirmationTarget};
+use crate::chain::chaininterface::{ConfirmationTarget, TransactionType};
 use crate::chain::chainmonitor::{ChainMonitor, Persist};
 use crate::chain::channelmonitor::{
 	ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateStep, MonitorEvent,
@@ -1154,7 +1154,7 @@ impl TestBroadcaster {
 }
 
 impl chaininterface::BroadcasterInterface for TestBroadcaster {
-	fn broadcast_transactions(&self, txs: &[(&Transaction, BroadcastType)]) {
+	fn broadcast_transactions(&self, txs: &[(&Transaction, TransactionType)]) {
 		// Assert that any batch of transactions of length greater than 1 is sorted
 		// topologically, and is a `child-with-parents` package as defined in
 		// <https://github.com/bitcoin/bitcoin/blob/master/doc/policy/packages.md>.