Require WithContext log wrappers on OutboundPayments calls and pass payment hashes#4342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valentinewallace merged 4 commits into from
Jan 29, 2026
Merged

Require WithContext log wrappers on OutboundPayments calls and pass payment hashes #4342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f253c0
Use a single `WithContext` wrapper rather than several log-wrappers
TheBlueMatt Jan 25, 2026
5e64c40
Require `WithContext` log wrappers on `OutboundPayments` calls
TheBlueMatt Jan 25, 2026
253ceed
Add `PaymentId` to logging `Record`s
TheBlueMatt Jan 25, 2026
878e632
Don't override log context set by inner `WithContext`s
TheBlueMatt Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 29 additions & 48 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ use crate::sign::{
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::byte_utils;
use crate::util::logger::{Logger, Record};
use crate::util::logger::{Logger, WithContext};
use crate::util::persist::MonitorName;
use crate::util::ser::{
MaybeReadable, Readable, ReadableArgs, RequiredWrapper, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -1825,45 +1825,27 @@ macro_rules! _process_events_body {
}
pub(super) use _process_events_body as process_events_body;

pub(crate) struct WithChannelMonitor<'a, L: Deref>
where
L::Target: Logger,
{
logger: &'a L,
peer_id: Option<PublicKey>,
channel_id: Option<ChannelId>,
payment_hash: Option<PaymentHash>,
}
pub(crate) struct WithChannelMonitor;

impl<'a, L: Deref> Logger for WithChannelMonitor<'a, L>
where
L::Target: Logger,
{
fn log(&self, mut record: Record) {
record.peer_id = self.peer_id;
record.channel_id = self.channel_id;
record.payment_hash = self.payment_hash;
self.logger.log(record)
}
}

impl<'a, L: Deref> WithChannelMonitor<'a, L>
where
L::Target: Logger,
{
pub(crate) fn from<S: EcdsaChannelSigner>(
impl WithChannelMonitor {
pub(crate) fn from<'a, L: Deref, S: EcdsaChannelSigner>(
logger: &'a L, monitor: &ChannelMonitor<S>, payment_hash: Option<PaymentHash>,
) -> Self {
) -> WithContext<'a, L>
where
L::Target: Logger,
{
Self::from_impl(logger, &*monitor.inner.lock().unwrap(), payment_hash)
}

#[rustfmt::skip]
pub(crate) fn from_impl<S: EcdsaChannelSigner>(logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>) -> Self {
pub(crate) fn from_impl<'a, L: Deref, S: EcdsaChannelSigner>(
logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>,
) -> WithContext<'a, L>
where
L::Target: Logger,
{
let peer_id = Some(monitor_impl.counterparty_node_id);
let channel_id = Some(monitor_impl.channel_id());
WithChannelMonitor {
logger, peer_id, channel_id, payment_hash,
}
WithContext::from(logger, peer_id, channel_id, payment_hash)
}
}

Expand DownExpand Up@@ -3829,7 +3811,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
fn provide_payment_preimage<B: Deref, F: Deref, L: Deref>(
&mut self, payment_hash: &PaymentHash, payment_preimage: &PaymentPreimage,
payment_info: &Option<PaymentClaimDetails>, broadcaster: &B,
fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>)
fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>)
where B::Target: BroadcasterInterface,
F::Target: FeeEstimator,
L::Target: Logger,
Expand DownExpand Up@@ -4006,7 +3988,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
///
/// [`ChannelMonitor::broadcast_latest_holder_commitment_txn`]: crate::chain::channelmonitor::ChannelMonitor::broadcast_latest_holder_commitment_txn
pub(crate) fn queue_latest_holder_commitment_txn_for_broadcast<B: Deref, F: Deref, L: Deref>(
&mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>,
&mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>,
require_funding_seen: bool,
)
where
Expand DownExpand Up@@ -4034,8 +4016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
}

fn renegotiated_funding<L: Deref>(
&mut self, logger: &WithChannelMonitor<L>,
channel_parameters: &ChannelTransactionParameters,
&mut self, logger: &WithContext<L>, channel_parameters: &ChannelTransactionParameters,
alternative_holder_commitment_tx: &HolderCommitmentTransaction,
alternative_counterparty_commitment_tx: &CommitmentTransaction,
) -> Result<(), ()>
Expand DownExpand Up@@ -4210,7 +4191,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

#[rustfmt::skip]
fn update_monitor<B: Deref, F: Deref, L: Deref>(
&mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithChannelMonitor<L>
&mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithContext<L>
) -> Result<(), ()>
where B::Target: BroadcasterInterface,
F::Target: FeeEstimator,
Expand DownExpand Up@@ -5254,7 +5235,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
/// Note that this includes possibly-locktimed-in-the-future transactions!
#[rustfmt::skip]
fn unsafe_get_latest_holder_commitment_txn<L: Deref>(
&mut self, logger: &WithChannelMonitor<L>
&mut self, logger: &WithContext<L>
) -> Vec<Transaction> where L::Target: Logger {
log_debug!(logger, "Getting signed copy of latest holder commitment transaction!");
let commitment_tx = {
Expand DownExpand Up@@ -5307,7 +5288,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
#[rustfmt::skip]
fn block_connected<B: Deref, F: Deref, L: Deref>(
&mut self, header: &Header, txdata: &TransactionData, height: u32, broadcaster: B,
fee_estimator: F, logger: &WithChannelMonitor<L>,
fee_estimator: F, logger: &WithContext<L>,
) -> Vec<TransactionOutputs>
where B::Target: BroadcasterInterface,
F::Target: FeeEstimator,
Expand All@@ -5327,7 +5308,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
height: u32,
broadcaster: B,
fee_estimator: &LowerBoundedFeeEstimator<F>,
logger: &WithChannelMonitor<L>,
logger: &WithContext<L>,
) -> Vec<TransactionOutputs>
where
B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5360,7 +5341,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
height: u32,
broadcaster: B,
fee_estimator: &LowerBoundedFeeEstimator<F>,
logger: &WithChannelMonitor<L>,
logger: &WithContext<L>,
) -> Vec<TransactionOutputs>
where
B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5647,7 +5628,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
mut claimable_outpoints: Vec<PackageTemplate>,
broadcaster: &B,
fee_estimator: &LowerBoundedFeeEstimator<F>,
logger: &WithChannelMonitor<L>,
logger: &WithContext<L>,
) -> Vec<TransactionOutputs>
where
B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5867,7 +5848,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

