tapchannel: use defer to ensure lease unlocked if funding failure #1033
Conversation
This file contains 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
Once we call `fundVirtualPacket`, we've locked inputs assuming it succeeds. If for w/e reason, the remote peer fails to send us the first ack (before the call to `completeChannelFunding`), then before this commit, we would fail to unlock the inputs. Only after the call to `completeChannelFunding` would we unlock the UTXOs. In this commit, we use two new defers to ensure that we always unlock the UTXOs if the pre-setup fails, and also if `completeChannelFunding` fails.
Roasbeef
commented
Jul 19, 2024
| @@ -1028,13 +1031,6 @@ func (f *FundingController) completeChannelFunding(ctx context.Context, | |||
| return nil, err | |||
| } | |||
|
|
|||
| fundingState.lockedAssetInputs = fn.Map( | |||
There was a problem hiding this comment.
I moved this down (called earlier) so we track the locked inputs as soon as the initial vPSBT funding finishes.
GeorgeTsagk
approved these changes
Jul 19, 2024
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.
Once we call
fundVirtualPacket, we've locked inputs assuming it succeeds. If for w/e reason, the remote peer fails to send us the first ack (before the call tocompleteChannelFunding), then before this commit, we would fail to unlock the inputs. Only after the call tocompleteChannelFundingwould we unlock the UTXOs.In this commit, we use two new defers to ensure that we always unlock the UTXOs if the pre-setup fails, and also if
completeChannelFundingfails.Fixes #1019