Do not fail to load ChannelManager when we see claiming payments
#3772
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
👋 Thanks for assigning @valentinewallace as a reviewer! |
TheBlueMatt
force-pushed
the
2025-05-chanman-double-restart-claim-fail
branch
from
bc1a7d0 to
d24c7a3
Compare
TheBlueMatt
force-pushed
the
2025-05-chanman-double-restart-claim-fail
branch
from
d24c7a3 to
47cccb7
Compare
Contributor
|
Thanks for implementing this so quickly! |
TheBlueMatt
force-pushed
the
2025-05-chanman-double-restart-claim-fail
branch
from
47cccb7 to
ce09f6f
Compare
|
|
||
| let mut channels_without_preimage = payment_claim.mpp_parts.iter() | ||
| .map(|htlc_info| (htlc_info.counterparty_node_id, htlc_info.funding_txo, htlc_info.channel_id)) | ||
| .collect::<Vec<_>>(); |
Contributor
There was a problem hiding this comment.
To confirm, the failure occurred at the debug_assert "Entry was added in begin_claiming_payment" ~20 lines down, right?
When we begin claiming a payment, we move the tracking of it from `claimable_payments` to `claiming_payments`. This ensures we only ever have one payment which is in the process of being claimed with a given payment hash at a time and lets us keep track of when all parts have been claimed with their `ChannelMonitor`s. However, on startup, we check that failing to move a payment from `claimable_payments` to `claiming_payments` implies that it is not present in `claiming_payments`. This is fine if the payment doesn't exist, but if the payment has already started being claimed, this will fail and we'll refuse to deserialize the `ChannelManager` (with a `debug_assert` failure in debug mode). Here we resolve this by checking if a payment is already being claimed before we attempt to initiate claiming and skip the failing check in that case.
TheBlueMatt
force-pushed
the
2025-05-chanman-double-restart-claim-fail
branch
from
ce09f6f to
21f829b
Compare
Collaborator
Author
|
Tweaked the commit message |
wpaulino
approved these changes
May 12, 2025
valentinewallace
approved these changes
May 13, 2025
Collaborator
Author
|
Backported in #3794 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When we begin claiming a payment, we move the tracking of it from
claimable_paymentstoclaiming_payments. This ensures we only ever have one payment which is in the process of being claimed with a given payment hash at a time and lets us keep track of when all parts have been claimed with theirChannelMonitors.However, on startup, we check that failing to move a payment from
claimable_paymentstoclaiming_paymentswe check that it is not present inclaiming_payments. This is fine if the payment doesn't exist, but if the payment has already started being claimed, this will fail and we'll refuse to deserialize theChannelManager(with adebug_assertfailure in debug mode).Here we resolve this by checking if a payment is already being claimed before we attempt to initiate claiming and skip the failing check in that case.