#[rustfmt::skip]
fn blocks_disconnected<B: Deref, F: Deref, L: Deref>(
&mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithChannelMonitor<L>
&mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithContext<L>
) where B::Target: BroadcasterInterface,
F::Target: FeeEstimator,
L::Target: Logger,
Expand DownExpand Up@@ -5920,7 +5901,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
txid: &Txid,
broadcaster: B,
fee_estimator: &LowerBoundedFeeEstimator<F>,
logger: &WithChannelMonitor<L>,
logger: &WithContext<L>,
) where
B::Target: BroadcasterInterface,
F::Target: FeeEstimator,
Expand DownExpand Up@@ -6031,7 +6012,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

#[rustfmt::skip]
fn should_broadcast_holder_commitment_txn<L: Deref>(
&self, logger: &WithChannelMonitor<L>
&self, logger: &WithContext<L>
) -> Option<PaymentHash> where L::Target: Logger {
// There's no need to broadcast our commitment transaction if we've seen one confirmed (even
// with 1 confirmation) as it'll be rejected as duplicate/conflicting.
Expand DownExpand Up@@ -6098,7 +6079,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
/// or counterparty commitment tx, if so send back the source, preimage if found and payment_hash of resolved HTLC
#[rustfmt::skip]
fn is_resolving_htlc_output<L: Deref>(
&mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
&mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
) where L::Target: Logger {
let funding_spent = get_confirmed_funding_scope!(self);

Expand DownExpand Up@@ -6355,7 +6336,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
/// own.
#[rustfmt::skip]
fn check_tx_and_push_spendable_outputs<L: Deref>(
&mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
&mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
) where L::Target: Logger {
let funding_spent = get_confirmed_funding_scope!(self);
for spendable_output in self.get_spendable_outputs(funding_spent, tx) {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Require WithContext log wrappers on OutboundPayments calls and pass payment hashes#4342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 4 commits into

from

Jan 29, 2026
 Merged


Require WithContext log wrappers on OutboundPayments calls and pass payment hashes
#4342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0f253c0

Use a single `WithContext` wrapper rather than several log-wrappers


TheBlueMatt Jan 25, 2026
5e64c40

Require `WithContext` log wrappers on `OutboundPayments` calls


TheBlueMatt Jan 25, 2026
253ceed

Add `PaymentId` to logging `Record`s


TheBlueMatt Jan 25, 2026
878e632

Don't override log context set by inner `WithContext`s


TheBlueMatt Jan 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


77 changes: 29 additions & 48 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ use crate::sign::{
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::byte_utils;
use crate::util::logger::{Logger, Record};
use crate::util::logger::{Logger, WithContext};
use crate::util::persist::MonitorName;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, RequiredWrapper, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -1825,45 +1825,27 @@ macro_rules! _process_events_body {
}
pub(super) use _process_events_body as process_events_body;

pub(crate) struct WithChannelMonitor<'a, L: Deref>
where
	L::Target: Logger,
{
	logger: &'a L,
	peer_id: Option<PublicKey>,
	channel_id: Option<ChannelId>,
	payment_hash: Option<PaymentHash>,
}
pub(crate) struct WithChannelMonitor;

impl<'a, L: Deref> Logger for WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	fn log(&self, mut record: Record) {
 record.peer_id = self.peer_id;
 record.channel_id = self.channel_id;
 record.payment_hash = self.payment_hash;
 self.logger.log(record)
	}
}

impl<'a, L: Deref> WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	pub(crate) fn from<S: EcdsaChannelSigner>(
impl WithChannelMonitor {
	pub(crate) fn from<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor: &ChannelMonitor<S>, payment_hash: Option<PaymentHash>,
	) -> Self {
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 Self::from_impl(logger, &*monitor.inner.lock().unwrap(), payment_hash)
	}

	#[rustfmt::skip]
	pub(crate) fn from_impl<S: EcdsaChannelSigner>(logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>) -> Self {
	pub(crate) fn from_impl<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>,
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 let peer_id = Some(monitor_impl.counterparty_node_id);
 let channel_id = Some(monitor_impl.channel_id());
 WithChannelMonitor {
 logger, peer_id, channel_id, payment_hash,
 }
 WithContext::from(logger, peer_id, channel_id, payment_hash)
	}
}

Expand DownExpand Up@@ -3829,7 +3811,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn provide_payment_preimage<B: Deref, F: Deref, L: Deref>(
 &mut self, payment_hash: &PaymentHash, payment_preimage: &PaymentPreimage,
 payment_info: &Option<PaymentClaimDetails>, broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>)
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>)
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -4006,7 +3988,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	///
	/// [`ChannelMonitor::broadcast_latest_holder_commitment_txn`]: crate::chain::channelmonitor::ChannelMonitor::broadcast_latest_holder_commitment_txn
	pub(crate) fn queue_latest_holder_commitment_txn_for_broadcast<B: Deref, F: Deref, L: Deref>(
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>,
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>,
 require_funding_seen: bool,
	)
	where
Expand DownExpand Up@@ -4034,8 +4016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	}

	fn renegotiated_funding<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>,
 channel_parameters: &ChannelTransactionParameters,
 &mut self, logger: &WithContext<L>, channel_parameters: &ChannelTransactionParameters,
 alternative_holder_commitment_tx: &HolderCommitmentTransaction,
 alternative_counterparty_commitment_tx: &CommitmentTransaction,
	) -> Result<(), ()>
