Skip to content

fuzz: add explicit chanmon manager persistence commands#4631

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
TheBlueMatt merged 3 commits into from
May 24, 2026
Merged

fuzz: add explicit chanmon manager persistence commands #4631

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b33526e
Add explicit chanmon manager persistence commands
joostjager May 21, 2026
bbeba3e
Refactor chanmon payment tracker helpers
joostjager May 22, 2026
c18fab5
Track chanmon payment persistence generations
joostjager May 22, 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
166 changes: 119 additions & 47 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -819,6 +819,7 @@ struct HarnessNode<'a> {
persistence_style: ChannelMonitorUpdateStatus,
deferred: bool,
serialized_manager: Vec<u8>,
serialized_manager_generation: u64,
height: u32,
last_htlc_clear_fee: u32,
}
Expand DownExpand Up@@ -917,6 +918,7 @@ impl<'a> HarnessNode<'a> {
persistence_style,
deferred,
serialized_manager: Vec::new(),
serialized_manager_generation: 0,
height: 0,
last_htlc_clear_fee: 253,
}
Expand DownExpand Up@@ -976,6 +978,7 @@ impl<'a> HarnessNode<'a> {
if self.node.get_and_clear_needs_persistence() {
let pending_monitor_writes = self.monitor.pending_operation_count();
self.serialized_manager = self.node.encode();
self.serialized_manager_generation += 1;
if self.deferred {
self.monitor.flush(pending_monitor_writes, &self.logger);
} else {
Expand All@@ -991,6 +994,7 @@ impl<'a> HarnessNode<'a> {
fn force_checkpoint_manager_persistence(&mut self) {
let pending_monitor_writes = self.monitor.pending_operation_count();
self.serialized_manager = self.node.encode();
self.serialized_manager_generation += 1;
self.node.get_and_clear_needs_persistence();
if self.deferred {
self.monitor.flush(pending_monitor_writes, &self.logger);
Expand All@@ -999,6 +1003,10 @@ impl<'a> HarnessNode<'a> {
}
}

fn next_manager_persistence_generation(&self) -> u64 {
self.serialized_manager_generation + 1
}

fn bump_fee_estimate(&mut self, chan_type: ChanType) {
let mut max_feerate = self.last_htlc_clear_fee;
if matches!(chan_type, ChanType::Legacy) {
Expand DownExpand Up@@ -1098,7 +1106,8 @@ impl<'a> HarnessNode<'a> {

fn reload<Out: Output + MaybeSend + MaybeSync>(
&mut self, use_old_mons: u8, out: &Out, router: &'a FuzzRouter, chan_type: ChanType,
) {
) -> u64 {
let loaded_manager_generation = self.serialized_manager_generation;
let logger = Self::build_logger(self.node_id, out);
let persister = Self::build_persister(self.persistence_style);
let chain_monitor = Self::build_chain_monitor(
Expand DownExpand Up@@ -1170,6 +1179,7 @@ impl<'a> HarnessNode<'a> {
// even if the reloaded ChannelManager does not need persistence. Always checkpoint here so
// those registrations can be flushed against the manager snapshot they belong to.
self.force_checkpoint_manager_persistence();
loaded_manager_generation
}
}

Expand DownExpand Up@@ -1476,15 +1486,79 @@ impl PeerLink {
}
}

struct PendingPayment {
payment_id: PaymentId,
payment_hash: PaymentHash,
first_persisted_manager_generation: u64,
}

struct NodePayments {
pending: Vec<PaymentId>,
pending: Vec<PendingPayment>,
resolved: HashMap<PaymentId, Option<PaymentHash>>,
}

impl NodePayments {
fn new() -> Self {
Self { pending: Vec::new(), resolved: new_hash_map() }
}

fn add_pending(
&mut self, payment_id: PaymentId, payment_hash: PaymentHash,
first_persisted_manager_generation: u64,
) {
self.pending.push(PendingPayment {
payment_id,
payment_hash,
first_persisted_manager_generation,
});
}

fn mark_sent(&mut self, sent_id: PaymentId, payment_hash: PaymentHash) {
let idx_opt = self.pending.iter().position(|pending| pending.payment_id == sent_id);
if let Some(idx) = idx_opt {
self.pending.remove(idx);
self.resolved.insert(sent_id, Some(payment_hash));
} else {
assert!(self.resolved.contains_key(&sent_id));
}
}

fn mark_resolved_without_hash(&mut self, payment_id: PaymentId) {
let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
if let Some(idx) = idx_opt {
self.pending.remove(idx);
self.resolved.insert(payment_id, None);
} else if !self.resolved.contains_key(&payment_id) {
// Some resolutions can arrive immediately, before the send helper records
// the payment as pending. Track them so later duplicate events are accepted.
self.resolved.insert(payment_id, None);
}
}

fn mark_successful_probe(&mut self, payment_id: PaymentId) {
let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
if let Some(idx) = idx_opt {
self.pending.remove(idx);
self.resolved.insert(payment_id, None);
} else {
assert!(self.resolved.contains_key(&payment_id));
}
}

fn sync_pending_with_manager_generation(
&mut self, loaded_manager_generation: u64,
) -> Vec<PaymentHash> {
let mut rolled_back_payment_hashes = Vec::new();
let pending = mem::take(&mut self.pending);
for pending_payment in pending {
if pending_payment.first_persisted_manager_generation > loaded_manager_generation {
rolled_back_payment_hashes.push(pending_payment.payment_hash);
} else {
self.pending.push(pending_payment);
}
}
rolled_back_payment_hashes
}
}

struct PaymentTracker {
Expand DownExpand Up@@ -1590,7 +1664,11 @@ impl PaymentTracker {
},
};
if succeeded {
self.nodes[source_idx].pending.push(id);
self.nodes[source_idx].add_pending(
id,
hash,
source.next_manager_persistence_generation(),
);
}
succeeded
}
Expand DownExpand Up@@ -1667,7 +1745,11 @@ impl PaymentTracker {
},
};
if succeeded {
self.nodes[source_idx].pending.push(id);
self.nodes[source_idx].add_pending(
id,
hash,
source.next_manager_persistence_generation(),
);
}
}

Expand DownExpand Up@@ -1736,7 +1818,11 @@ impl PaymentTracker {
Ok(()) => Self::check_payment_send_events(source, id),
};
if succeeded {
self.nodes[source_idx].pending.push(id);
self.nodes[source_idx].add_pending(
id,
hash,
source.next_manager_persistence_generation(),
);
}
}

Expand DownExpand Up@@ -1836,7 +1922,11 @@ impl PaymentTracker {
Ok(()) => Self::check_payment_send_events(source, id),
};
if succeeded {
self.nodes[source_idx].pending.push(id);
self.nodes[source_idx].add_pending(
id,
hash,
source.next_manager_persistence_generation(),
);
}
}

Expand All@@ -1853,41 +1943,6 @@ impl PaymentTracker {
}
}

fn mark_sent(&mut self, node_idx: usize, sent_id: PaymentId, payment_hash: PaymentHash) {
let node = &mut self.nodes[node_idx];
let idx_opt = node.pending.iter().position(|id| *id == sent_id);
if let Some(idx) = idx_opt {
node.pending.remove(idx);
node.resolved.insert(sent_id, Some(payment_hash));
} else {
assert!(node.resolved.contains_key(&sent_id));
}
}

fn mark_resolved_without_hash(&mut self, node_idx: usize, payment_id: PaymentId) {
let node = &mut self.nodes[node_idx];
let idx_opt = node.pending.iter().position(|id| *id == payment_id);
if let Some(idx) = idx_opt {
node.pending.remove(idx);
node.resolved.insert(payment_id, None);
} else if !node.resolved.contains_key(&payment_id) {
// Some resolutions can arrive immediately, before the send helper records
// the payment as pending. Track them so later duplicate events are accepted.
node.resolved.insert(payment_id, None);
}
}

fn mark_successful_probe(&mut self, node_idx: usize, payment_id: PaymentId) {
let node = &mut self.nodes[node_idx];
let idx_opt = node.pending.iter().position(|id| *id == payment_id);
if let Some(idx) = idx_opt {
node.pending.remove(idx);
node.resolved.insert(payment_id, None);
} else {
assert!(node.resolved.contains_key(&payment_id));
}
}

fn assert_all_resolved(&self) {
for (idx, node) in self.nodes.iter().enumerate() {
assert!(
Expand DownExpand Up@@ -2725,17 +2780,17 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
}
},
events::Event::PaymentSent { payment_id, payment_hash, .. } => {
payments.mark_sent(node_idx, payment_id.unwrap(), payment_hash);
payments.nodes[node_idx].mark_sent(payment_id.unwrap(), payment_hash);
},
// Even though we don't explicitly send probes, because probes are detected based on
// hashing the payment hash+preimage, it is rather trivial for the fuzzer to build
// payments that accidentally end up looking like probes.
events::Event::ProbeSuccessful { payment_id, .. } => {
payments.mark_successful_probe(node_idx, payment_id);
payments.nodes[node_idx].mark_successful_probe(payment_id);
},
events::Event::PaymentFailed { payment_id, .. }
| events::Event::ProbeFailed { payment_id, .. } => {
payments.mark_resolved_without_hash(node_idx, payment_id);
payments.nodes[node_idx].mark_resolved_without_hash(payment_id);
},
events::Event::PaymentClaimed { .. } => {},
events::Event::PaymentPathSuccessful { .. } => {},
Expand DownExpand Up@@ -2860,6 +2915,9 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
}

fn restart_node(&mut self, node_idx: usize, v: u8, router: &'a FuzzRouter) {
if !self.nodes[node_idx].deferred {
self.nodes[node_idx].checkpoint_manager_persistence();
}
match node_idx {
0 => {
self.ab_link.disconnect_for_reload(0, &self.nodes, &mut self.queues);
Expand All@@ -2873,7 +2931,13 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
},
_ => panic!("invalid node index"),
}
self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
let loaded_manager_generation =
self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
let rolled_back_payment_hashes = self.payments.nodes[node_idx]
.sync_pending_with_manager_generation(loaded_manager_generation);
for payment_hash in rolled_back_payment_hashes {
self.payments.claimed_payment_hashes.remove(&payment_hash);
}
}

fn settle_all(&mut self) {
Expand DownExpand Up@@ -3116,6 +3180,16 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
0x88 => harness.nodes[2].bump_fee_estimate(harness.chan_type),
0x89 => harness.nodes[2].reset_fee_estimate(),

0x90 => {
harness.nodes[0].checkpoint_manager_persistence();
},
0x91 => {
harness.nodes[1].checkpoint_manager_persistence();
},
0x92 => {
harness.nodes[2].checkpoint_manager_persistence();
},

0xa0 => {
if !cfg!(splicing) {
break 'fuzz_loop;
Expand DownExpand Up@@ -3370,8 +3444,6 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
},
_ => break 'fuzz_loop,
}

harness.checkpoint_manager_persistences();
}
harness.finish();
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fuzz: add explicit chanmon manager persistence commands by joostjager · Pull Request #4631 · lightningdevkit/rust-lightning · GitHub
Skip to content
fuzz: add explicit chanmon manager persistence commands#4631

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

TheBlueMatt
merged 3 commits into

from

May 24, 2026
 Merged


fuzz: add explicit chanmon manager persistence commands
#4631
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b33526e

Add explicit chanmon manager persistence commands


joostjager May 21, 2026
bbeba3e

Refactor chanmon payment tracker helpers


joostjager May 22, 2026
c18fab5

Track chanmon payment persistence generations


joostjager May 22, 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


166 changes: 119 additions & 47 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -819,6 +819,7 @@ struct HarnessNode<'a> {
	persistence_style: ChannelMonitorUpdateStatus,
	deferred: bool,
	serialized_manager: Vec<u8>,
	serialized_manager_generation: u64,
	height: u32,
	last_htlc_clear_fee: u32,
}
Expand DownExpand Up@@ -917,6 +918,7 @@ impl<'a> HarnessNode<'a> {
 persistence_style,
 deferred,
 serialized_manager: Vec::new(),
 serialized_manager_generation: 0,
 height: 0,
 last_htlc_clear_fee: 253,
 }
Expand DownExpand Up@@ -976,6 +978,7 @@ impl<'a> HarnessNode<'a> {
 if self.node.get_and_clear_needs_persistence() {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
 } else {
Expand All@@ -991,6 +994,7 @@ impl<'a> HarnessNode<'a> {
	fn force_checkpoint_manager_persistence(&mut self) {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 self.node.get_and_clear_needs_persistence();
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
Expand All@@ -999,6 +1003,10 @@ impl<'a> HarnessNode<'a> {
 }
	}

	fn next_manager_persistence_generation(&self) -> u64 {
 self.serialized_manager_generation + 1
	}

	fn bump_fee_estimate(&mut self, chan_type: ChanType) {
 let mut max_feerate = self.last_htlc_clear_fee;
 if matches!(chan_type, ChanType::Legacy) {
Expand DownExpand Up@@ -1098,7 +1106,8 @@ impl<'a> HarnessNode<'a> {

	fn reload<Out: Output + MaybeSend + MaybeSync>(
 &mut self, use_old_mons: u8, out: &Out, router: &'a FuzzRouter, chan_type: ChanType,
	) {
	) -> u64 {
 let loaded_manager_generation = self.serialized_manager_generation;
 let logger = Self::build_logger(self.node_id, out);
 let persister = Self::build_persister(self.persistence_style);
 let chain_monitor = Self::build_chain_monitor(
Expand DownExpand Up@@ -1170,6 +1179,7 @@ impl<'a> HarnessNode<'a> {
 // even if the reloaded ChannelManager does not need persistence. Always checkpoint here so
 // those registrations can be flushed against the manager snapshot they belong to.
 self.force_checkpoint_manager_persistence();
 loaded_manager_generation
	}
}

Expand DownExpand Up@@ -1476,15 +1486,79 @@ impl PeerLink {
	}
}

struct PendingPayment {
	payment_id: PaymentId,
	payment_hash: PaymentHash,
	first_persisted_manager_generation: u64,
}

struct NodePayments {
	pending: Vec<PaymentId>,
	pending: Vec<PendingPayment>,
	resolved: HashMap<PaymentId, Option<PaymentHash>>,
}

impl NodePayments {
	fn new() -> Self {
 Self { pending: Vec::new(), resolved: new_hash_map() }
	}

	fn add_pending(
 &mut self, payment_id: PaymentId, payment_hash: PaymentHash,
 first_persisted_manager_generation: u64,
	) {
 self.pending.push(PendingPayment {
 payment_id,
 payment_hash,
 first_persisted_manager_generation,
 });
	}

	fn mark_sent(&mut self, sent_id: PaymentId, payment_hash: PaymentHash) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == sent_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(self.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else if !self.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 self.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else {
 assert!(self.resolved.contains_key(&payment_id));
 }
	}

	fn sync_pending_with_manager_generation(
 &mut self, loaded_manager_generation: u64,
	) -> Vec<PaymentHash> {
 let mut rolled_back_payment_hashes = Vec::new();
 let pending = mem::take(&mut self.pending);
 for pending_payment in pending {
 if pending_payment.first_persisted_manager_generation > loaded_manager_generation {
 rolled_back_payment_hashes.push(pending_payment.payment_hash);
 } else {
 self.pending.push(pending_payment);
 }
 }
 rolled_back_payment_hashes
	}
}

struct PaymentTracker {
Expand DownExpand Up@@ -1590,7 +1664,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
 succeeded
	}
Expand DownExpand Up@@ -1667,7 +1745,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1736,7 +1818,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1836,7 +1922,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand All@@ -1853,41 +1943,6 @@ impl PaymentTracker {
 }
	}

	fn mark_sent(&mut self, node_idx: usize, sent_id: PaymentId, payment_hash: PaymentHash) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == sent_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(node.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else if !node.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 node.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else {
 assert!(node.resolved.contains_key(&payment_id));
 }
	}

	fn assert_all_resolved(&self) {
 for (idx, node) in self.nodes.iter().enumerate() {
 assert!(
Expand DownExpand Up@@ -2725,17 +2780,17 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }
 },
 events::Event::PaymentSent { payment_id, payment_hash, .. } => {
 payments.mark_sent(node_idx, payment_id.unwrap(), payment_hash);
 payments.nodes[node_idx].mark_sent(payment_id.unwrap(), payment_hash);
 },
 // Even though we don't explicitly send probes, because probes are detected based on
 // hashing the payment hash+preimage, it is rather trivial for the fuzzer to build
 // payments that accidentally end up looking like probes.
 events::Event::ProbeSuccessful { payment_id, .. } => {
 payments.mark_successful_probe(node_idx, payment_id);
 payments.nodes[node_idx].mark_successful_probe(payment_id);
 },
 events::Event::PaymentFailed { payment_id, .. }
 | events::Event::ProbeFailed { payment_id, .. } => {
 payments.mark_resolved_without_hash(node_idx, payment_id);
 payments.nodes[node_idx].mark_resolved_without_hash(payment_id);
 },
 events::Event::PaymentClaimed { .. } => {},
 events::Event::PaymentPathSuccessful { .. } => {},
Expand DownExpand Up@@ -2860,6 +2915,9 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
	}

	fn restart_node(&mut self, node_idx: usize, v: u8, router: &'a FuzzRouter) {
 if !self.nodes[node_idx].deferred {
 self.nodes[node_idx].checkpoint_manager_persistence();
 }
 match node_idx {
 0 => {
 self.ab_link.disconnect_for_reload(0, &self.nodes, &mut self.queues);
Expand All@@ -2873,7 +2931,13 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 _ => panic!("invalid node index"),
 }
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let loaded_manager_generation =
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let rolled_back_payment_hashes = self.payments.nodes[node_idx]
 .sync_pending_with_manager_generation(loaded_manager_generation);
 for payment_hash in rolled_back_payment_hashes {
 self.payments.claimed_payment_hashes.remove(&payment_hash);
 }
	}

	fn settle_all(&mut self) {
Expand DownExpand Up@@ -3116,6 +3180,16 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 0x88 => harness.nodes[2].bump_fee_estimate(harness.chan_type),
 0x89 => harness.nodes[2].reset_fee_estimate(),

 0x90 => {
 harness.nodes[0].checkpoint_manager_persistence();
 },
 0x91 => {
 harness.nodes[1].checkpoint_manager_persistence();
 },
 0x92 => {
 harness.nodes[2].checkpoint_manager_persistence();
 },

 0xa0 => {
 if !cfg!(splicing) {
 break 'fuzz_loop;
Expand DownExpand Up@@ -3370,8 +3444,6 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 },
 _ => break 'fuzz_loop,
 }

 harness.checkpoint_manager_persistences();
	}
	harness.finish();
}
Expand Down
Loading

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

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

TheBlueMatt
merged 3 commits into

from

May 24, 2026
 Merged


fuzz: add explicit chanmon manager persistence commands
#4631
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b33526e

Add explicit chanmon manager persistence commands


joostjager May 21, 2026
bbeba3e

Refactor chanmon payment tracker helpers


joostjager May 22, 2026
c18fab5

Track chanmon payment persistence generations


joostjager May 22, 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


166 changes: 119 additions & 47 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -819,6 +819,7 @@ struct HarnessNode<'a> {
	persistence_style: ChannelMonitorUpdateStatus,
	deferred: bool,
	serialized_manager: Vec<u8>,
	serialized_manager_generation: u64,
	height: u32,
	last_htlc_clear_fee: u32,
}
Expand DownExpand Up@@ -917,6 +918,7 @@ impl<'a> HarnessNode<'a> {
 persistence_style,
 deferred,
 serialized_manager: Vec::new(),
 serialized_manager_generation: 0,
 height: 0,
 last_htlc_clear_fee: 253,
 }
Expand DownExpand Up@@ -976,6 +978,7 @@ impl<'a> HarnessNode<'a> {
 if self.node.get_and_clear_needs_persistence() {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
 } else {
Expand All@@ -991,6 +994,7 @@ impl<'a> HarnessNode<'a> {
	fn force_checkpoint_manager_persistence(&mut self) {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 self.node.get_and_clear_needs_persistence();
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
Expand All@@ -999,6 +1003,10 @@ impl<'a> HarnessNode<'a> {
 }
	}

	fn next_manager_persistence_generation(&self) -> u64 {
 self.serialized_manager_generation + 1
	}

	fn bump_fee_estimate(&mut self, chan_type: ChanType) {
 let mut max_feerate = self.last_htlc_clear_fee;
 if matches!(chan_type, ChanType::Legacy) {
Expand DownExpand Up@@ -1098,7 +1106,8 @@ impl<'a> HarnessNode<'a> {

	fn reload<Out: Output + MaybeSend + MaybeSync>(
 &mut self, use_old_mons: u8, out: &Out, router: &'a FuzzRouter, chan_type: ChanType,
	) {
	) -> u64 {
 let loaded_manager_generation = self.serialized_manager_generation;
 let logger = Self::build_logger(self.node_id, out);
 let persister = Self::build_persister(self.persistence_style);
 let chain_monitor = Self::build_chain_monitor(
Expand DownExpand Up@@ -1170,6 +1179,7 @@ impl<'a> HarnessNode<'a> {
 // even if the reloaded ChannelManager does not need persistence. Always checkpoint here so
 // those registrations can be flushed against the manager snapshot they belong to.
 self.force_checkpoint_manager_persistence();
 loaded_manager_generation
	}
}

Expand DownExpand Up@@ -1476,15 +1486,79 @@ impl PeerLink {
	}
}

struct PendingPayment {
	payment_id: PaymentId,
	payment_hash: PaymentHash,
	first_persisted_manager_generation: u64,
}

struct NodePayments {
	pending: Vec<PaymentId>,
	pending: Vec<PendingPayment>,
	resolved: HashMap<PaymentId, Option<PaymentHash>>,
}

impl NodePayments {
	fn new() -> Self {
 Self { pending: Vec::new(), resolved: new_hash_map() }
	}

	fn add_pending(
 &mut self, payment_id: PaymentId, payment_hash: PaymentHash,
 first_persisted_manager_generation: u64,
	) {
 self.pending.push(PendingPayment {
 payment_id,
 payment_hash,
 first_persisted_manager_generation,
 });
	}

	fn mark_sent(&mut self, sent_id: PaymentId, payment_hash: PaymentHash) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == sent_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(self.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else if !self.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 self.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else {
 assert!(self.resolved.contains_key(&payment_id));
 }
	}

	fn sync_pending_with_manager_generation(
 &mut self, loaded_manager_generation: u64,
	) -> Vec<PaymentHash> {
 let mut rolled_back_payment_hashes = Vec::new();
 let pending = mem::take(&mut self.pending);
 for pending_payment in pending {
 if pending_payment.first_persisted_manager_generation > loaded_manager_generation {
 rolled_back_payment_hashes.push(pending_payment.payment_hash);
 } else {
 self.pending.push(pending_payment);
 }
 }
 rolled_back_payment_hashes
	}
}

struct PaymentTracker {
Expand DownExpand Up@@ -1590,7 +1664,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
 succeeded
	}
Expand DownExpand Up@@ -1667,7 +1745,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1736,7 +1818,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1836,7 +1922,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand All@@ -1853,41 +1943,6 @@ impl PaymentTracker {
 }
	}

	fn mark_sent(&mut self, node_idx: usize, sent_id: PaymentId, payment_hash: PaymentHash) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == sent_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(node.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else if !node.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 node.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else {
 assert!(node.resolved.contains_key(&payment_id));
 }
	}

	fn assert_all_resolved(&self) {
 for (idx, node) in self.nodes.iter().enumerate() {
 assert!(
Expand DownExpand Up@@ -2725,17 +2780,17 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }
 },
 events::Event::PaymentSent { payment_id, payment_hash, .. } => {
 payments.mark_sent(node_idx, payment_id.unwrap(), payment_hash);
 payments.nodes[node_idx].mark_sent(payment_id.unwrap(), payment_hash);
 },
 // Even though we don't explicitly send probes, because probes are detected based on
 // hashing the payment hash+preimage, it is rather trivial for the fuzzer to build
 // payments that accidentally end up looking like probes.
 events::Event::ProbeSuccessful { payment_id, .. } => {
 payments.mark_successful_probe(node_idx, payment_id);
 payments.nodes[node_idx].mark_successful_probe(payment_id);
 },
 events::Event::PaymentFailed { payment_id, .. }
 | events::Event::ProbeFailed { payment_id, .. } => {
 payments.mark_resolved_without_hash(node_idx, payment_id);
 payments.nodes[node_idx].mark_resolved_without_hash(payment_id);
 },
 events::Event::PaymentClaimed { .. } => {},
 events::Event::PaymentPathSuccessful { .. } => {},
Expand DownExpand Up@@ -2860,6 +2915,9 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
	}

	fn restart_node(&mut self, node_idx: usize, v: u8, router: &'a FuzzRouter) {
 if !self.nodes[node_idx].deferred {
 self.nodes[node_idx].checkpoint_manager_persistence();
 }
 match node_idx {
 0 => {
 self.ab_link.disconnect_for_reload(0, &self.nodes, &mut self.queues);
Expand All@@ -2873,7 +2931,13 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 _ => panic!("invalid node index"),
 }
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let loaded_manager_generation =
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let rolled_back_payment_hashes = self.payments.nodes[node_idx]
 .sync_pending_with_manager_generation(loaded_manager_generation);
 for payment_hash in rolled_back_payment_hashes {
 self.payments.claimed_payment_hashes.remove(&payment_hash);
 }
	}

	fn settle_all(&mut self) {
Expand DownExpand Up@@ -3116,6 +3180,16 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 0x88 => harness.nodes[2].bump_fee_estimate(harness.chan_type),
 0x89 => harness.nodes[2].reset_fee_estimate(),

 0x90 => {
 harness.nodes[0].checkpoint_manager_persistence();
 },
 0x91 => {
 harness.nodes[1].checkpoint_manager_persistence();
 },
 0x92 => {
 harness.nodes[2].checkpoint_manager_persistence();
 },

 0xa0 => {
 if !cfg!(splicing) {
 break 'fuzz_loop;
Expand DownExpand Up@@ -3370,8 +3444,6 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 },
 _ => break 'fuzz_loop,
 }

 harness.checkpoint_manager_persistences();
	}
	harness.finish();
}
Expand Down
Loading

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

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

TheBlueMatt
merged 3 commits into

from

May 24, 2026
 Merged


fuzz: add explicit chanmon manager persistence commands
#4631
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b33526e

Add explicit chanmon manager persistence commands


joostjager May 21, 2026
bbeba3e

Refactor chanmon payment tracker helpers


joostjager May 22, 2026
c18fab5

Track chanmon payment persistence generations


joostjager May 22, 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


166 changes: 119 additions & 47 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -819,6 +819,7 @@ struct HarnessNode<'a> {
	persistence_style: ChannelMonitorUpdateStatus,
	deferred: bool,
	serialized_manager: Vec<u8>,
	serialized_manager_generation: u64,
	height: u32,
	last_htlc_clear_fee: u32,
}
Expand DownExpand Up@@ -917,6 +918,7 @@ impl<'a> HarnessNode<'a> {
 persistence_style,
 deferred,
 serialized_manager: Vec::new(),
 serialized_manager_generation: 0,
 height: 0,
 last_htlc_clear_fee: 253,
 }
Expand DownExpand Up@@ -976,6 +978,7 @@ impl<'a> HarnessNode<'a> {
 if self.node.get_and_clear_needs_persistence() {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
 } else {
Expand All@@ -991,6 +994,7 @@ impl<'a> HarnessNode<'a> {
	fn force_checkpoint_manager_persistence(&mut self) {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 self.node.get_and_clear_needs_persistence();
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
Expand All@@ -999,6 +1003,10 @@ impl<'a> HarnessNode<'a> {
 }
	}

	fn next_manager_persistence_generation(&self) -> u64 {
 self.serialized_manager_generation + 1
	}

	fn bump_fee_estimate(&mut self, chan_type: ChanType) {
 let mut max_feerate = self.last_htlc_clear_fee;
 if matches!(chan_type, ChanType::Legacy) {
Expand DownExpand Up@@ -1098,7 +1106,8 @@ impl<'a> HarnessNode<'a> {

	fn reload<Out: Output + MaybeSend + MaybeSync>(
 &mut self, use_old_mons: u8, out: &Out, router: &'a FuzzRouter, chan_type: ChanType,
	) {
	) -> u64 {
 let loaded_manager_generation = self.serialized_manager_generation;
 let logger = Self::build_logger(self.node_id, out);
 let persister = Self::build_persister(self.persistence_style);
 let chain_monitor = Self::build_chain_monitor(
Expand DownExpand Up@@ -1170,6 +1179,7 @@ impl<'a> HarnessNode<'a> {
 // even if the reloaded ChannelManager does not need persistence. Always checkpoint here so
 // those registrations can be flushed against the manager snapshot they belong to.
 self.force_checkpoint_manager_persistence();
 loaded_manager_generation
	}
}

Expand DownExpand Up@@ -1476,15 +1486,79 @@ impl PeerLink {
	}
}

struct PendingPayment {
	payment_id: PaymentId,
	payment_hash: PaymentHash,
	first_persisted_manager_generation: u64,
}

struct NodePayments {
	pending: Vec<PaymentId>,
	pending: Vec<PendingPayment>,
	resolved: HashMap<PaymentId, Option<PaymentHash>>,
}

impl NodePayments {
	fn new() -> Self {
 Self { pending: Vec::new(), resolved: new_hash_map() }
	}

	fn add_pending(
 &mut self, payment_id: PaymentId, payment_hash: PaymentHash,
 first_persisted_manager_generation: u64,
	) {
 self.pending.push(PendingPayment {
 payment_id,
 payment_hash,
 first_persisted_manager_generation,
 });
	}

	fn mark_sent(&mut self, sent_id: PaymentId, payment_hash: PaymentHash) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == sent_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(self.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else if !self.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 self.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else {
 assert!(self.resolved.contains_key(&payment_id));
 }
	}

	fn sync_pending_with_manager_generation(
 &mut self, loaded_manager_generation: u64,
	) -> Vec<PaymentHash> {
 let mut rolled_back_payment_hashes = Vec::new();
 let pending = mem::take(&mut self.pending);
 for pending_payment in pending {
 if pending_payment.first_persisted_manager_generation > loaded_manager_generation {
 rolled_back_payment_hashes.push(pending_payment.payment_hash);
 } else {
 self.pending.push(pending_payment);
 }
 }
 rolled_back_payment_hashes
	}
}

struct PaymentTracker {
Expand DownExpand Up@@ -1590,7 +1664,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
 succeeded
	}
Expand DownExpand Up@@ -1667,7 +1745,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1736,7 +1818,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1836,7 +1922,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand All@@ -1853,41 +1943,6 @@ impl PaymentTracker {
 }
	}

	fn mark_sent(&mut self, node_idx: usize, sent_id: PaymentId, payment_hash: PaymentHash) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == sent_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(node.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else if !node.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 node.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else {
 assert!(node.resolved.contains_key(&payment_id));
 }
	}

	fn assert_all_resolved(&self) {
 for (idx, node) in self.nodes.iter().enumerate() {
 assert!(
Expand DownExpand Up@@ -2725,17 +2780,17 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }
 },
 events::Event::PaymentSent { payment_id, payment_hash, .. } => {
 payments.mark_sent(node_idx, payment_id.unwrap(), payment_hash);
 payments.nodes[node_idx].mark_sent(payment_id.unwrap(), payment_hash);
 },
 // Even though we don't explicitly send probes, because probes are detected based on
 // hashing the payment hash+preimage, it is rather trivial for the fuzzer to build
 // payments that accidentally end up looking like probes.
 events::Event::ProbeSuccessful { payment_id, .. } => {
 payments.mark_successful_probe(node_idx, payment_id);
 payments.nodes[node_idx].mark_successful_probe(payment_id);
 },
 events::Event::PaymentFailed { payment_id, .. }
 | events::Event::ProbeFailed { payment_id, .. } => {
 payments.mark_resolved_without_hash(node_idx, payment_id);
 payments.nodes[node_idx].mark_resolved_without_hash(payment_id);
 },
 events::Event::PaymentClaimed { .. } => {},
 events::Event::PaymentPathSuccessful { .. } => {},
Expand DownExpand Up@@ -2860,6 +2915,9 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
	}

	fn restart_node(&mut self, node_idx: usize, v: u8, router: &'a FuzzRouter) {
 if !self.nodes[node_idx].deferred {
 self.nodes[node_idx].checkpoint_manager_persistence();
 }
 match node_idx {
 0 => {
 self.ab_link.disconnect_for_reload(0, &self.nodes, &mut self.queues);
Expand All@@ -2873,7 +2931,13 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 _ => panic!("invalid node index"),
 }
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let loaded_manager_generation =
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let rolled_back_payment_hashes = self.payments.nodes[node_idx]
 .sync_pending_with_manager_generation(loaded_manager_generation);
 for payment_hash in rolled_back_payment_hashes {
 self.payments.claimed_payment_hashes.remove(&payment_hash);
 }
	}

	fn settle_all(&mut self) {
Expand DownExpand Up@@ -3116,6 +3180,16 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 0x88 => harness.nodes[2].bump_fee_estimate(harness.chan_type),
 0x89 => harness.nodes[2].reset_fee_estimate(),

 0x90 => {
 harness.nodes[0].checkpoint_manager_persistence();
 },
 0x91 => {
 harness.nodes[1].checkpoint_manager_persistence();
 },
 0x92 => {
 harness.nodes[2].checkpoint_manager_persistence();
 },

 0xa0 => {
 if !cfg!(splicing) {
 break 'fuzz_loop;
Expand DownExpand Up@@ -3370,8 +3444,6 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 },
 _ => break 'fuzz_loop,
 }

 harness.checkpoint_manager_persistences();
	}
	harness.finish();
}
Expand Down
Loading

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

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

TheBlueMatt
merged 3 commits into

from

May 24, 2026
 Merged


fuzz: add explicit chanmon manager persistence commands
#4631
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b33526e

Add explicit chanmon manager persistence commands


joostjager May 21, 2026
bbeba3e

Refactor chanmon payment tracker helpers


joostjager May 22, 2026
c18fab5

Track chanmon payment persistence generations


joostjager May 22, 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


166 changes: 119 additions & 47 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -819,6 +819,7 @@ struct HarnessNode<'a> {
	persistence_style: ChannelMonitorUpdateStatus,
	deferred: bool,
	serialized_manager: Vec<u8>,
	serialized_manager_generation: u64,
	height: u32,
	last_htlc_clear_fee: u32,
}
Expand DownExpand Up@@ -917,6 +918,7 @@ impl<'a> HarnessNode<'a> {
 persistence_style,
 deferred,
 serialized_manager: Vec::new(),
 serialized_manager_generation: 0,
 height: 0,
 last_htlc_clear_fee: 253,
 }
Expand DownExpand Up@@ -976,6 +978,7 @@ impl<'a> HarnessNode<'a> {
 if self.node.get_and_clear_needs_persistence() {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
 } else {
Expand All@@ -991,6 +994,7 @@ impl<'a> HarnessNode<'a> {
	fn force_checkpoint_manager_persistence(&mut self) {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 self.node.get_and_clear_needs_persistence();
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
Expand All@@ -999,6 +1003,10 @@ impl<'a> HarnessNode<'a> {
 }
	}

	fn next_manager_persistence_generation(&self) -> u64 {
 self.serialized_manager_generation + 1
	}

	fn bump_fee_estimate(&mut self, chan_type: ChanType) {
 let mut max_feerate = self.last_htlc_clear_fee;
 if matches!(chan_type, ChanType::Legacy) {
Expand DownExpand Up@@ -1098,7 +1106,8 @@ impl<'a> HarnessNode<'a> {

	fn reload<Out: Output + MaybeSend + MaybeSync>(
 &mut self, use_old_mons: u8, out: &Out, router: &'a FuzzRouter, chan_type: ChanType,
	) {
	) -> u64 {
 let loaded_manager_generation = self.serialized_manager_generation;
 let logger = Self::build_logger(self.node_id, out);
 let persister = Self::build_persister(self.persistence_style);
 let chain_monitor = Self::build_chain_monitor(
Expand DownExpand Up@@ -1170,6 +1179,7 @@ impl<'a> HarnessNode<'a> {
 // even if the reloaded ChannelManager does not need persistence. Always checkpoint here so
 // those registrations can be flushed against the manager snapshot they belong to.
 self.force_checkpoint_manager_persistence();
 loaded_manager_generation
	}
}

Expand DownExpand Up@@ -1476,15 +1486,79 @@ impl PeerLink {
	}
}

struct PendingPayment {
	payment_id: PaymentId,
	payment_hash: PaymentHash,
	first_persisted_manager_generation: u64,
}

struct NodePayments {
	pending: Vec<PaymentId>,
	pending: Vec<PendingPayment>,
	resolved: HashMap<PaymentId, Option<PaymentHash>>,
}

impl NodePayments {
	fn new() -> Self {
 Self { pending: Vec::new(), resolved: new_hash_map() }
	}

	fn add_pending(
 &mut self, payment_id: PaymentId, payment_hash: PaymentHash,
 first_persisted_manager_generation: u64,
	) {
 self.pending.push(PendingPayment {
 payment_id,
 payment_hash,
 first_persisted_manager_generation,
 });
	}

	fn mark_sent(&mut self, sent_id: PaymentId, payment_hash: PaymentHash) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == sent_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(self.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else if !self.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 self.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else {
 assert!(self.resolved.contains_key(&payment_id));
 }
	}

	fn sync_pending_with_manager_generation(
 &mut self, loaded_manager_generation: u64,
	) -> Vec<PaymentHash> {
 let mut rolled_back_payment_hashes = Vec::new();
 let pending = mem::take(&mut self.pending);
 for pending_payment in pending {
 if pending_payment.first_persisted_manager_generation > loaded_manager_generation {
 rolled_back_payment_hashes.push(pending_payment.payment_hash);
 } else {
 self.pending.push(pending_payment);
 }
 }
 rolled_back_payment_hashes
	}
}

struct PaymentTracker {
Expand DownExpand Up@@ -1590,7 +1664,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
 succeeded
	}
Expand DownExpand Up@@ -1667,7 +1745,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1736,7 +1818,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1836,7 +1922,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand All@@ -1853,41 +1943,6 @@ impl PaymentTracker {
 }
	}

	fn mark_sent(&mut self, node_idx: usize, sent_id: PaymentId, payment_hash: PaymentHash) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == sent_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(node.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else if !node.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 node.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else {
 assert!(node.resolved.contains_key(&payment_id));
 }
	}

	fn assert_all_resolved(&self) {
 for (idx, node) in self.nodes.iter().enumerate() {
 assert!(
Expand DownExpand Up@@ -2725,17 +2780,17 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }
 },
 events::Event::PaymentSent { payment_id, payment_hash, .. } => {
 payments.mark_sent(node_idx, payment_id.unwrap(), payment_hash);
 payments.nodes[node_idx].mark_sent(payment_id.unwrap(), payment_hash);
 },
 // Even though we don't explicitly send probes, because probes are detected based on
 // hashing the payment hash+preimage, it is rather trivial for the fuzzer to build
 // payments that accidentally end up looking like probes.
 events::Event::ProbeSuccessful { payment_id, .. } => {
 payments.mark_successful_probe(node_idx, payment_id);
 payments.nodes[node_idx].mark_successful_probe(payment_id);
 },
 events::Event::PaymentFailed { payment_id, .. }
 | events::Event::ProbeFailed { payment_id, .. } => {
 payments.mark_resolved_without_hash(node_idx, payment_id);
 payments.nodes[node_idx].mark_resolved_without_hash(payment_id);
 },
 events::Event::PaymentClaimed { .. } => {},
 events::Event::PaymentPathSuccessful { .. } => {},
Expand DownExpand Up@@ -2860,6 +2915,9 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
	}

	fn restart_node(&mut self, node_idx: usize, v: u8, router: &'a FuzzRouter) {
 if !self.nodes[node_idx].deferred {
 self.nodes[node_idx].checkpoint_manager_persistence();
 }
 match node_idx {
 0 => {
 self.ab_link.disconnect_for_reload(0, &self.nodes, &mut self.queues);
Expand All@@ -2873,7 +2931,13 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 _ => panic!("invalid node index"),
 }
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let loaded_manager_generation =
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let rolled_back_payment_hashes = self.payments.nodes[node_idx]
 .sync_pending_with_manager_generation(loaded_manager_generation);
 for payment_hash in rolled_back_payment_hashes {
 self.payments.claimed_payment_hashes.remove(&payment_hash);
 }
	}

	fn settle_all(&mut self) {
Expand DownExpand Up@@ -3116,6 +3180,16 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 0x88 => harness.nodes[2].bump_fee_estimate(harness.chan_type),
 0x89 => harness.nodes[2].reset_fee_estimate(),

 0x90 => {
 harness.nodes[0].checkpoint_manager_persistence();
 },
 0x91 => {
 harness.nodes[1].checkpoint_manager_persistence();
 },
 0x92 => {
 harness.nodes[2].checkpoint_manager_persistence();
 },

 0xa0 => {
 if !cfg!(splicing) {
 break 'fuzz_loop;
Expand DownExpand Up@@ -3370,8 +3444,6 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 },
 _ => break 'fuzz_loop,
 }

 harness.checkpoint_manager_persistences();
	}
	harness.finish();
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fuzz: add explicit chanmon manager persistence commands by joostjager · Pull Request #4631 · lightningdevkit/rust-lightning · GitHub
Skip to content
fuzz: add explicit chanmon manager persistence commands#4631

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

TheBlueMatt
merged 3 commits into

from

May 24, 2026
 Merged


fuzz: add explicit chanmon manager persistence commands
#4631
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b33526e

Add explicit chanmon manager persistence commands


joostjager May 21, 2026
bbeba3e

Refactor chanmon payment tracker helpers


joostjager May 22, 2026
c18fab5

Track chanmon payment persistence generations


joostjager May 22, 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


166 changes: 119 additions & 47 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -819,6 +819,7 @@ struct HarnessNode<'a> {
	persistence_style: ChannelMonitorUpdateStatus,
	deferred: bool,
	serialized_manager: Vec<u8>,
	serialized_manager_generation: u64,
	height: u32,
	last_htlc_clear_fee: u32,
}
Expand DownExpand Up@@ -917,6 +918,7 @@ impl<'a> HarnessNode<'a> {
 persistence_style,
 deferred,
 serialized_manager: Vec::new(),
 serialized_manager_generation: 0,
 height: 0,
 last_htlc_clear_fee: 253,
 }
Expand DownExpand Up@@ -976,6 +978,7 @@ impl<'a> HarnessNode<'a> {
 if self.node.get_and_clear_needs_persistence() {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
 } else {
Expand All@@ -991,6 +994,7 @@ impl<'a> HarnessNode<'a> {
	fn force_checkpoint_manager_persistence(&mut self) {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 self.node.get_and_clear_needs_persistence();
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
Expand All@@ -999,6 +1003,10 @@ impl<'a> HarnessNode<'a> {
 }
	}

	fn next_manager_persistence_generation(&self) -> u64 {
 self.serialized_manager_generation + 1
	}

	fn bump_fee_estimate(&mut self, chan_type: ChanType) {
 let mut max_feerate = self.last_htlc_clear_fee;
 if matches!(chan_type, ChanType::Legacy) {
Expand DownExpand Up@@ -1098,7 +1106,8 @@ impl<'a> HarnessNode<'a> {

	fn reload<Out: Output + MaybeSend + MaybeSync>(
 &mut self, use_old_mons: u8, out: &Out, router: &'a FuzzRouter, chan_type: ChanType,
	) {
	) -> u64 {
 let loaded_manager_generation = self.serialized_manager_generation;
 let logger = Self::build_logger(self.node_id, out);
 let persister = Self::build_persister(self.persistence_style);
 let chain_monitor = Self::build_chain_monitor(
Expand DownExpand Up@@ -1170,6 +1179,7 @@ impl<'a> HarnessNode<'a> {
 // even if the reloaded ChannelManager does not need persistence. Always checkpoint here so
 // those registrations can be flushed against the manager snapshot they belong to.
 self.force_checkpoint_manager_persistence();
 loaded_manager_generation
	}
}

Expand DownExpand Up@@ -1476,15 +1486,79 @@ impl PeerLink {
	}
}

struct PendingPayment {
	payment_id: PaymentId,
	payment_hash: PaymentHash,
	first_persisted_manager_generation: u64,
}

struct NodePayments {
	pending: Vec<PaymentId>,
	pending: Vec<PendingPayment>,
	resolved: HashMap<PaymentId, Option<PaymentHash>>,
}

impl NodePayments {
	fn new() -> Self {
 Self { pending: Vec::new(), resolved: new_hash_map() }
	}

	fn add_pending(
 &mut self, payment_id: PaymentId, payment_hash: PaymentHash,
 first_persisted_manager_generation: u64,
	) {
 self.pending.push(PendingPayment {
 payment_id,
 payment_hash,
 first_persisted_manager_generation,
 });
	}

	fn mark_sent(&mut self, sent_id: PaymentId, payment_hash: PaymentHash) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == sent_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(self.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else if !self.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 self.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else {
 assert!(self.resolved.contains_key(&payment_id));
 }
	}

	fn sync_pending_with_manager_generation(
 &mut self, loaded_manager_generation: u64,
	) -> Vec<PaymentHash> {
 let mut rolled_back_payment_hashes = Vec::new();
 let pending = mem::take(&mut self.pending);
 for pending_payment in pending {
 if pending_payment.first_persisted_manager_generation > loaded_manager_generation {
 rolled_back_payment_hashes.push(pending_payment.payment_hash);
 } else {
 self.pending.push(pending_payment);
 }
 }
 rolled_back_payment_hashes
	}
}

struct PaymentTracker {
Expand DownExpand Up@@ -1590,7 +1664,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
 succeeded
	}
Expand DownExpand Up@@ -1667,7 +1745,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1736,7 +1818,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1836,7 +1922,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand All@@ -1853,41 +1943,6 @@ impl PaymentTracker {
 }
	}

	fn mark_sent(&mut self, node_idx: usize, sent_id: PaymentId, payment_hash: PaymentHash) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == sent_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(node.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else if !node.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 node.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else {
 assert!(node.resolved.contains_key(&payment_id));
 }
	}

	fn assert_all_resolved(&self) {
 for (idx, node) in self.nodes.iter().enumerate() {
 assert!(
Expand DownExpand Up@@ -2725,17 +2780,17 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }
 },
 events::Event::PaymentSent { payment_id, payment_hash, .. } => {
 payments.mark_sent(node_idx, payment_id.unwrap(), payment_hash);
 payments.nodes[node_idx].mark_sent(payment_id.unwrap(), payment_hash);
 },
 // Even though we don't explicitly send probes, because probes are detected based on
 // hashing the payment hash+preimage, it is rather trivial for the fuzzer to build
 // payments that accidentally end up looking like probes.
 events::Event::ProbeSuccessful { payment_id, .. } => {
 payments.mark_successful_probe(node_idx, payment_id);
 payments.nodes[node_idx].mark_successful_probe(payment_id);
 },
 events::Event::PaymentFailed { payment_id, .. }
 | events::Event::ProbeFailed { payment_id, .. } => {
 payments.mark_resolved_without_hash(node_idx, payment_id);
 payments.nodes[node_idx].mark_resolved_without_hash(payment_id);
 },
 events::Event::PaymentClaimed { .. } => {},
 events::Event::PaymentPathSuccessful { .. } => {},
Expand DownExpand Up@@ -2860,6 +2915,9 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
	}

	fn restart_node(&mut self, node_idx: usize, v: u8, router: &'a FuzzRouter) {
 if !self.nodes[node_idx].deferred {
 self.nodes[node_idx].checkpoint_manager_persistence();
 }
 match node_idx {
 0 => {
 self.ab_link.disconnect_for_reload(0, &self.nodes, &mut self.queues);
Expand All@@ -2873,7 +2931,13 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 _ => panic!("invalid node index"),
 }
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let loaded_manager_generation =
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let rolled_back_payment_hashes = self.payments.nodes[node_idx]
 .sync_pending_with_manager_generation(loaded_manager_generation);
 for payment_hash in rolled_back_payment_hashes {
 self.payments.claimed_payment_hashes.remove(&payment_hash);
 }
	}

	fn settle_all(&mut self) {
Expand DownExpand Up@@ -3116,6 +3180,16 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 0x88 => harness.nodes[2].bump_fee_estimate(harness.chan_type),
 0x89 => harness.nodes[2].reset_fee_estimate(),

 0x90 => {
 harness.nodes[0].checkpoint_manager_persistence();
 },
 0x91 => {
 harness.nodes[1].checkpoint_manager_persistence();
 },
 0x92 => {
 harness.nodes[2].checkpoint_manager_persistence();
 },

 0xa0 => {
 if !cfg!(splicing) {
 break 'fuzz_loop;
Expand DownExpand Up@@ -3370,8 +3444,6 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 },
 _ => break 'fuzz_loop,
 }

 harness.checkpoint_manager_persistences();
	}
	harness.finish();
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fuzz: add explicit chanmon manager persistence commands by joostjager · Pull Request #4631 · lightningdevkit/rust-lightning · GitHub
Skip to content
fuzz: add explicit chanmon manager persistence commands#4631

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

TheBlueMatt
merged 3 commits into

from

May 24, 2026
 Merged


fuzz: add explicit chanmon manager persistence commands
#4631
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b33526e

Add explicit chanmon manager persistence commands


joostjager May 21, 2026
bbeba3e

Refactor chanmon payment tracker helpers


joostjager May 22, 2026
c18fab5

Track chanmon payment persistence generations


joostjager May 22, 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


166 changes: 119 additions & 47 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -819,6 +819,7 @@ struct HarnessNode<'a> {
	persistence_style: ChannelMonitorUpdateStatus,
	deferred: bool,
	serialized_manager: Vec<u8>,
	serialized_manager_generation: u64,
	height: u32,
	last_htlc_clear_fee: u32,
}
Expand DownExpand Up@@ -917,6 +918,7 @@ impl<'a> HarnessNode<'a> {
 persistence_style,
 deferred,
 serialized_manager: Vec::new(),
 serialized_manager_generation: 0,
 height: 0,
 last_htlc_clear_fee: 253,
 }
Expand DownExpand Up@@ -976,6 +978,7 @@ impl<'a> HarnessNode<'a> {
 if self.node.get_and_clear_needs_persistence() {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
 } else {
Expand All@@ -991,6 +994,7 @@ impl<'a> HarnessNode<'a> {
	fn force_checkpoint_manager_persistence(&mut self) {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 self.node.get_and_clear_needs_persistence();
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
Expand All@@ -999,6 +1003,10 @@ impl<'a> HarnessNode<'a> {
 }
	}

	fn next_manager_persistence_generation(&self) -> u64 {
 self.serialized_manager_generation + 1
	}

	fn bump_fee_estimate(&mut self, chan_type: ChanType) {
 let mut max_feerate = self.last_htlc_clear_fee;
 if matches!(chan_type, ChanType::Legacy) {
Expand DownExpand Up@@ -1098,7 +1106,8 @@ impl<'a> HarnessNode<'a> {

	fn reload<Out: Output + MaybeSend + MaybeSync>(
 &mut self, use_old_mons: u8, out: &Out, router: &'a FuzzRouter, chan_type: ChanType,
	) {
	) -> u64 {
 let loaded_manager_generation = self.serialized_manager_generation;
 let logger = Self::build_logger(self.node_id, out);
 let persister = Self::build_persister(self.persistence_style);
 let chain_monitor = Self::build_chain_monitor(
Expand DownExpand Up@@ -1170,6 +1179,7 @@ impl<'a> HarnessNode<'a> {
 // even if the reloaded ChannelManager does not need persistence. Always checkpoint here so
 // those registrations can be flushed against the manager snapshot they belong to.
 self.force_checkpoint_manager_persistence();
 loaded_manager_generation
	}
}

Expand DownExpand Up@@ -1476,15 +1486,79 @@ impl PeerLink {
	}
}

struct PendingPayment {
	payment_id: PaymentId,
	payment_hash: PaymentHash,
	first_persisted_manager_generation: u64,
}

struct NodePayments {
	pending: Vec<PaymentId>,
	pending: Vec<PendingPayment>,
	resolved: HashMap<PaymentId, Option<PaymentHash>>,
}

impl NodePayments {
	fn new() -> Self {
 Self { pending: Vec::new(), resolved: new_hash_map() }
	}

	fn add_pending(
 &mut self, payment_id: PaymentId, payment_hash: PaymentHash,
 first_persisted_manager_generation: u64,
	) {
 self.pending.push(PendingPayment {
 payment_id,
 payment_hash,
 first_persisted_manager_generation,
 });
	}

	fn mark_sent(&mut self, sent_id: PaymentId, payment_hash: PaymentHash) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == sent_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(self.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else if !self.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 self.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else {
 assert!(self.resolved.contains_key(&payment_id));
 }
	}

	fn sync_pending_with_manager_generation(
 &mut self, loaded_manager_generation: u64,
	) -> Vec<PaymentHash> {
 let mut rolled_back_payment_hashes = Vec::new();
 let pending = mem::take(&mut self.pending);
 for pending_payment in pending {
 if pending_payment.first_persisted_manager_generation > loaded_manager_generation {
 rolled_back_payment_hashes.push(pending_payment.payment_hash);
 } else {
 self.pending.push(pending_payment);
 }
 }
 rolled_back_payment_hashes
	}
}

struct PaymentTracker {
Expand DownExpand Up@@ -1590,7 +1664,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
 succeeded
	}
Expand DownExpand Up@@ -1667,7 +1745,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1736,7 +1818,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1836,7 +1922,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand All@@ -1853,41 +1943,6 @@ impl PaymentTracker {
 }
	}

	fn mark_sent(&mut self, node_idx: usize, sent_id: PaymentId, payment_hash: PaymentHash) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == sent_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(node.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else if !node.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 node.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else {
 assert!(node.resolved.contains_key(&payment_id));
 }
	}

	fn assert_all_resolved(&self) {
 for (idx, node) in self.nodes.iter().enumerate() {
 assert!(
Expand DownExpand Up@@ -2725,17 +2780,17 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }
 },
 events::Event::PaymentSent { payment_id, payment_hash, .. } => {
 payments.mark_sent(node_idx, payment_id.unwrap(), payment_hash);
 payments.nodes[node_idx].mark_sent(payment_id.unwrap(), payment_hash);
 },
 // Even though we don't explicitly send probes, because probes are detected based on
 // hashing the payment hash+preimage, it is rather trivial for the fuzzer to build
 // payments that accidentally end up looking like probes.
 events::Event::ProbeSuccessful { payment_id, .. } => {
 payments.mark_successful_probe(node_idx, payment_id);
 payments.nodes[node_idx].mark_successful_probe(payment_id);
 },
 events::Event::PaymentFailed { payment_id, .. }
 | events::Event::ProbeFailed { payment_id, .. } => {
 payments.mark_resolved_without_hash(node_idx, payment_id);
 payments.nodes[node_idx].mark_resolved_without_hash(payment_id);
 },
 events::Event::PaymentClaimed { .. } => {},
 events::Event::PaymentPathSuccessful { .. } => {},
Expand DownExpand Up@@ -2860,6 +2915,9 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
	}

	fn restart_node(&mut self, node_idx: usize, v: u8, router: &'a FuzzRouter) {
 if !self.nodes[node_idx].deferred {
 self.nodes[node_idx].checkpoint_manager_persistence();
 }
 match node_idx {
 0 => {
 self.ab_link.disconnect_for_reload(0, &self.nodes, &mut self.queues);
Expand All@@ -2873,7 +2931,13 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 _ => panic!("invalid node index"),
 }
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let loaded_manager_generation =
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let rolled_back_payment_hashes = self.payments.nodes[node_idx]
 .sync_pending_with_manager_generation(loaded_manager_generation);
 for payment_hash in rolled_back_payment_hashes {
 self.payments.claimed_payment_hashes.remove(&payment_hash);
 }
	}

	fn settle_all(&mut self) {
Expand DownExpand Up@@ -3116,6 +3180,16 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 0x88 => harness.nodes[2].bump_fee_estimate(harness.chan_type),
 0x89 => harness.nodes[2].reset_fee_estimate(),

 0x90 => {
 harness.nodes[0].checkpoint_manager_persistence();
 },
 0x91 => {
 harness.nodes[1].checkpoint_manager_persistence();
 },
 0x92 => {
 harness.nodes[2].checkpoint_manager_persistence();
 },

 0xa0 => {
 if !cfg!(splicing) {
 break 'fuzz_loop;
Expand DownExpand Up@@ -3370,8 +3444,6 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 },
 _ => break 'fuzz_loop,
 }

 harness.checkpoint_manager_persistences();
	}
	harness.finish();
}
Expand Down
Loading

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

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

TheBlueMatt
merged 3 commits into

from

May 24, 2026
 Merged


fuzz: add explicit chanmon manager persistence commands
#4631
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b33526e

Add explicit chanmon manager persistence commands


joostjager May 21, 2026
bbeba3e

Refactor chanmon payment tracker helpers


joostjager May 22, 2026
c18fab5

Track chanmon payment persistence generations


joostjager May 22, 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


166 changes: 119 additions & 47 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -819,6 +819,7 @@ struct HarnessNode<'a> {
	persistence_style: ChannelMonitorUpdateStatus,
	deferred: bool,
	serialized_manager: Vec<u8>,
	serialized_manager_generation: u64,
	height: u32,
	last_htlc_clear_fee: u32,
}
Expand DownExpand Up@@ -917,6 +918,7 @@ impl<'a> HarnessNode<'a> {
 persistence_style,
 deferred,
 serialized_manager: Vec::new(),
 serialized_manager_generation: 0,
 height: 0,
 last_htlc_clear_fee: 253,
 }
Expand DownExpand Up@@ -976,6 +978,7 @@ impl<'a> HarnessNode<'a> {
 if self.node.get_and_clear_needs_persistence() {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
 } else {
Expand All@@ -991,6 +994,7 @@ impl<'a> HarnessNode<'a> {
	fn force_checkpoint_manager_persistence(&mut self) {
 let pending_monitor_writes = self.monitor.pending_operation_count();
 self.serialized_manager = self.node.encode();
 self.serialized_manager_generation += 1;
 self.node.get_and_clear_needs_persistence();
 if self.deferred {
 self.monitor.flush(pending_monitor_writes, &self.logger);
Expand All@@ -999,6 +1003,10 @@ impl<'a> HarnessNode<'a> {
 }
	}

	fn next_manager_persistence_generation(&self) -> u64 {
 self.serialized_manager_generation + 1
	}

	fn bump_fee_estimate(&mut self, chan_type: ChanType) {
 let mut max_feerate = self.last_htlc_clear_fee;
 if matches!(chan_type, ChanType::Legacy) {
Expand DownExpand Up@@ -1098,7 +1106,8 @@ impl<'a> HarnessNode<'a> {

	fn reload<Out: Output + MaybeSend + MaybeSync>(
 &mut self, use_old_mons: u8, out: &Out, router: &'a FuzzRouter, chan_type: ChanType,
	) {
	) -> u64 {
 let loaded_manager_generation = self.serialized_manager_generation;
 let logger = Self::build_logger(self.node_id, out);
 let persister = Self::build_persister(self.persistence_style);
 let chain_monitor = Self::build_chain_monitor(
Expand DownExpand Up@@ -1170,6 +1179,7 @@ impl<'a> HarnessNode<'a> {
 // even if the reloaded ChannelManager does not need persistence. Always checkpoint here so
 // those registrations can be flushed against the manager snapshot they belong to.
 self.force_checkpoint_manager_persistence();
 loaded_manager_generation
	}
}

Expand DownExpand Up@@ -1476,15 +1486,79 @@ impl PeerLink {
	}
}

struct PendingPayment {
	payment_id: PaymentId,
	payment_hash: PaymentHash,
	first_persisted_manager_generation: u64,
}

struct NodePayments {
	pending: Vec<PaymentId>,
	pending: Vec<PendingPayment>,
	resolved: HashMap<PaymentId, Option<PaymentHash>>,
}

impl NodePayments {
	fn new() -> Self {
 Self { pending: Vec::new(), resolved: new_hash_map() }
	}

	fn add_pending(
 &mut self, payment_id: PaymentId, payment_hash: PaymentHash,
 first_persisted_manager_generation: u64,
	) {
 self.pending.push(PendingPayment {
 payment_id,
 payment_hash,
 first_persisted_manager_generation,
 });
	}

	fn mark_sent(&mut self, sent_id: PaymentId, payment_hash: PaymentHash) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == sent_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(self.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else if !self.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 self.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, payment_id: PaymentId) {
 let idx_opt = self.pending.iter().position(|pending| pending.payment_id == payment_id);
 if let Some(idx) = idx_opt {
 self.pending.remove(idx);
 self.resolved.insert(payment_id, None);
 } else {
 assert!(self.resolved.contains_key(&payment_id));
 }
	}

	fn sync_pending_with_manager_generation(
 &mut self, loaded_manager_generation: u64,
	) -> Vec<PaymentHash> {
 let mut rolled_back_payment_hashes = Vec::new();
 let pending = mem::take(&mut self.pending);
 for pending_payment in pending {
 if pending_payment.first_persisted_manager_generation > loaded_manager_generation {
 rolled_back_payment_hashes.push(pending_payment.payment_hash);
 } else {
 self.pending.push(pending_payment);
 }
 }
 rolled_back_payment_hashes
	}
}

struct PaymentTracker {
Expand DownExpand Up@@ -1590,7 +1664,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
 succeeded
	}
Expand DownExpand Up@@ -1667,7 +1745,11 @@ impl PaymentTracker {
 },
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1736,7 +1818,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand DownExpand Up@@ -1836,7 +1922,11 @@ impl PaymentTracker {
 Ok(()) => Self::check_payment_send_events(source, id),
 };
 if succeeded {
 self.nodes[source_idx].pending.push(id);
 self.nodes[source_idx].add_pending(
 id,
 hash,
 source.next_manager_persistence_generation(),
 );
 }
	}

Expand All@@ -1853,41 +1943,6 @@ impl PaymentTracker {
 }
	}

	fn mark_sent(&mut self, node_idx: usize, sent_id: PaymentId, payment_hash: PaymentHash) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == sent_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(sent_id, Some(payment_hash));
 } else {
 assert!(node.resolved.contains_key(&sent_id));
 }
	}

	fn mark_resolved_without_hash(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else if !node.resolved.contains_key(&payment_id) {
 // Some resolutions can arrive immediately, before the send helper records
 // the payment as pending. Track them so later duplicate events are accepted.
 node.resolved.insert(payment_id, None);
 }
	}

	fn mark_successful_probe(&mut self, node_idx: usize, payment_id: PaymentId) {
 let node = &mut self.nodes[node_idx];
 let idx_opt = node.pending.iter().position(|id| *id == payment_id);
 if let Some(idx) = idx_opt {
 node.pending.remove(idx);
 node.resolved.insert(payment_id, None);
 } else {
 assert!(node.resolved.contains_key(&payment_id));
 }
	}

	fn assert_all_resolved(&self) {
 for (idx, node) in self.nodes.iter().enumerate() {
 assert!(
Expand DownExpand Up@@ -2725,17 +2780,17 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 }
 },
 events::Event::PaymentSent { payment_id, payment_hash, .. } => {
 payments.mark_sent(node_idx, payment_id.unwrap(), payment_hash);
 payments.nodes[node_idx].mark_sent(payment_id.unwrap(), payment_hash);
 },
 // Even though we don't explicitly send probes, because probes are detected based on
 // hashing the payment hash+preimage, it is rather trivial for the fuzzer to build
 // payments that accidentally end up looking like probes.
 events::Event::ProbeSuccessful { payment_id, .. } => {
 payments.mark_successful_probe(node_idx, payment_id);
 payments.nodes[node_idx].mark_successful_probe(payment_id);
 },
 events::Event::PaymentFailed { payment_id, .. }
 | events::Event::ProbeFailed { payment_id, .. } => {
 payments.mark_resolved_without_hash(node_idx, payment_id);
 payments.nodes[node_idx].mark_resolved_without_hash(payment_id);
 },
 events::Event::PaymentClaimed { .. } => {},
 events::Event::PaymentPathSuccessful { .. } => {},
Expand DownExpand Up@@ -2860,6 +2915,9 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
	}

	fn restart_node(&mut self, node_idx: usize, v: u8, router: &'a FuzzRouter) {
 if !self.nodes[node_idx].deferred {
 self.nodes[node_idx].checkpoint_manager_persistence();
 }
 match node_idx {
 0 => {
 self.ab_link.disconnect_for_reload(0, &self.nodes, &mut self.queues);
Expand All@@ -2873,7 +2931,13 @@ impl<'a, Out: Output + MaybeSend + MaybeSync> Harness<'a, Out> {
 },
 _ => panic!("invalid node index"),
 }
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let loaded_manager_generation =
 self.nodes[node_idx].reload(v, &self.out, router, self.chan_type);
 let rolled_back_payment_hashes = self.payments.nodes[node_idx]
 .sync_pending_with_manager_generation(loaded_manager_generation);
 for payment_hash in rolled_back_payment_hashes {
 self.payments.claimed_payment_hashes.remove(&payment_hash);
 }
	}

	fn settle_all(&mut self) {
Expand DownExpand Up@@ -3116,6 +3180,16 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 0x88 => harness.nodes[2].bump_fee_estimate(harness.chan_type),
 0x89 => harness.nodes[2].reset_fee_estimate(),

 0x90 => {
 harness.nodes[0].checkpoint_manager_persistence();
 },
 0x91 => {
 harness.nodes[1].checkpoint_manager_persistence();
 },
 0x92 => {
 harness.nodes[2].checkpoint_manager_persistence();
 },

 0xa0 => {
 if !cfg!(splicing) {
 break 'fuzz_loop;
Expand DownExpand Up@@ -3370,8 +3444,6 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
 },
 _ => break 'fuzz_loop,
 }

 harness.checkpoint_manager_persistences();
	}
	harness.finish();
}
Expand Down
Loading