Skip to content

Reconstruct OutboundPayments from ChannelMonitors #1

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Reconstruct OutboundPayments from ChannelMonitors #1

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bf919c
Remove pending_outbounds_payments_no_retry ser
valentinewallace Oct 29, 2025
bc6a5ca
Split sub-tests into multiple tests
valentinewallace Oct 29, 2025
5496c50
Expand checks in channel_holding_cell_serialize test
valentinewallace Oct 31, 2025
77e6e76
Rebuild outbound_payments from Channel{Monitor}s
valentinewallace Oct 31, 2025
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
27 changes: 3 additions & 24 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16402,18 +16402,6 @@ where
}
}

// Encode without retry info for 0.0.101 compatibility.
let mut pending_outbound_payments_no_retry: HashMap<PaymentId, HashSet<[u8; 32]>> = new_hash_map();
for (id, outbound) in pending_outbound_payments.iter() {
match outbound {
PendingOutboundPayment::Legacy { session_privs } |
PendingOutboundPayment::Retryable { session_privs, .. } => {
pending_outbound_payments_no_retry.insert(*id, session_privs.clone());
},
_ => {},
}
}

let mut pending_intercepted_htlcs = None;
let our_pending_intercepts = self.pending_intercepted_htlcs.lock().unwrap();
if our_pending_intercepts.len() != 0 {
Expand Down Expand Up @@ -16441,7 +16429,7 @@ where
}

write_tlv_fields!(writer, {
(1, pending_outbound_payments_no_retry, required),
// TLV 1 used to be used for pending_outbound_payments_no_retry
Copy link

@joostjager joostjager Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commit message:

which should no longer be necessary.

Explain 'should'?

(2, pending_intercepted_htlcs, option),
(3, pending_outbound_payments, required),
(4, pending_claiming_payments, option),
Expand Down Expand Up @@ -17131,9 +17119,6 @@ where
};
}

// pending_outbound_payments_no_retry is for compatibility with 0.0.101 clients.
let mut pending_outbound_payments_no_retry: Option<HashMap<PaymentId, HashSet<[u8; 32]>>> =
None;
let mut pending_outbound_payments = None;
let mut pending_intercepted_htlcs: Option<HashMap<InterceptId, PendingAddHTLCInfo>> =
Some(new_hash_map());
Expand All @@ -17159,7 +17144,7 @@ where
let mut peer_storage_dir: Option<Vec<(PublicKey, Vec<u8>)>> = None;
let mut async_receive_offer_cache: AsyncReceiveOfferCache = AsyncReceiveOfferCache::new();
read_tlv_fields!(reader, {
(1, pending_outbound_payments_no_retry, option),
// TLV 1 used to be used for pending_outbound_payments_no_retry
(2, pending_intercepted_htlcs, option),
(3, pending_outbound_payments, option),
(4, pending_claiming_payments, option),
Expand Down Expand Up @@ -17199,14 +17184,8 @@ where
pending_events_read.append(&mut channel_closures);
}

if pending_outbound_payments.is_none() && pending_outbound_payments_no_retry.is_none() {
if pending_outbound_payments.is_none() {
pending_outbound_payments = Some(pending_outbound_payments_compat);
} else if pending_outbound_payments.is_none() {
let mut outbounds = new_hash_map();
for (id, session_privs) in pending_outbound_payments_no_retry.unwrap().drain() {
outbounds.insert(id, PendingOutboundPayment::Legacy { session_privs });
}
pending_outbound_payments = Some(outbounds);
}
let pending_outbounds =
OutboundPayments::new(pending_outbound_payments.unwrap(), args.logger.clone());
Expand Down