Expand DownExpand Up@@ -4210,7 +4191,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn update_monitor<B: Deref, F: Deref, L: Deref>(
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithChannelMonitor<L>
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithContext<L>
	) -> Result<(), ()>
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -5254,7 +5235,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Note that this includes possibly-locktimed-in-the-future transactions!
	#[rustfmt::skip]
	fn unsafe_get_latest_holder_commitment_txn<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>
 &mut self, logger: &WithContext<L>
	) -> Vec<Transaction> where L::Target: Logger {
 log_debug!(logger, "Getting signed copy of latest holder commitment transaction!");
 let commitment_tx = {
Expand DownExpand Up@@ -5307,7 +5288,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	#[rustfmt::skip]
	fn block_connected<B: Deref, F: Deref, L: Deref>(
 &mut self, header: &Header, txdata: &TransactionData, height: u32, broadcaster: B,
 fee_estimator: F, logger: &WithChannelMonitor<L>,
 fee_estimator: F, logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand All@@ -5327,7 +5308,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5360,7 +5341,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5647,7 +5628,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 mut claimable_outpoints: Vec<PackageTemplate>,
 broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5867,7 +5848,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn blocks_disconnected<B: Deref, F: Deref, L: Deref>(
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithChannelMonitor<L>
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithContext<L>
	) where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -5920,7 +5901,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 txid: &Txid,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) where
 B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -6031,7 +6012,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn should_broadcast_holder_commitment_txn<L: Deref>(
 &self, logger: &WithChannelMonitor<L>
 &self, logger: &WithContext<L>
	) -> Option<PaymentHash> where L::Target: Logger {
 // There's no need to broadcast our commitment transaction if we've seen one confirmed (even
 // with 1 confirmation) as it'll be rejected as duplicate/conflicting.
Expand DownExpand Up@@ -6098,7 +6079,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// or counterparty commitment tx, if so send back the source, preimage if found and payment_hash of resolved HTLC
	#[rustfmt::skip]
	fn is_resolving_htlc_output<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);

Expand DownExpand Up@@ -6355,7 +6336,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// own.
	#[rustfmt::skip]
	fn check_tx_and_push_spendable_outputs<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);
 for spendable_output in self.get_spendable_outputs(funding_spent, tx) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Require WithContext log wrappers on OutboundPayments calls and pass payment hashes#4342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 4 commits into

from

Jan 29, 2026
 Merged


Require WithContext log wrappers on OutboundPayments calls and pass payment hashes
#4342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0f253c0

Use a single `WithContext` wrapper rather than several log-wrappers


TheBlueMatt Jan 25, 2026
5e64c40

Require `WithContext` log wrappers on `OutboundPayments` calls


TheBlueMatt Jan 25, 2026
253ceed

Add `PaymentId` to logging `Record`s


TheBlueMatt Jan 25, 2026
878e632

Don't override log context set by inner `WithContext`s


TheBlueMatt Jan 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


77 changes: 29 additions & 48 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ use crate::sign::{
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::byte_utils;
use crate::util::logger::{Logger, Record};
use crate::util::logger::{Logger, WithContext};
use crate::util::persist::MonitorName;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, RequiredWrapper, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -1825,45 +1825,27 @@ macro_rules! _process_events_body {
}
pub(super) use _process_events_body as process_events_body;

pub(crate) struct WithChannelMonitor<'a, L: Deref>
where
	L::Target: Logger,
{
	logger: &'a L,
	peer_id: Option<PublicKey>,
	channel_id: Option<ChannelId>,
	payment_hash: Option<PaymentHash>,
}
pub(crate) struct WithChannelMonitor;

impl<'a, L: Deref> Logger for WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	fn log(&self, mut record: Record) {
 record.peer_id = self.peer_id;
 record.channel_id = self.channel_id;
 record.payment_hash = self.payment_hash;
 self.logger.log(record)
	}
}

impl<'a, L: Deref> WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	pub(crate) fn from<S: EcdsaChannelSigner>(
impl WithChannelMonitor {
	pub(crate) fn from<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor: &ChannelMonitor<S>, payment_hash: Option<PaymentHash>,
	) -> Self {
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 Self::from_impl(logger, &*monitor.inner.lock().unwrap(), payment_hash)
	}

	#[rustfmt::skip]
	pub(crate) fn from_impl<S: EcdsaChannelSigner>(logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>) -> Self {
	pub(crate) fn from_impl<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>,
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 let peer_id = Some(monitor_impl.counterparty_node_id);
 let channel_id = Some(monitor_impl.channel_id());
 WithChannelMonitor {
 logger, peer_id, channel_id, payment_hash,
 }
 WithContext::from(logger, peer_id, channel_id, payment_hash)
	}
}

Expand DownExpand Up@@ -3829,7 +3811,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn provide_payment_preimage<B: Deref, F: Deref, L: Deref>(
 &mut self, payment_hash: &PaymentHash, payment_preimage: &PaymentPreimage,
 payment_info: &Option<PaymentClaimDetails>, broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>)
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>)
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -4006,7 +3988,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	///
	/// [`ChannelMonitor::broadcast_latest_holder_commitment_txn`]: crate::chain::channelmonitor::ChannelMonitor::broadcast_latest_holder_commitment_txn
	pub(crate) fn queue_latest_holder_commitment_txn_for_broadcast<B: Deref, F: Deref, L: Deref>(
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>,
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>,
 require_funding_seen: bool,
	)
	where
Expand DownExpand Up@@ -4034,8 +4016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	}

	fn renegotiated_funding<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>,
 channel_parameters: &ChannelTransactionParameters,
 &mut self, logger: &WithContext<L>, channel_parameters: &ChannelTransactionParameters,
 alternative_holder_commitment_tx: &HolderCommitmentTransaction,
 alternative_counterparty_commitment_tx: &CommitmentTransaction,
	) -> Result<(), ()>
