Expose a Balance for inbound HTLCs even without a preimage
#1673
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
wpaulino
reviewed
Aug 17, 2022
TheBlueMatt
force-pushed
the
2022-08-may-learn-preimage-balance
branch
from
57f4228 to
190e6be
Compare
|
Fixed the failing test and rebased after #1495 landed. |
TheBlueMatt
force-pushed
the
2022-08-may-learn-preimage-balance
branch
from
190e6be to
c6440b1
Compare
wpaulino
previously approved these changes
Aug 18, 2022
dunxen
reviewed
Aug 18, 2022
dunxen
reviewed
Aug 18, 2022
Codecov Report
@@ Coverage Diff @@
## main #1673 +/- ##
==========================================
+ Coverage 90.77% 90.90% +0.13%
==========================================
Files 80 85 +5
Lines 44763 45888 +1125
Branches 44763 45888 +1125
==========================================
+ Hits 40632 41715 +1083
- Misses 4131 4173 +42
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
dunxen
previously approved these changes
Aug 25, 2022
| @@ -1565,6 +1576,11 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> { | |||
| timeout_height: htlc.cltv_expiry, | |||
| }); | |||
| } | |||
| } else if htlc_resolved.is_none() { | |||
There was a problem hiding this comment.
Fwiw, tests pass when this is just else
There was a problem hiding this comment.
Ah, right, it'd be unreachable otherwise as we have a separate else clause for resolved.is_some && !spend_pending (and spend_pending would require that we have the preimage, which ends up in the previous clause). I'm still gonna leave it as-is if that's okay.
There was a problem hiding this comment.
Sg, it reads fine IMO
If we don't currently have the preimage for an inbound HTLC, that does not guarantee we can never claim it, but instead only that we cannot claim it unless we receive the preimage from the channel we forwarded the channel out on. Thus, we cannot consider a channel to have no claimable balances if the only remaining output on the commitment ransaction is an inbound HTLC for which we do not have the preimage, as we may be able to claim it in the future. This commit addresses this issue by adding a new `Balance` variant - `MaybePreimageClaimableHTLCAwaitingTimeout`, which is generated until the HTLC output is spent. Fixes lightningdevkit#1620
As we now have a MaybePreimageClaimableHTLC, its more consistent to rename `MaybeClaimableHTLCAwaitingTimeout` to `MaybeTimeoutClaimableHTLC`.
|
Squashed without further changes. |
TheBlueMatt
force-pushed
the
2022-08-may-learn-preimage-balance
branch
from
c7e98b8 to
39cede6
Compare
valentinewallace
approved these changes
Aug 25, 2022
dunxen
approved these changes
Aug 25, 2022
wpaulino
approved these changes
Aug 25, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #1620, based on #1495.