Skip to content

Commit a067ae8

Browse files
Fix PendingHTLCsForwardable generation on deser
1 parent 137b77c commit a067ae8

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

lightning/src/ln/channelmanager.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7515,7 +7515,16 @@ where
75157515
}
75167516
}
75177517

7518-
if !forward_htlcs.is_empty() {
7518+
let mut forward_ev_exists = false;
7519+
let mut intercept_count = 0;
7520+
for ev in &pending_events_read {
7521+
match ev {
7522+
events::Event::PendingHTLCsForwardable { .. } => { forward_ev_exists = true; break }
7523+
events::Event::HTLCIntercepted { .. } => intercept_count += 1,
7524+
_ => {}
7525+
}
7526+
}
7527+
if !forward_ev_exists && intercept_count < forward_htlcs.len() {
75197528
// If we have pending HTLCs to forward, assume we either dropped a
75207529
// `PendingHTLCsForwardable` or the user received it but never processed it as they
75217530
// shut down before the timer hit. Either way, set the time_forwardable to a small

0 commit comments

Comments
 (0)