Expand DownExpand Up@@ -4210,7 +4191,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn update_monitor<B: Deref, F: Deref, L: Deref>(
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithChannelMonitor<L>
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithContext<L>
	) -> Result<(), ()>
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -5254,7 +5235,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Note that this includes possibly-locktimed-in-the-future transactions!
	#[rustfmt::skip]
	fn unsafe_get_latest_holder_commitment_txn<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>
 &mut self, logger: &WithContext<L>
	) -> Vec<Transaction> where L::Target: Logger {
 log_debug!(logger, "Getting signed copy of latest holder commitment transaction!");
 let commitment_tx = {
Expand DownExpand Up@@ -5307,7 +5288,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	#[rustfmt::skip]
	fn block_connected<B: Deref, F: Deref, L: Deref>(
 &mut self, header: &Header, txdata: &TransactionData, height: u32, broadcaster: B,
 fee_estimator: F, logger: &WithChannelMonitor<L>,
 fee_estimator: F, logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand All@@ -5327,7 +5308,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5360,7 +5341,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5647,7 +5628,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 mut claimable_outpoints: Vec<PackageTemplate>,
 broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5867,7 +5848,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn blocks_disconnected<B: Deref, F: Deref, L: Deref>(
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithChannelMonitor<L>
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithContext<L>
	) where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -5920,7 +5901,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 txid: &Txid,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) where
 B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -6031,7 +6012,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn should_broadcast_holder_commitment_txn<L: Deref>(
 &self, logger: &WithChannelMonitor<L>
 &self, logger: &WithContext<L>
	) -> Option<PaymentHash> where L::Target: Logger {
 // There's no need to broadcast our commitment transaction if we've seen one confirmed (even
 // with 1 confirmation) as it'll be rejected as duplicate/conflicting.
Expand DownExpand Up@@ -6098,7 +6079,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// or counterparty commitment tx, if so send back the source, preimage if found and payment_hash of resolved HTLC
	#[rustfmt::skip]
	fn is_resolving_htlc_output<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);

Expand DownExpand Up@@ -6355,7 +6336,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// own.
	#[rustfmt::skip]
	fn check_tx_and_push_spendable_outputs<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);
 for spendable_output in self.get_spendable_outputs(funding_spent, tx) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Require WithContext log wrappers on OutboundPayments calls and pass payment hashes#4342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 4 commits into

from

Jan 29, 2026
 Merged


Require WithContext log wrappers on OutboundPayments calls and pass payment hashes
#4342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0f253c0

Use a single `WithContext` wrapper rather than several log-wrappers


TheBlueMatt Jan 25, 2026
5e64c40

Require `WithContext` log wrappers on `OutboundPayments` calls


TheBlueMatt Jan 25, 2026
253ceed

Add `PaymentId` to logging `Record`s


TheBlueMatt Jan 25, 2026
878e632

Don't override log context set by inner `WithContext`s


TheBlueMatt Jan 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


77 changes: 29 additions & 48 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ use crate::sign::{
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::byte_utils;
use crate::util::logger::{Logger, Record};
use crate::util::logger::{Logger, WithContext};
use crate::util::persist::MonitorName;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, RequiredWrapper, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -1825,45 +1825,27 @@ macro_rules! _process_events_body {
}
pub(super) use _process_events_body as process_events_body;

pub(crate) struct WithChannelMonitor<'a, L: Deref>
where
	L::Target: Logger,
{
	logger: &'a L,
	peer_id: Option<PublicKey>,
	channel_id: Option<ChannelId>,
	payment_hash: Option<PaymentHash>,
}
pub(crate) struct WithChannelMonitor;

impl<'a, L: Deref> Logger for WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	fn log(&self, mut record: Record) {
 record.peer_id = self.peer_id;
 record.channel_id = self.channel_id;
 record.payment_hash = self.payment_hash;
 self.logger.log(record)
	}
}

impl<'a, L: Deref> WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	pub(crate) fn from<S: EcdsaChannelSigner>(
impl WithChannelMonitor {
	pub(crate) fn from<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor: &ChannelMonitor<S>, payment_hash: Option<PaymentHash>,
	) -> Self {
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 Self::from_impl(logger, &*monitor.inner.lock().unwrap(), payment_hash)
	}

	#[rustfmt::skip]
	pub(crate) fn from_impl<S: EcdsaChannelSigner>(logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>) -> Self {
	pub(crate) fn from_impl<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>,
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 let peer_id = Some(monitor_impl.counterparty_node_id);
 let channel_id = Some(monitor_impl.channel_id());
 WithChannelMonitor {
 logger, peer_id, channel_id, payment_hash,
 }
 WithContext::from(logger, peer_id, channel_id, payment_hash)
	}
}

Expand DownExpand Up@@ -3829,7 +3811,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn provide_payment_preimage<B: Deref, F: Deref, L: Deref>(
 &mut self, payment_hash: &PaymentHash, payment_preimage: &PaymentPreimage,
 payment_info: &Option<PaymentClaimDetails>, broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>)
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>)
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -4006,7 +3988,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	///
	/// [`ChannelMonitor::broadcast_latest_holder_commitment_txn`]: crate::chain::channelmonitor::ChannelMonitor::broadcast_latest_holder_commitment_txn
	pub(crate) fn queue_latest_holder_commitment_txn_for_broadcast<B: Deref, F: Deref, L: Deref>(
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>,
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>,
 require_funding_seen: bool,
	)
	where
Expand DownExpand Up@@ -4034,8 +4016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	}

	fn renegotiated_funding<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>,
 channel_parameters: &ChannelTransactionParameters,
 &mut self, logger: &WithContext<L>, channel_parameters: &ChannelTransactionParameters,
 alternative_holder_commitment_tx: &HolderCommitmentTransaction,
 alternative_counterparty_commitment_tx: &CommitmentTransaction,
	) -> Result<(), ()>
