highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-06-24 15:52:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6998 from Crypt-iQ/6990_zeroconftimeout_noitest

Browse Source 
funding: ignore maxWaitNumBlocksFundingConf for zero conf channels
This commit is contained in:
Olaoluwa Osuntokun 2022-10-06 17:51:25 -07:00 committed by GitHub
commit ffa8ba8dfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/release-notes/release-notes-0.15.2.md
View File

@ -8,6 +8,9 @@
## Bug Fixes ## Bug Fixes
* [A bug has been fixed where the responder of a zero-conf channel could forget
about the channel after a hard-coded 2016 blocks.](https://github.com/lightningnetwork/lnd/pull/6998)
* [A bug where LND wouldn't send a ChannelUpdate during a channel open has * [A bug where LND wouldn't send a ChannelUpdate during a channel open has
been fixed.](https://github.com/lightningnetwork/lnd/pull/6892) been fixed.](https://github.com/lightningnetwork/lnd/pull/6892)

6
funding/manager.go
View File

@ -2499,7 +2499,7 @@ func (f *Manager) waitForFundingWithTimeout(
// If we are not the initiator, we have no money at stake and will // If we are not the initiator, we have no money at stake and will
// timeout waiting for the funding transaction to confirm after a // timeout waiting for the funding transaction to confirm after a
// while. // while.
if !ch.IsInitiator { if !ch.IsInitiator && !ch.IsZeroConf() {
f.wg.Add(1) f.wg.Add(1)
go f.waitForTimeout(ch, cancelChan, timeoutChan) go f.waitForTimeout(ch, cancelChan, timeoutChan)
} }
@ -3251,9 +3251,7 @@ func (f *Manager) waitForZeroConfChannel(c *channeldb.OpenChannel,
// is already confirmed, the chainntnfs subsystem will return with the // is already confirmed, the chainntnfs subsystem will return with the
// confirmed tx. Otherwise, we'll wait here until confirmation occurs. // confirmed tx. Otherwise, we'll wait here until confirmation occurs.
confChan, err := f.waitForFundingWithTimeout(c) confChan, err := f.waitForFundingWithTimeout(c)
if err == ErrConfirmationTimeout { if err != nil {
return f.fundingTimeout(c, pendingID)
} else if err != nil {
return fmt.Errorf("error waiting for zero-conf funding "+ return fmt.Errorf("error waiting for zero-conf funding "+
"confirmation for ChannelPoint(%v): %v", "confirmation for ChannelPoint(%v): %v",
c.FundingOutpoint, err) c.FundingOutpoint, err)