Skip to content

Commit

Permalink
Merge pull request #9033 from ziggie1984/non-anchor-channel-bump
Browse files Browse the repository at this point in the history
error out when non-anchor channels are tried to bump the force close fee.
  • Loading branch information
guggero authored Oct 8, 2024
2 parents bdc5187 + 2915936 commit 0dd58ee
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
5 changes: 5 additions & 0 deletions docs/release-notes/release-notes-0.19.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
* [Fix a bug](https://github.com/lightningnetwork/lnd/pull/9134) that would
cause a nil pointer dereference during the probing of a payment request that
does not contain a payment address.

* [Fixed a bug](https://github.com/lightningnetwork/lnd/pull/9033) where we
would not signal an error when trying to bump an non-anchor channel but
instead report a successful cpfp registration although no fee bumping is
possible for non-anchor channels anyways.

* [Use the required route blinding
feature-bit](https://github.com/lightningnetwork/lnd/pull/9143) for invoices
Expand Down
9 changes: 9 additions & 0 deletions lnrpc/walletrpc/walletkit_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -1179,6 +1179,11 @@ func (w *WalletKit) BumpForceCloseFee(_ context.Context,
return nil, err
}

if !channel.ChanType.HasAnchors() {
return nil, fmt.Errorf("not able to bump the fee of a " +
"non-anchor channel")
}

// Match pending sweeps with commitments of the channel for which a bump
// is requested. Depending on the commitment state when force closing
// the channel we might have up to 3 commitments to consider when
Expand Down Expand Up @@ -1237,6 +1242,10 @@ func (w *WalletKit) BumpForceCloseFee(_ context.Context,
return commitSet.Contains(sweep.OutPoint.Hash)
}, pendingSweeps)

if len(anchors) == 0 {
return nil, fmt.Errorf("unable to find pending anchor outputs")
}

// Filter all relevant anchor sweeps and update the sweep request.
for _, anchor := range anchors {
// Anchor cpfp bump request are predictable because they are
Expand Down

0 comments on commit 0dd58ee

Please sign in to comment.