Expand DownExpand Up@@ -4210,7 +4191,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn update_monitor<B: Deref, F: Deref, L: Deref>(
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithChannelMonitor<L>
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithContext<L>
	) -> Result<(), ()>
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -5254,7 +5235,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Note that this includes possibly-locktimed-in-the-future transactions!
	#[rustfmt::skip]
	fn unsafe_get_latest_holder_commitment_txn<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>
 &mut self, logger: &WithContext<L>
	) -> Vec<Transaction> where L::Target: Logger {
 log_debug!(logger, "Getting signed copy of latest holder commitment transaction!");
 let commitment_tx = {
Expand DownExpand Up@@ -5307,7 +5288,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	#[rustfmt::skip]
	fn block_connected<B: Deref, F: Deref, L: Deref>(
 &mut self, header: &Header, txdata: &TransactionData, height: u32, broadcaster: B,
 fee_estimator: F, logger: &WithChannelMonitor<L>,
 fee_estimator: F, logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand All@@ -5327,7 +5308,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5360,7 +5341,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5647,7 +5628,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 mut claimable_outpoints: Vec<PackageTemplate>,
 broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5867,7 +5848,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn blocks_disconnected<B: Deref, F: Deref, L: Deref>(
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithChannelMonitor<L>
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithContext<L>
	) where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -5920,7 +5901,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 txid: &Txid,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) where
 B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -6031,7 +6012,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn should_broadcast_holder_commitment_txn<L: Deref>(
 &self, logger: &WithChannelMonitor<L>
 &self, logger: &WithContext<L>
	) -> Option<PaymentHash> where L::Target: Logger {
 // There's no need to broadcast our commitment transaction if we've seen one confirmed (even
 // with 1 confirmation) as it'll be rejected as duplicate/conflicting.
Expand DownExpand Up@@ -6098,7 +6079,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// or counterparty commitment tx, if so send back the source, preimage if found and payment_hash of resolved HTLC
	#[rustfmt::skip]
	fn is_resolving_htlc_output<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);

Expand DownExpand Up@@ -6355,7 +6336,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// own.
	#[rustfmt::skip]
	fn check_tx_and_push_spendable_outputs<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);
 for spendable_output in self.get_spendable_outputs(funding_spent, tx) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Require WithContext log wrappers on OutboundPayments calls and pass payment hashes#4342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 4 commits into

from

Jan 29, 2026
 Merged


Require WithContext log wrappers on OutboundPayments calls and pass payment hashes
#4342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0f253c0

Use a single `WithContext` wrapper rather than several log-wrappers


TheBlueMatt Jan 25, 2026
5e64c40

Require `WithContext` log wrappers on `OutboundPayments` calls


TheBlueMatt Jan 25, 2026
253ceed

Add `PaymentId` to logging `Record`s


TheBlueMatt Jan 25, 2026
878e632

Don't override log context set by inner `WithContext`s


TheBlueMatt Jan 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


77 changes: 29 additions & 48 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ use crate::sign::{
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::byte_utils;
use crate::util::logger::{Logger, Record};
use crate::util::logger::{Logger, WithContext};
use crate::util::persist::MonitorName;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, RequiredWrapper, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -1825,45 +1825,27 @@ macro_rules! _process_events_body {
}
pub(super) use _process_events_body as process_events_body;

pub(crate) struct WithChannelMonitor<'a, L: Deref>
where
	L::Target: Logger,
{
	logger: &'a L,
	peer_id: Option<PublicKey>,
	channel_id: Option<ChannelId>,
	payment_hash: Option<PaymentHash>,
}
pub(crate) struct WithChannelMonitor;

impl<'a, L: Deref> Logger for WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	fn log(&self, mut record: Record) {
 record.peer_id = self.peer_id;
 record.channel_id = self.channel_id;
 record.payment_hash = self.payment_hash;
 self.logger.log(record)
	}
}

impl<'a, L: Deref> WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	pub(crate) fn from<S: EcdsaChannelSigner>(
impl WithChannelMonitor {
	pub(crate) fn from<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor: &ChannelMonitor<S>, payment_hash: Option<PaymentHash>,
	) -> Self {
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 Self::from_impl(logger, &*monitor.inner.lock().unwrap(), payment_hash)
	}

	#[rustfmt::skip]
	pub(crate) fn from_impl<S: EcdsaChannelSigner>(logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>) -> Self {
	pub(crate) fn from_impl<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>,
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 let peer_id = Some(monitor_impl.counterparty_node_id);
 let channel_id = Some(monitor_impl.channel_id());
 WithChannelMonitor {
 logger, peer_id, channel_id, payment_hash,
 }
 WithContext::from(logger, peer_id, channel_id, payment_hash)
	}
}

Expand DownExpand Up@@ -3829,7 +3811,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn provide_payment_preimage<B: Deref, F: Deref, L: Deref>(
 &mut self, payment_hash: &PaymentHash, payment_preimage: &PaymentPreimage,
 payment_info: &Option<PaymentClaimDetails>, broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>)
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>)
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -4006,7 +3988,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	///
	/// [`ChannelMonitor::broadcast_latest_holder_commitment_txn`]: crate::chain::channelmonitor::ChannelMonitor::broadcast_latest_holder_commitment_txn
	pub(crate) fn queue_latest_holder_commitment_txn_for_broadcast<B: Deref, F: Deref, L: Deref>(
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>,
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>,
 require_funding_seen: bool,
	)
	where
Expand DownExpand Up@@ -4034,8 +4016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	}

	fn renegotiated_funding<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>,
 channel_parameters: &ChannelTransactionParameters,
 &mut self, logger: &WithContext<L>, channel_parameters: &ChannelTransactionParameters,
 alternative_holder_commitment_tx: &HolderCommitmentTransaction,
 alternative_counterparty_commitment_tx: &CommitmentTransaction,
	) -> Result<(), ()>
Expand DownExpand Up@@ -4210,7 +4191,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn update_monitor<B: Deref, F: Deref, L: Deref>(
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithChannelMonitor<L>
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithContext<L>
	) -> Result<(), ()>
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -5254,7 +5235,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Note that this includes possibly-locktimed-in-the-future transactions!
	#[rustfmt::skip]
	fn unsafe_get_latest_holder_commitment_txn<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>
 &mut self, logger: &WithContext<L>
	) -> Vec<Transaction> where L::Target: Logger {
 log_debug!(logger, "Getting signed copy of latest holder commitment transaction!");
 let commitment_tx = {
Expand DownExpand Up@@ -5307,7 +5288,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	#[rustfmt::skip]
	fn block_connected<B: Deref, F: Deref, L: Deref>(
 &mut self, header: &Header, txdata: &TransactionData, height: u32, broadcaster: B,
 fee_estimator: F, logger: &WithChannelMonitor<L>,
 fee_estimator: F, logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand All@@ -5327,7 +5308,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5360,7 +5341,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5647,7 +5628,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 mut claimable_outpoints: Vec<PackageTemplate>,
 broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5867,7 +5848,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn blocks_disconnected<B: Deref, F: Deref, L: Deref>(
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithChannelMonitor<L>
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithContext<L>
	) where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -5920,7 +5901,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 txid: &Txid,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) where
 B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -6031,7 +6012,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn should_broadcast_holder_commitment_txn<L: Deref>(
 &self, logger: &WithChannelMonitor<L>
 &self, logger: &WithContext<L>
	) -> Option<PaymentHash> where L::Target: Logger {
 // There's no need to broadcast our commitment transaction if we've seen one confirmed (even
 // with 1 confirmation) as it'll be rejected as duplicate/conflicting.
Expand DownExpand Up@@ -6098,7 +6079,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// or counterparty commitment tx, if so send back the source, preimage if found and payment_hash of resolved HTLC
	#[rustfmt::skip]
	fn is_resolving_htlc_output<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);

Expand DownExpand Up@@ -6355,7 +6336,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// own.
	#[rustfmt::skip]
	fn check_tx_and_push_spendable_outputs<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);
 for spendable_output in self.get_spendable_outputs(funding_spent, tx) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Require WithContext log wrappers on OutboundPayments calls and pass payment hashes#4342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 4 commits into

from

Jan 29, 2026
 Merged


Require WithContext log wrappers on OutboundPayments calls and pass payment hashes
#4342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0f253c0

Use a single `WithContext` wrapper rather than several log-wrappers


TheBlueMatt Jan 25, 2026
5e64c40

Require `WithContext` log wrappers on `OutboundPayments` calls


TheBlueMatt Jan 25, 2026
253ceed

Add `PaymentId` to logging `Record`s


TheBlueMatt Jan 25, 2026
878e632

Don't override log context set by inner `WithContext`s


TheBlueMatt Jan 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


77 changes: 29 additions & 48 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ use crate::sign::{
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::byte_utils;
use crate::util::logger::{Logger, Record};
use crate::util::logger::{Logger, WithContext};
use crate::util::persist::MonitorName;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, RequiredWrapper, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -1825,45 +1825,27 @@ macro_rules! _process_events_body {
}
pub(super) use _process_events_body as process_events_body;

pub(crate) struct WithChannelMonitor<'a, L: Deref>
where
	L::Target: Logger,
{
	logger: &'a L,
	peer_id: Option<PublicKey>,
	channel_id: Option<ChannelId>,
	payment_hash: Option<PaymentHash>,
}
pub(crate) struct WithChannelMonitor;

impl<'a, L: Deref> Logger for WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	fn log(&self, mut record: Record) {
 record.peer_id = self.peer_id;
 record.channel_id = self.channel_id;
 record.payment_hash = self.payment_hash;
 self.logger.log(record)
	}
}

