akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #774 from halseth/reservation-cancellation

Browse Source 
Reservation cancellation during failing funding flow
This commit is contained in:
Olaoluwa Osuntokun 2018-02-23 15:36:11 -08:00 committed by GitHub
commit f815c6ca14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fundingmanager.go
View File

@ -824,11 +824,10 @@ func (f *fundingManager) handleFundingOpen(fmsg *fundingOpenMsg) {
// synced to the network as we won't be able to properly validate the // synced to the network as we won't be able to properly validate the
// confirmation of the funding transaction. // confirmation of the funding transaction.
isSynced, _, err := f.cfg.Wallet.IsSynced() isSynced, _, err := f.cfg.Wallet.IsSynced()
if err != nil { if err != nil || !isSynced {
fndgLog.Errorf("unable to query wallet: %v", err) if err != nil {
return fndgLog.Errorf("unable to query wallet: %v", err)
} }
if !isSynced {
f.failFundingFlow( f.failFundingFlow(
fmsg.peerAddress.IdentityKey, fmsg.msg.PendingChannelID, fmsg.peerAddress.IdentityKey, fmsg.msg.PendingChannelID,
lnwire.ErrorData{byte(lnwire.ErrSynchronizingChain)}, lnwire.ErrorData{byte(lnwire.ErrSynchronizingChain)},
@ -2437,8 +2436,17 @@ func (f *fundingManager) handleInitFundingMsg(msg *initFundingMsg) {
ChannelFlags: channelFlags, ChannelFlags: channelFlags,
} }
if err := f.cfg.SendToPeer(peerKey, &fundingOpen); err != nil { if err := f.cfg.SendToPeer(peerKey, &fundingOpen); err != nil {
fndgLog.Errorf("Unable to send funding request message: %v", err) e := fmt.Errorf("Unable to send funding request message: %v",
msg.err <- err err)
fndgLog.Errorf(e.Error())
// Since we were unable to send the initial message to the peer
// and start the funding flow, we'll cancel this reservation.
if _, err := f.cancelReservationCtx(peerKey, chanID); err != nil {
fndgLog.Errorf("unable to cancel reservation: %v", err)
}
msg.err <- e
return return
} }
} }