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

funding: unconditionally forward all received errors to client

Browse Source 
Previously, our old lnwire.Error message used a special code to
indicate different types of errors. With the recent push for spec
compatibility, we removed this field and instead stuffed the error into
the first byte of the error data. This works between lnd nodes, but
with other implementations they may send different errors which use a
different error scheme.

To fix this, we’ll now unconditionally return the error to the end
caller (if one exists).
This commit is contained in:
Olaoluwa Osuntokun 2017-08-30 20:31:33 -07:00
parent 7be039adec
commit 1ce6c4668e
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
fundingmanager.go
View File

@ -1894,33 +1894,32 @@ func (f *fundingManager) processFundingError(err *lnwire.Error,
// depending on the type of error we should do different clean up steps and
// inform the user about it.
func (f *fundingManager) handleErrorMsg(fmsg *fundingErrorMsg) {
e := fmsg.err
protocolErr := fmsg.err
lnErr := lnwire.ErrorCode(e.Data[0])
switch lnErr {
case lnwire.ErrChanTooLarge:
fallthrough
case lnwire.ErrMaxPendingChannels:
fallthrough
case lnwire.ErrSynchronizingChain:
peerKey := fmsg.peerAddress.IdentityKey
chanID := fmsg.err.ChanID
ctx, err := f.cancelReservationCtx(peerKey, chanID)
if err != nil {
fndgLog.Warnf("unable to delete reservation: %v", err)
ctx.err <- err
return
}
peerKey := fmsg.peerAddress.IdentityKey
chanID := fmsg.err.ChanID
fndgLog.Errorf("Received funding error from %x: %v",
peerKey.SerializeCompressed(), lnErr,
)
ctx.err <- grpc.Errorf(lnErr.ToGrpcCode(), lnErr.String())
// First, we'll attempt to retrieve the funding workflow that this
// error was tied to. If we're unable to do so, then we'll exit early
// as this was an unwarranted error.
resCtx, err := f.getReservationCtx(peerKey, chanID)
if err != nil {
fndgLog.Warnf("Received error for non-existent funding "+
"flow: %v", protocolErr)
return
}
default:
fndgLog.Warnf("unknown funding error: %v", spew.Sdump(e.Data))
// If we did indeed find the funding workflow, then we'll return the
// error back to the caller (if any), and cancel the workflow itself.
lnErr := lnwire.ErrorCode(protocolErr.Data[0])
fndgLog.Errorf("Received funding error from %x: %v",
peerKey.SerializeCompressed(), lnErr,
)
resCtx.err <- grpc.Errorf(lnErr.ToGrpcCode(), lnErr.String())
if _, err := f.cancelReservationCtx(peerKey, chanID); err != nil {
fndgLog.Warnf("unable to delete reservation: %v", err)
return
}
}