impl<'a, L: Deref> WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	pub(crate) fn from<S: EcdsaChannelSigner>(
impl WithChannelMonitor {
	pub(crate) fn from<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor: &ChannelMonitor<S>, payment_hash: Option<PaymentHash>,
	) -> Self {
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 Self::from_impl(logger, &*monitor.inner.lock().unwrap(), payment_hash)
	}

	#[rustfmt::skip]
	pub(crate) fn from_impl<S: EcdsaChannelSigner>(logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>) -> Self {
	pub(crate) fn from_impl<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>,
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 let peer_id = Some(monitor_impl.counterparty_node_id);
 let channel_id = Some(monitor_impl.channel_id());
 WithChannelMonitor {
 logger, peer_id, channel_id, payment_hash,
 }
 WithContext::from(logger, peer_id, channel_id, payment_hash)
	}
}

Expand DownExpand Up@@ -3829,7 +3811,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn provide_payment_preimage<B: Deref, F: Deref, L: Deref>(
 &mut self, payment_hash: &PaymentHash, payment_preimage: &PaymentPreimage,
 payment_info: &Option<PaymentClaimDetails>, broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>)
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>)
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -4006,7 +3988,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	///
	/// [`ChannelMonitor::broadcast_latest_holder_commitment_txn`]: crate::chain::channelmonitor::ChannelMonitor::broadcast_latest_holder_commitment_txn
	pub(crate) fn queue_latest_holder_commitment_txn_for_broadcast<B: Deref, F: Deref, L: Deref>(
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>,
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>,
 require_funding_seen: bool,
	)
	where
Expand DownExpand Up@@ -4034,8 +4016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	}

	fn renegotiated_funding<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>,
 channel_parameters: &ChannelTransactionParameters,
 &mut self, logger: &WithContext<L>, channel_parameters: &ChannelTransactionParameters,
 alternative_holder_commitment_tx: &HolderCommitmentTransaction,
 alternative_counterparty_commitment_tx: &CommitmentTransaction,
	) -> Result<(), ()>
Expand DownExpand Up@@ -4210,7 +4191,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn update_monitor<B: Deref, F: Deref, L: Deref>(
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithChannelMonitor<L>
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithContext<L>
	) -> Result<(), ()>
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -5254,7 +5235,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Note that this includes possibly-locktimed-in-the-future transactions!
	#[rustfmt::skip]
	fn unsafe_get_latest_holder_commitment_txn<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>
 &mut self, logger: &WithContext<L>
	) -> Vec<Transaction> where L::Target: Logger {
 log_debug!(logger, "Getting signed copy of latest holder commitment transaction!");
 let commitment_tx = {
Expand DownExpand Up@@ -5307,7 +5288,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	#[rustfmt::skip]
	fn block_connected<B: Deref, F: Deref, L: Deref>(
 &mut self, header: &Header, txdata: &TransactionData, height: u32, broadcaster: B,
 fee_estimator: F, logger: &WithChannelMonitor<L>,
 fee_estimator: F, logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand All@@ -5327,7 +5308,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5360,7 +5341,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5647,7 +5628,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 mut claimable_outpoints: Vec<PackageTemplate>,
 broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5867,7 +5848,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn blocks_disconnected<B: Deref, F: Deref, L: Deref>(
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithChannelMonitor<L>
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithContext<L>
	) where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -5920,7 +5901,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 txid: &Txid,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) where
 B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -6031,7 +6012,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn should_broadcast_holder_commitment_txn<L: Deref>(
 &self, logger: &WithChannelMonitor<L>
 &self, logger: &WithContext<L>
	) -> Option<PaymentHash> where L::Target: Logger {
 // There's no need to broadcast our commitment transaction if we've seen one confirmed (even
 // with 1 confirmation) as it'll be rejected as duplicate/conflicting.
Expand DownExpand Up@@ -6098,7 +6079,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// or counterparty commitment tx, if so send back the source, preimage if found and payment_hash of resolved HTLC
	#[rustfmt::skip]
	fn is_resolving_htlc_output<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);

Expand DownExpand Up@@ -6355,7 +6336,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// own.
	#[rustfmt::skip]
	fn check_tx_and_push_spendable_outputs<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);
 for spendable_output in self.get_spendable_outputs(funding_spent, tx) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Require WithContext log wrappers on OutboundPayments calls and pass payment hashes#4342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 4 commits into

from

Jan 29, 2026
 Merged


Require WithContext log wrappers on OutboundPayments calls and pass payment hashes
#4342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0f253c0

Use a single `WithContext` wrapper rather than several log-wrappers


TheBlueMatt Jan 25, 2026
5e64c40

Require `WithContext` log wrappers on `OutboundPayments` calls


TheBlueMatt Jan 25, 2026
253ceed

Add `PaymentId` to logging `Record`s


TheBlueMatt Jan 25, 2026
878e632

Don't override log context set by inner `WithContext`s


TheBlueMatt Jan 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


77 changes: 29 additions & 48 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ use crate::sign::{
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::byte_utils;
use crate::util::logger::{Logger, Record};
use crate::util::logger::{Logger, WithContext};
use crate::util::persist::MonitorName;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, RequiredWrapper, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -1825,45 +1825,27 @@ macro_rules! _process_events_body {
}
pub(super) use _process_events_body as process_events_body;

pub(crate) struct WithChannelMonitor<'a, L: Deref>
where
	L::Target: Logger,
{
	logger: &'a L,
	peer_id: Option<PublicKey>,
	channel_id: Option<ChannelId>,
	payment_hash: Option<PaymentHash>,
}
pub(crate) struct WithChannelMonitor;

impl<'a, L: Deref> Logger for WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	fn log(&self, mut record: Record) {
 record.peer_id = self.peer_id;
 record.channel_id = self.channel_id;
 record.payment_hash = self.payment_hash;
 self.logger.log(record)
	}
}

