mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-02-23 14:40:30 +01:00
Code Issues Projects Releases Wiki Activity

funding: use default fwding policy if persisted values not found

Browse source 
In this commit, a bug is fixed in the funding manager that could result
in the funding process erroring out if the persisted initial forwarding
policy is not found. This could occur if a node restarts after opening a
channel that is not yet fully confirmed and also upgrades their node
from a pre-0.16 version to 0.16 since the values are only expected to be
persisted after 0.16.
This commit is contained in:
Elle Mouton 2023-04-19 10:38:09 +02:00
parent ec3cb6939a
commit 784dc8d530
No known key found for this signature in database
GPG key ID: D7D916376026F177
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/release-notes/release-notes-0.16.1.md
View file

@ -84,11 +84,14 @@ available](https://github.com/lightningnetwork/lnd/pull/7529).
* [Fix log output](https://github.com/lightningnetwork/lnd/pull/7604). * [Fix log output](https://github.com/lightningnetwork/lnd/pull/7604).
* [Channels opened with custom fee policies are now able to forward payments * [Channels opened with custom fee policies are now able to forward payments
correctly without needing to restart correctly without needing to restart
first](https://github.com/lightningnetwork/lnd/pull/7597). first](https://github.com/lightningnetwork/lnd/pull/7597).
* [Fix a bug](https://github.com/lightningnetwork/lnd/pull/7613) where the
funding manager would error out if no persisted initial forwarding policy is
found for a channel.
# Contributors (Alphabetical Order) # Contributors (Alphabetical Order)
* ardevd * ardevd

7
funding/manager.go
View file

@ -3729,10 +3729,11 @@ func (f *Manager) newChanAnnouncement(localPubKey,
} }
// The caller of newChanAnnouncement is expected to provide the initial // The caller of newChanAnnouncement is expected to provide the initial
// forwarding policy to be announced. We abort the channel announcement // forwarding policy to be announced. If no persisted initial policy
// if they are not provided. // values are found, then we will use the default policy values in the
// channel announcement.
storedFwdingPolicy, err := f.getInitialFwdingPolicy(chanID) storedFwdingPolicy, err := f.getInitialFwdingPolicy(chanID)
if err != nil { if err != nil && !errors.Is(err, channeldb.ErrChannelNotFound) {
return nil, errors.Errorf("unable to generate channel "+ return nil, errors.Errorf("unable to generate channel "+
"update announcement: %v", err) "update announcement: %v", err)
} }

4
funding/manager_test.go
View file

@ -3154,7 +3154,7 @@ func TestFundingManagerCustomChannelParameters(t *testing.T) {
t.Fatal("OpenStatusUpdate was not OpenStatusUpdate_ChanPending") t.Fatal("OpenStatusUpdate was not OpenStatusUpdate_ChanPending")
} }
// After the funding is sigend and before the channel announcement // After the funding is signed and before the channel announcement
// we expect Alice and Bob to store their respective fees in the // we expect Alice and Bob to store their respective fees in the
// database. // database.
forwardingPolicy, err := alice.fundingMgr.getInitialFwdingPolicy( forwardingPolicy, err := alice.fundingMgr.getInitialFwdingPolicy(
@ -3169,7 +3169,7 @@ func TestFundingManagerCustomChannelParameters(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, assertFees(forwardingPolicy, 100, 1000)) require.NoError(t, assertFees(forwardingPolicy, 100, 1000))
// Wait for Alice to published the funding tx to the network. // Wait for Alice to publish the funding tx to the network.
var fundingTx *wire.MsgTx var fundingTx *wire.MsgTx
select { select {
case fundingTx = <-alice.publTxChan: case fundingTx = <-alice.publTxChan: