Add LoggerScope for a thread-local Logger instance

lightning-background-processor/src/lib.rs

@@ -51,6 +51,7 @@ use lightning::routing::utxo::UtxoLookup;
 use lightning::sign::{
 	ChangeDestinationSource, ChangeDestinationSourceSync, EntropySource, OutputSpender,
 };
+use lightning::util::async_poll::{MaybeSend, MaybeSync};
 use lightning::util::logger::Logger;
 use lightning::util::persist::{
 	KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_PERSISTENCE_KEY,
@@ -184,8 +185,8 @@ pub enum GossipSync<
 	U: Deref,
 	L: Deref,
 > where
+	L::Target: Logger + MaybeSend + MaybeSync,
 	U::Target: UtxoLookup,
-	L::Target: Logger,
 {
 	/// Gossip sync via the lightning peer-to-peer network as defined by BOLT 7.
 	P2P(P),
@@ -203,8 +204,8 @@ impl<
 		L: Deref,
 	> GossipSync<P, R, G, U, L>
 where
+	L::Target: Logger + MaybeSend + MaybeSync,
 	U::Target: UtxoLookup,
-	L::Target: Logger,
 {
 	fn network_graph(&self) -> Option<&G> {
 		match self {
@@ -237,8 +238,8 @@ impl<
 		L: Deref,
 	> GossipSync<P, &RapidGossipSync<G, L>, G, U, L>
 where
+	L::Target: Logger + MaybeSend + MaybeSync,
 	U::Target: UtxoLookup,
-	L::Target: Logger,
 {
 	/// Initializes a new [`GossipSync::P2P`] variant.
 	pub fn p2p(gossip_sync: P) -> Self {
@@ -260,7 +261,7 @@ impl<
 		&'a (dyn UtxoLookup + Send + Sync),
 		L,
 	> where
-	L::Target: Logger,
+	L::Target: Logger + MaybeSend + MaybeSync,
 {
 	/// Initializes a new [`GossipSync::Rapid`] variant.
 	pub fn rapid(gossip_sync: R) -> Self {
@@ -277,7 +278,7 @@ impl<'a, L: Deref>
 		&'a (dyn UtxoLookup + Send + Sync),
 		L,
 	> where
-	L::Target: Logger,
+	L::Target: Logger + MaybeSend + MaybeSync,
 {
 	/// Initializes a new [`GossipSync::None`] variant.
 	pub fn none() -> Self {
@@ -287,7 +288,7 @@ impl<'a, L: Deref>
 
 fn handle_network_graph_update<L: Deref>(network_graph: &NetworkGraph<L>, event: &Event)
 where
-	L::Target: Logger,
+	L::Target: Logger + MaybeSend + MaybeSync,
 {
 	if let Event::PaymentPathFailed {
 		failure: PathFailure::OnPath { network_update: Some(ref upd) },
@@ -911,11 +912,11 @@ pub async fn process_events_async<
 	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
 ) -> Result<(), lightning::io::Error>
 where
+	L::Target: Logger + MaybeSend + MaybeSync,
 	UL::Target: UtxoLookup,
 	CF::Target: chain::Filter,
 	T::Target: BroadcasterInterface,
 	F::Target: FeeEstimator,
-	L::Target: Logger,
 	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
 	ES::Target: EntropySource,
 	CM::Target: AChannelManager,
@@ -1382,11 +1383,11 @@ pub async fn process_events_async_with_kv_store_sync<
 	sleeper: Sleeper, mobile_interruptable_platform: bool, fetch_time: FetchTime,
 ) -> Result<(), lightning::io::Error>
 where
+	L::Target: Logger + MaybeSend + MaybeSync,
 	UL::Target: UtxoLookup,
 	CF::Target: chain::Filter,
 	T::Target: BroadcasterInterface,
 	F::Target: FeeEstimator,
-	L::Target: Logger,
 	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
 	ES::Target: EntropySource,
 	CM::Target: AChannelManager,
@@ -1500,7 +1501,7 @@ impl BackgroundProcessor {
 		CF::Target: 'static + chain::Filter,
 		T::Target: 'static + BroadcasterInterface,
 		F::Target: 'static + FeeEstimator,
-		L::Target: 'static + Logger,
+		L::Target: Logger + MaybeSend + MaybeSync,
 		P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
 		ES::Target: 'static + EntropySource,
 		CM::Target: AChannelManager,

lightning-block-sync/src/gossip.rs

@@ -12,6 +12,7 @@ use bitcoin::transaction::{OutPoint, TxOut};
 use lightning::ln::peer_handler::APeerManager;
 use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
 use lightning::routing::utxo::{UtxoFuture, UtxoLookup, UtxoLookupError, UtxoResult};
+use lightning::util::async_poll::{MaybeSend, MaybeSync};
 use lightning::util::logger::Logger;
 use lightning::util::native_async::FutureSpawner;
 
@@ -127,8 +128,8 @@ pub struct GossipVerifier<
 	Blocks: Deref + Send + Sync + 'static + Clone,
 	L: Deref + Send + Sync + 'static,
 > where
+	L::Target: Logger + MaybeSend + MaybeSync,
 	Blocks::Target: UtxoSource,
-	L::Target: Logger,
 {
 	source: Blocks,
 	peer_manager_wake: Arc<dyn Fn() + Send + Sync>,
@@ -142,8 +143,8 @@ const BLOCK_CACHE_SIZE: usize = 5;
 impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone, L: Deref + Send + Sync>
 	GossipVerifier<S, Blocks, L>
 where
+	L::Target: Logger + MaybeSend + MaybeSync,
 	Blocks::Target: UtxoSource,
-	L::Target: Logger,
 {
 	/// Constructs a new [`GossipVerifier`].
 	///
@@ -251,8 +252,8 @@ where
 impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone, L: Deref + Send + Sync> Deref
 	for GossipVerifier<S, Blocks, L>
 where
+	L::Target: Logger + MaybeSend + MaybeSync,
 	Blocks::Target: UtxoSource,
-	L::Target: Logger,
 {
 	type Target = Self;
 	fn deref(&self) -> &Self {
@@ -263,8 +264,8 @@ where
 impl<S: FutureSpawner, Blocks: Deref + Send + Sync + Clone, L: Deref + Send + Sync> UtxoLookup
 	for GossipVerifier<S, Blocks, L>
 where
+	L::Target: Logger + MaybeSend + MaybeSync,
 	Blocks::Target: UtxoSource,
-	L::Target: Logger,
 {
 	fn get_utxo(&self, _chain_hash: &ChainHash, short_channel_id: u64) -> UtxoResult {
 		let res = UtxoFuture::new();

lightning-rapid-gossip-sync/src/lib.rs

@@ -87,6 +87,7 @@ use core::sync::atomic::{AtomicBool, Ordering};
 use lightning::io;
 use lightning::ln::msgs::{DecodeError, LightningError};
 use lightning::routing::gossip::NetworkGraph;
+use lightning::util::async_poll::{MaybeSend, MaybeSync};
 use lightning::util::logger::Logger;
 
 /// Core functionality of this crate
@@ -134,7 +135,7 @@ impl From<LightningError> for GraphSyncError {
 /// [crate-level documentation]: crate
 pub struct RapidGossipSync<NG: Deref<Target = NetworkGraph<L>>, L: Deref>
 where
-	L::Target: Logger,
+	L::Target: Logger + MaybeSend + MaybeSync,
 {
 	network_graph: NG,
 	logger: L,
@@ -143,7 +144,7 @@ where
 
 impl<NG: Deref<Target = NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L>
 where
-	L::Target: Logger,
+	L::Target: Logger + MaybeSend + MaybeSync,
 {
 	/// Instantiate a new [`RapidGossipSync`] instance.
 	pub fn new(network_graph: NG, logger: L) -> Self {

lightning-rapid-gossip-sync/src/processing.rs

@@ -10,6 +10,7 @@ use lightning::ln::msgs::{
 	UnsignedNodeAnnouncement,
 };
 use lightning::routing::gossip::{NetworkGraph, NodeAlias, NodeId};
+use lightning::util::async_poll::{MaybeSend, MaybeSync};
 use lightning::util::logger::Logger;
 use lightning::util::ser::{BigSize, FixedLengthReader, Readable};
 use lightning::{log_debug, log_given_level, log_gossip, log_trace, log_warn};
@@ -39,7 +40,7 @@ const STALE_RGS_UPDATE_AGE_LIMIT_SECS: u64 = 60 * 60 * 24 * 14;
 
 impl<NG: Deref<Target = NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L>
 where
-	L::Target: Logger,
+	L::Target: Logger + MaybeSend + MaybeSync,
 {
 	#[cfg(feature = "std")]
 	pub(crate) fn update_network_graph_from_byte_stream<R: io::Read>(

lightning/src/chain/chainmonitor.rs

@@ -53,7 +53,7 @@ use crate::sync::{Mutex, MutexGuard, RwLock, RwLockReadGuard};
 use crate::types::features::{InitFeatures, NodeFeatures};
 use crate::util::async_poll::{MaybeSend, MaybeSync};
 use crate::util::errors::APIError;
-use crate::util::logger::{Logger, WithContext};
+use crate::util::logger::{Logger, LoggerScope, WithContext};
 use crate::util::native_async::FutureSpawner;
 use crate::util::persist::{KVStore, MonitorName, MonitorUpdatingPersisterAsync};
 #[cfg(peer_storage)]
@@ -1426,6 +1426,8 @@ where
 			Some(monitor_state) => {
 				let monitor = &monitor_state.monitor;
 				let logger = WithChannelMonitor::from(&self.logger, &monitor, None);
+				let _scope = LoggerScope::new(&logger);
+
 				log_trace!(
 					logger,
 					"Updating ChannelMonitor to id {} for channel {}",

lightning/src/chain/channelmonitor.rs

@@ -3815,6 +3815,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 					}
 				}));
 			}
+
+			log_info_tls!(
+				"Recording counterparty fulfillment of HTLC id {:?} with preimage {} in channel monitor",
+				*claimed_htlc_id,
+				*claimed_preimage
+			);
 			self.counterparty_fulfilled_htlcs.insert(*claimed_htlc_id, *claimed_preimage);
 		}
 

lightning/src/ln/channelmanager.rs

@@ -1953,7 +1953,7 @@ where
 /// # fn read_channel_monitors() -> Vec<ChannelMonitor<lightning::sign::InMemorySigner>> { vec![] }
 /// # fn example<
 /// #     'a,
-/// #     L: lightning::util::logger::Logger,
+/// #     L: lightning::util::logger::Logger + Send + Sync,
 /// #     ES: lightning::sign::EntropySource,
 /// #     S: for <'b> lightning::routing::scoring::LockableScore<'b, ScoreLookUp = SL>,
 /// #     SL: lightning::routing::scoring::ScoreLookUp<ScoreParams = SP>,

lightning/src/onion_message/messenger.rs

@@ -38,7 +38,7 @@ use crate::ln::onion_utils;
 use crate::routing::gossip::{NetworkGraph, NodeId, ReadOnlyNetworkGraph};
 use crate::sign::{EntropySource, NodeSigner, ReceiveAuthKey, Recipient};
 use crate::types::features::{InitFeatures, NodeFeatures};
-use crate::util::async_poll::{MultiResultFuturePoller, ResultFuture};
+use crate::util::async_poll::{MaybeSend, MaybeSync, MultiResultFuturePoller, ResultFuture};
 use crate::util::logger::{Logger, WithContext};
 use crate::util::ser::Writeable;
 use crate::util::wakers::{Future, Notifier};
@@ -548,7 +548,7 @@ pub trait MessageRouter {
 /// message, and thus an `Err` is returned.
 pub struct DefaultMessageRouter<G: Deref<Target = NetworkGraph<L>>, L: Deref, ES: Deref>
 where
-	L::Target: Logger,
+	L::Target: Logger + MaybeSend + MaybeSync,
 	ES::Target: EntropySource,
 {
 	network_graph: G,
@@ -565,7 +565,7 @@ pub(crate) const PADDED_PATH_LENGTH: usize = 4;
 
 impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, ES: Deref> DefaultMessageRouter<G, L, ES>
 where
-	L::Target: Logger,
+	L::Target: Logger + MaybeSend + MaybeSync,
 	ES::Target: EntropySource,
 {
 	/// Creates a [`DefaultMessageRouter`] using the given [`NetworkGraph`].
@@ -719,7 +719,7 @@ where
 impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, ES: Deref> MessageRouter
 	for DefaultMessageRouter<G, L, ES>
 where
-	L::Target: Logger,
+	L::Target: Logger + MaybeSend + MaybeSync,
 	ES::Target: EntropySource,
 {
 	fn find_path(
@@ -758,7 +758,7 @@ where
 /// message, and thus an `Err` is returned.
 pub struct NodeIdMessageRouter<G: Deref<Target = NetworkGraph<L>>, L: Deref, ES: Deref>
 where
-	L::Target: Logger,
+	L::Target: Logger + MaybeSend + MaybeSync,
 	ES::Target: EntropySource,
 {
 	network_graph: G,
@@ -767,7 +767,7 @@ where
 
 impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, ES: Deref> NodeIdMessageRouter<G, L, ES>
 where
-	L::Target: Logger,
+	L::Target: Logger + MaybeSend + MaybeSync,
 	ES::Target: EntropySource,
 {
 	/// Creates a [`NodeIdMessageRouter`] using the given [`NetworkGraph`].
@@ -779,7 +779,7 @@ where
 impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, ES: Deref> MessageRouter
 	for NodeIdMessageRouter<G, L, ES>
 where
-	L::Target: Logger,
+	L::Target: Logger + MaybeSend + MaybeSync,
 	ES::Target: EntropySource,
 {
 	fn find_path(