impl<'a, L: Deref> WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	pub(crate) fn from<S: EcdsaChannelSigner>(
impl WithChannelMonitor {
	pub(crate) fn from<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor: &ChannelMonitor<S>, payment_hash: Option<PaymentHash>,
	) -> Self {
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 Self::from_impl(logger, &*monitor.inner.lock().unwrap(), payment_hash)
	}

	#[rustfmt::skip]
	pub(crate) fn from_impl<S: EcdsaChannelSigner>(logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>) -> Self {
	pub(crate) fn from_impl<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>,
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 let peer_id = Some(monitor_impl.counterparty_node_id);
 let channel_id = Some(monitor_impl.channel_id());
 WithChannelMonitor {
 logger, peer_id, channel_id, payment_hash,
 }
 WithContext::from(logger, peer_id, channel_id, payment_hash)
	}
}

Expand DownExpand Up@@ -3829,7 +3811,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn provide_payment_preimage<B: Deref, F: Deref, L: Deref>(
 &mut self, payment_hash: &PaymentHash, payment_preimage: &PaymentPreimage,
 payment_info: &Option<PaymentClaimDetails>, broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>)
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>)
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -4006,7 +3988,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	///
	/// [`ChannelMonitor::broadcast_latest_holder_commitment_txn`]: crate::chain::channelmonitor::ChannelMonitor::broadcast_latest_holder_commitment_txn
	pub(crate) fn queue_latest_holder_commitment_txn_for_broadcast<B: Deref, F: Deref, L: Deref>(
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>,
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>,
 require_funding_seen: bool,
	)
	where
Expand DownExpand Up@@ -4034,8 +4016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	}

	fn renegotiated_funding<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>,
 channel_parameters: &ChannelTransactionParameters,
 &mut self, logger: &WithContext<L>, channel_parameters: &ChannelTransactionParameters,
 alternative_holder_commitment_tx: &HolderCommitmentTransaction,
 alternative_counterparty_commitment_tx: &CommitmentTransaction,
	) -> Result<(), ()>
Expand DownExpand Up@@ -4210,7 +4191,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn update_monitor<B: Deref, F: Deref, L: Deref>(
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithChannelMonitor<L>
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithContext<L>
	) -> Result<(), ()>
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -5254,7 +5235,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Note that this includes possibly-locktimed-in-the-future transactions!
	#[rustfmt::skip]
	fn unsafe_get_latest_holder_commitment_txn<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>
 &mut self, logger: &WithContext<L>
	) -> Vec<Transaction> where L::Target: Logger {
 log_debug!(logger, "Getting signed copy of latest holder commitment transaction!");
 let commitment_tx = {
Expand DownExpand Up@@ -5307,7 +5288,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	#[rustfmt::skip]
	fn block_connected<B: Deref, F: Deref, L: Deref>(
 &mut self, header: &Header, txdata: &TransactionData, height: u32, broadcaster: B,
 fee_estimator: F, logger: &WithChannelMonitor<L>,
 fee_estimator: F, logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand All@@ -5327,7 +5308,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5360,7 +5341,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5647,7 +5628,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 mut claimable_outpoints: Vec<PackageTemplate>,
 broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5867,7 +5848,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn blocks_disconnected<B: Deref, F: Deref, L: Deref>(
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithChannelMonitor<L>
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithContext<L>
	) where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -5920,7 +5901,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 txid: &Txid,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) where
 B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -6031,7 +6012,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn should_broadcast_holder_commitment_txn<L: Deref>(
 &self, logger: &WithChannelMonitor<L>
 &self, logger: &WithContext<L>
	) -> Option<PaymentHash> where L::Target: Logger {
 // There's no need to broadcast our commitment transaction if we've seen one confirmed (even
 // with 1 confirmation) as it'll be rejected as duplicate/conflicting.
Expand DownExpand Up@@ -6098,7 +6079,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// or counterparty commitment tx, if so send back the source, preimage if found and payment_hash of resolved HTLC
	#[rustfmt::skip]
	fn is_resolving_htlc_output<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);

Expand DownExpand Up@@ -6355,7 +6336,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// own.
	#[rustfmt::skip]
	fn check_tx_and_push_spendable_outputs<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);
 for spendable_output in self.get_spendable_outputs(funding_spent, tx) {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Require WithContext log wrappers on OutboundPayments calls and pass payment hashes#4342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

valentinewallace
merged 4 commits into

from

Jan 29, 2026
 Merged


Require WithContext log wrappers on OutboundPayments calls and pass payment hashes
#4342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
0f253c0

Use a single `WithContext` wrapper rather than several log-wrappers


TheBlueMatt Jan 25, 2026
5e64c40

Require `WithContext` log wrappers on `OutboundPayments` calls


TheBlueMatt Jan 25, 2026
253ceed

Add `PaymentId` to logging `Record`s


TheBlueMatt Jan 25, 2026
878e632

Don't override log context set by inner `WithContext`s


TheBlueMatt Jan 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


77 changes: 29 additions & 48 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ use crate::sign::{
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::byte_utils;
use crate::util::logger::{Logger, Record};
use crate::util::logger::{Logger, WithContext};
use crate::util::persist::MonitorName;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, RequiredWrapper, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -1825,45 +1825,27 @@ macro_rules! _process_events_body {
}
pub(super) use _process_events_body as process_events_body;

pub(crate) struct WithChannelMonitor<'a, L: Deref>
where
	L::Target: Logger,
{
	logger: &'a L,
	peer_id: Option<PublicKey>,
	channel_id: Option<ChannelId>,
	payment_hash: Option<PaymentHash>,
}
pub(crate) struct WithChannelMonitor;

impl<'a, L: Deref> Logger for WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	fn log(&self, mut record: Record) {
 record.peer_id = self.peer_id;
 record.channel_id = self.channel_id;
 record.payment_hash = self.payment_hash;
 self.logger.log(record)
	}
}

impl<'a, L: Deref> WithChannelMonitor<'a, L>
where
	L::Target: Logger,
{
	pub(crate) fn from<S: EcdsaChannelSigner>(
impl WithChannelMonitor {
	pub(crate) fn from<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor: &ChannelMonitor<S>, payment_hash: Option<PaymentHash>,
	) -> Self {
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 Self::from_impl(logger, &*monitor.inner.lock().unwrap(), payment_hash)
	}

	#[rustfmt::skip]
	pub(crate) fn from_impl<S: EcdsaChannelSigner>(logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>) -> Self {
	pub(crate) fn from_impl<'a, L: Deref, S: EcdsaChannelSigner>(
 logger: &'a L, monitor_impl: &ChannelMonitorImpl<S>, payment_hash: Option<PaymentHash>,
	) -> WithContext<'a, L>
	where
 L::Target: Logger,
	{
 let peer_id = Some(monitor_impl.counterparty_node_id);
 let channel_id = Some(monitor_impl.channel_id());
 WithChannelMonitor {
 logger, peer_id, channel_id, payment_hash,
 }
 WithContext::from(logger, peer_id, channel_id, payment_hash)
	}
}

Expand DownExpand Up@@ -3829,7 +3811,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn provide_payment_preimage<B: Deref, F: Deref, L: Deref>(
 &mut self, payment_hash: &PaymentHash, payment_preimage: &PaymentPreimage,
 payment_info: &Option<PaymentClaimDetails>, broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>)
 fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>)
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -4006,7 +3988,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	///
	/// [`ChannelMonitor::broadcast_latest_holder_commitment_txn`]: crate::chain::channelmonitor::ChannelMonitor::broadcast_latest_holder_commitment_txn
	pub(crate) fn queue_latest_holder_commitment_txn_for_broadcast<B: Deref, F: Deref, L: Deref>(
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithChannelMonitor<L>,
 &mut self, broadcaster: &B, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: &WithContext<L>,
 require_funding_seen: bool,
	)
	where
Expand DownExpand Up@@ -4034,8 +4016,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	}

	fn renegotiated_funding<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>,
 channel_parameters: &ChannelTransactionParameters,
 &mut self, logger: &WithContext<L>, channel_parameters: &ChannelTransactionParameters,
 alternative_holder_commitment_tx: &HolderCommitmentTransaction,
 alternative_counterparty_commitment_tx: &CommitmentTransaction,
	) -> Result<(), ()>
Expand DownExpand Up@@ -4210,7 +4191,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn update_monitor<B: Deref, F: Deref, L: Deref>(
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithChannelMonitor<L>
 &mut self, updates: &ChannelMonitorUpdate, broadcaster: &B, fee_estimator: &F, logger: &WithContext<L>
	) -> Result<(), ()>
	where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -5254,7 +5235,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// Note that this includes possibly-locktimed-in-the-future transactions!
	#[rustfmt::skip]
	fn unsafe_get_latest_holder_commitment_txn<L: Deref>(
 &mut self, logger: &WithChannelMonitor<L>
 &mut self, logger: &WithContext<L>
	) -> Vec<Transaction> where L::Target: Logger {
 log_debug!(logger, "Getting signed copy of latest holder commitment transaction!");
 let commitment_tx = {
Expand DownExpand Up@@ -5307,7 +5288,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	#[rustfmt::skip]
	fn block_connected<B: Deref, F: Deref, L: Deref>(
 &mut self, header: &Header, txdata: &TransactionData, height: u32, broadcaster: B,
 fee_estimator: F, logger: &WithChannelMonitor<L>,
 fee_estimator: F, logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
 where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand All@@ -5327,7 +5308,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5360,7 +5341,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 height: u32,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5647,7 +5628,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 mut claimable_outpoints: Vec<PackageTemplate>,
 broadcaster: &B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) -> Vec<TransactionOutputs>
	where
 B::Target: BroadcasterInterface,
Expand DownExpand Up@@ -5867,7 +5848,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn blocks_disconnected<B: Deref, F: Deref, L: Deref>(
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithChannelMonitor<L>
 &mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithContext<L>
	) where B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
 L::Target: Logger,
Expand DownExpand Up@@ -5920,7 +5901,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 txid: &Txid,
 broadcaster: B,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
 logger: &WithChannelMonitor<L>,
 logger: &WithContext<L>,
	) where
 B::Target: BroadcasterInterface,
 F::Target: FeeEstimator,
Expand DownExpand Up@@ -6031,7 +6012,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	#[rustfmt::skip]
	fn should_broadcast_holder_commitment_txn<L: Deref>(
 &self, logger: &WithChannelMonitor<L>
 &self, logger: &WithContext<L>
	) -> Option<PaymentHash> where L::Target: Logger {
 // There's no need to broadcast our commitment transaction if we've seen one confirmed (even
 // with 1 confirmation) as it'll be rejected as duplicate/conflicting.
Expand DownExpand Up@@ -6098,7 +6079,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// or counterparty commitment tx, if so send back the source, preimage if found and payment_hash of resolved HTLC
	#[rustfmt::skip]
	fn is_resolving_htlc_output<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);

Expand DownExpand Up@@ -6355,7 +6336,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	/// own.
	#[rustfmt::skip]
	fn check_tx_and_push_spendable_outputs<L: Deref>(
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithChannelMonitor<L>,
 &mut self, tx: &Transaction, height: u32, block_hash: &BlockHash, logger: &WithContext<L>,
	) where L::Target: Logger {
 let funding_spent = get_confirmed_funding_scope!(self);
 for spendable_output in self.get_spendable_outputs(funding_spent, tx) {
Expand Down
Loading
Loading