mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-03-04 09:48:19 +01:00
Code Issues Projects Releases Wiki Activity

routing+channeldb: add more failure reasons

Browse source
This commit is contained in:
Joost Jager 2019-06-04 11:22:23 +02:00
parent d6d87e12fe
commit ae46fb00cb
No known key found for this signature in database
GPG key ID: A61B9D4C393C59C7
7 changed files with 241 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
channeldb/payments.go
View file

@ -94,10 +94,17 @@ const (
// destination was found during path finding. // destination was found during path finding.
FailureReasonNoRoute FailureReason = 1 FailureReasonNoRoute FailureReason = 1
// FailureReasonError indicates that an unexpected error happened during
// payment.
FailureReasonError FailureReason = 2
// FailureReasonIncorrectPaymentDetails indicates that either the hash
// is unknown or the final cltv delta or amount is incorrect.
FailureReasonIncorrectPaymentDetails FailureReason = 3
// TODO(halseth): cancel state. // TODO(halseth): cancel state.
// TODO(joostjager): Add failure reasons for: // TODO(joostjager): Add failure reasons for:
// UnknownPaymentHash, FinalInvalidAmt, FinalInvalidCltv
// LocalLiquidityInsufficient, RemoteCapacityInsufficient. // LocalLiquidityInsufficient, RemoteCapacityInsufficient.
) )
@ -108,6 +115,10 @@ func (r FailureReason) String() string {
return "timeout" return "timeout"
case FailureReasonNoRoute: case FailureReasonNoRoute:
return "no_route" return "no_route"
case FailureReasonError:
return "error"
case FailureReasonIncorrectPaymentDetails:
return "incorrect_payment_details"
} }
return "unknown" return "unknown"

221
lnrpc/routerrpc/router.pb.go
View file

@ -39,6 +39,13 @@ const (
//All possible routes were tried and failed permanently. Or were no //All possible routes were tried and failed permanently. Or were no
//routes to the destination at all. //routes to the destination at all.
PaymentState_FAILED_NO_ROUTE PaymentState = 3 PaymentState_FAILED_NO_ROUTE PaymentState = 3
//*
//A non-recoverable error has occured.
PaymentState_FAILED_ERROR PaymentState = 4
//*
//Payment details incorrect (unknown hash, invalid amt or
//invalid final cltv delta)
PaymentState_FAILED_INCORRECT_PAYMENT_DETAILS PaymentState = 5
) )
var PaymentState_name = map[int32]string{ var PaymentState_name = map[int32]string{
@ -46,13 +53,17 @@ var PaymentState_name = map[int32]string{
1: "SUCCEEDED", 1: "SUCCEEDED",
2: "FAILED_TIMEOUT", 2: "FAILED_TIMEOUT",
3: "FAILED_NO_ROUTE", 3: "FAILED_NO_ROUTE",
4: "FAILED_ERROR",
5: "FAILED_INCORRECT_PAYMENT_DETAILS",
} }
var PaymentState_value = map[string]int32{ var PaymentState_value = map[string]int32{
"IN_FLIGHT": 0, "IN_FLIGHT": 0,
"SUCCEEDED": 1, "SUCCEEDED": 1,
"FAILED_TIMEOUT": 2, "FAILED_TIMEOUT": 2,
"FAILED_NO_ROUTE": 3, "FAILED_NO_ROUTE": 3,
"FAILED_ERROR": 4,
"FAILED_INCORRECT_PAYMENT_DETAILS": 5,
} }
func (x PaymentState) String() string { func (x PaymentState) String() string {
@ -1146,106 +1157,108 @@ func init() {
func init() { proto.RegisterFile("routerrpc/router.proto", fileDescriptor_7a0613f69d37b0a5) } func init() { proto.RegisterFile("routerrpc/router.proto", fileDescriptor_7a0613f69d37b0a5) }
var fileDescriptor_7a0613f69d37b0a5 = []byte{ var fileDescriptor_7a0613f69d37b0a5 = []byte{
// 1575 bytes of a gzipped FileDescriptorProto // 1601 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0xdd, 0x72, 0x22, 0xc7, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0xdd, 0x72, 0x1a, 0xc9,
0x15, 0x36, 0x02, 0x09, 0x71, 0xf8, 0xd1, 0xa8, 0xa5, 0xd5, 0xb2, 0x68, 0xb5, 0x96, 0x27, 0xc9, 0x15, 0x5e, 0x04, 0x08, 0x71, 0xf8, 0x1b, 0xb5, 0x64, 0x19, 0x23, 0xcb, 0xab, 0x9d, 0x24, 0x5e,
0x5a, 0xb5, 0xe5, 0x48, 0x09, 0xa9, 0x75, 0xf9, 0x2a, 0x29, 0x16, 0x1a, 0x33, 0x59, 0x98, 0x91, 0x95, 0x6b, 0x23, 0x25, 0xa4, 0xbc, 0xb5, 0x57, 0x49, 0x61, 0x68, 0x96, 0x89, 0x61, 0x46, 0xdb,
0x1b, 0x58, 0x5b, 0xc9, 0x45, 0x57, 0x0b, 0x5a, 0x30, 0x25, 0x98, 0xc1, 0xd3, 0x8d, 0xb3, 0xca, 0x80, 0x77, 0x9d, 0x5c, 0x74, 0xb5, 0xa0, 0x05, 0x53, 0x1a, 0x66, 0xd8, 0x99, 0x66, 0x63, 0xe5,
0x45, 0xee, 0x92, 0xd7, 0x49, 0x9e, 0x20, 0x97, 0x79, 0x87, 0xbc, 0x4d, 0xaa, 0xbb, 0x07, 0x18, 0x22, 0x77, 0xc9, 0x5d, 0x9e, 0x25, 0x79, 0x82, 0x5c, 0xe6, 0x1d, 0xf2, 0x36, 0xa9, 0xee, 0x1e,
0x10, 0xda, 0xf8, 0x4a, 0xcc, 0x77, 0xbe, 0x3e, 0xe7, 0xf4, 0xf9, 0xeb, 0x23, 0x38, 0x89, 0xc2, 0x60, 0x40, 0xc8, 0xeb, 0x2b, 0x31, 0xdf, 0xf9, 0xfa, 0x9c, 0xd3, 0xe7, 0xaf, 0x8f, 0xe0, 0x24,
0xb9, 0xe4, 0x51, 0x34, 0x1b, 0x5c, 0x99, 0x5f, 0x97, 0xb3, 0x28, 0x94, 0x21, 0xca, 0x2d, 0xf1, 0x0c, 0x16, 0x82, 0x87, 0xe1, 0x7c, 0x74, 0xa5, 0x7f, 0x5d, 0xce, 0xc3, 0x40, 0x04, 0x28, 0xbf,
0x4a, 0x2e, 0x9a, 0x0d, 0x0c, 0x6a, 0xff, 0x67, 0x07, 0x50, 0x97, 0x07, 0xc3, 0x6b, 0xf6, 0x30, 0xc2, 0x6b, 0xf9, 0x70, 0x3e, 0xd2, 0xa8, 0xf9, 0xdf, 0x3d, 0x40, 0x7d, 0xee, 0x8f, 0xaf, 0xd9,
0xe5, 0x81, 0x24, 0xfc, 0xc7, 0x39, 0x17, 0x12, 0x21, 0xc8, 0x0c, 0xb9, 0x90, 0xe5, 0xd4, 0x79, 0xfd, 0x8c, 0xfb, 0x82, 0xf0, 0x1f, 0x17, 0x3c, 0x12, 0x08, 0x41, 0x66, 0xcc, 0x23, 0x51, 0x4d,
0xea, 0xa2, 0x40, 0xf4, 0x6f, 0x64, 0x41, 0x9a, 0x4d, 0x65, 0x79, 0xe7, 0x3c, 0x75, 0x91, 0x26, 0x9d, 0xa7, 0x2e, 0x8a, 0x44, 0xfd, 0x46, 0x06, 0xa4, 0xd9, 0x4c, 0x54, 0xf7, 0xce, 0x53, 0x17,
0xea, 0x27, 0xfa, 0x02, 0x0a, 0x33, 0x73, 0x8e, 0x8e, 0x99, 0x18, 0x97, 0xd3, 0x9a, 0x9d, 0x8f, 0x69, 0x22, 0x7f, 0xa2, 0x2f, 0xa0, 0x38, 0xd7, 0xe7, 0xe8, 0x94, 0x45, 0xd3, 0x6a, 0x5a, 0xb1,
0xb1, 0x16, 0x13, 0x63, 0x74, 0x01, 0xd6, 0x9d, 0x1f, 0xb0, 0x09, 0x1d, 0x4c, 0xe4, 0x4f, 0x74, 0x0b, 0x31, 0xd6, 0x61, 0xd1, 0x14, 0x5d, 0x80, 0x71, 0xeb, 0xfa, 0xcc, 0xa3, 0x23, 0x4f, 0xfc,
0xc8, 0x27, 0x92, 0x95, 0x33, 0xe7, 0xa9, 0x8b, 0x5d, 0x52, 0xd2, 0x78, 0x7d, 0x22, 0x7f, 0x6a, 0x44, 0xc7, 0xdc, 0x13, 0xac, 0x9a, 0x39, 0x4f, 0x5d, 0x64, 0x49, 0x59, 0xe1, 0x4d, 0x4f, 0xfc,
0x28, 0x14, 0x7d, 0x09, 0x07, 0x0b, 0x65, 0x91, 0xf1, 0xa2, 0xbc, 0x7b, 0x9e, 0xba, 0xc8, 0x91, 0xd4, 0x92, 0x28, 0xfa, 0x12, 0x2a, 0x4b, 0x65, 0xa1, 0xf6, 0xa2, 0x9a, 0x3d, 0x4f, 0x5d, 0xe4,
0xd2, 0x6c, 0xdd, 0xb7, 0x2f, 0xe1, 0x40, 0xfa, 0x53, 0x1e, 0xce, 0x25, 0x15, 0x7c, 0x10, 0x06, 0x49, 0x79, 0xbe, 0xe9, 0xdb, 0x97, 0x50, 0x11, 0xee, 0x8c, 0x07, 0x0b, 0x41, 0x23, 0x3e, 0x0a,
0x43, 0x51, 0xde, 0x33, 0x1a, 0x63, 0xb8, 0x6b, 0x50, 0x64, 0x43, 0xf1, 0x8e, 0x73, 0x3a, 0xf1, 0xfc, 0x71, 0x54, 0xdd, 0xd7, 0x1a, 0x63, 0xb8, 0xaf, 0x51, 0x64, 0x42, 0xe9, 0x96, 0x73, 0xea,
0xa7, 0xbe, 0xa4, 0x82, 0xc9, 0x72, 0x56, 0xbb, 0x9e, 0xbf, 0xe3, 0xbc, 0xad, 0xb0, 0x2e, 0x93, 0xb9, 0x33, 0x57, 0xd0, 0x88, 0x89, 0x6a, 0x4e, 0xb9, 0x5e, 0xb8, 0xe5, 0xbc, 0x2b, 0xb1, 0x3e,
0xca, 0xbf, 0x70, 0x2e, 0x47, 0xa1, 0x1f, 0x8c, 0xe8, 0x60, 0xcc, 0x02, 0xea, 0x0f, 0xcb, 0xfb, 0x13, 0xd2, 0xbf, 0x60, 0x21, 0x26, 0x81, 0xeb, 0x4f, 0xe8, 0x68, 0xca, 0x7c, 0xea, 0x8e, 0xab,
0xe7, 0xa9, 0x8b, 0x0c, 0x29, 0x2d, 0xf0, 0xfa, 0x98, 0x05, 0xce, 0x10, 0x9d, 0x01, 0xe8, 0x3b, 0x07, 0xe7, 0xa9, 0x8b, 0x0c, 0x29, 0x2f, 0xf1, 0xe6, 0x94, 0xf9, 0xd6, 0x18, 0x9d, 0x01, 0xa8,
0x68, 0x75, 0xe5, 0x9c, 0xb6, 0x98, 0x53, 0x88, 0xd6, 0x65, 0x7f, 0x03, 0x47, 0xbd, 0x88, 0x0d, 0x3b, 0x28, 0x75, 0xd5, 0xbc, 0xb2, 0x98, 0x97, 0x88, 0xd2, 0x65, 0x7e, 0x03, 0x47, 0x83, 0x90,
0xee, 0x37, 0x02, 0xb9, 0x19, 0xa2, 0xd4, 0xa3, 0x10, 0xd9, 0x7f, 0x83, 0x62, 0x7c, 0xa8, 0x2b, 0x8d, 0xee, 0xb6, 0x02, 0xb9, 0x1d, 0xa2, 0xd4, 0x83, 0x10, 0x99, 0x7f, 0x83, 0x52, 0x7c, 0xa8,
0x99, 0x9c, 0x0b, 0xf4, 0x6b, 0xd8, 0x15, 0x92, 0x49, 0xae, 0xc9, 0xa5, 0xea, 0xf3, 0xcb, 0x65, 0x2f, 0x98, 0x58, 0x44, 0xe8, 0xd7, 0x90, 0x8d, 0x04, 0x13, 0x5c, 0x91, 0xcb, 0xf5, 0xa7, 0x97,
0xe6, 0x2e, 0x13, 0x44, 0x4e, 0x0c, 0x0b, 0x55, 0x60, 0x7f, 0x16, 0x71, 0x7f, 0xca, 0x46, 0x5c, 0xab, 0xcc, 0x5d, 0x26, 0x88, 0x9c, 0x68, 0x16, 0xaa, 0xc1, 0xc1, 0x3c, 0xe4, 0xee, 0x8c, 0x4d,
0x27, 0xa7, 0x40, 0x96, 0xdf, 0xc8, 0x86, 0x5d, 0x7d, 0x58, 0xa7, 0x26, 0x5f, 0x2d, 0x5c, 0x4e, 0xb8, 0x4a, 0x4e, 0x91, 0xac, 0xbe, 0x91, 0x09, 0x59, 0x75, 0x58, 0xa5, 0xa6, 0x50, 0x2f, 0x5e,
0x02, 0xa5, 0x86, 0x28, 0x8c, 0x18, 0x91, 0xfd, 0x7b, 0x38, 0xd0, 0xdf, 0x4d, 0xce, 0x3f, 0x95, 0x7a, 0xbe, 0x54, 0x43, 0x24, 0x46, 0xb4, 0xc8, 0xfc, 0x3d, 0x54, 0xd4, 0x77, 0x9b, 0xf3, 0x8f,
0xfe, 0xe7, 0x90, 0x65, 0x53, 0x13, 0x47, 0x53, 0x02, 0x7b, 0x6c, 0xaa, 0x42, 0x68, 0x0f, 0xc1, 0xa5, 0xff, 0x29, 0xe4, 0xd8, 0x4c, 0xc7, 0x51, 0x97, 0xc0, 0x3e, 0x9b, 0xc9, 0x10, 0x9a, 0x63,
0x5a, 0x9d, 0x17, 0xb3, 0x30, 0x10, 0x5c, 0x85, 0x55, 0x29, 0x57, 0x51, 0x55, 0x29, 0x98, 0xaa, 0x30, 0xd6, 0xe7, 0xa3, 0x79, 0xe0, 0x47, 0x5c, 0x86, 0x55, 0x2a, 0x97, 0x51, 0x95, 0x29, 0x98,
0x53, 0x29, 0x7d, 0xaa, 0x14, 0xe3, 0x4d, 0xce, 0x3b, 0x82, 0x49, 0xf4, 0xda, 0x64, 0x93, 0x4e, 0xc9, 0x53, 0x29, 0x75, 0xaa, 0x1c, 0xe3, 0x6d, 0xce, 0x7b, 0x11, 0x13, 0xe8, 0xa5, 0xce, 0x26,
0xc2, 0xc1, 0xbd, 0xaa, 0x0f, 0xf6, 0x10, 0xab, 0x2f, 0x2a, 0xb8, 0x1d, 0x0e, 0xee, 0x1b, 0x0a, 0xf5, 0x82, 0xd1, 0x9d, 0xac, 0x0f, 0x76, 0x1f, 0xab, 0x2f, 0x49, 0xb8, 0x1b, 0x8c, 0xee, 0x5a,
0xb4, 0xff, 0x6c, 0xea, 0xb4, 0x17, 0x1a, 0xdf, 0x7f, 0x76, 0x78, 0x57, 0x21, 0xd8, 0x79, 0x3a, 0x12, 0x34, 0xff, 0xac, 0xeb, 0x74, 0x10, 0x68, 0xdf, 0x3f, 0x39, 0xbc, 0xeb, 0x10, 0xec, 0x3d,
0x04, 0x14, 0x8e, 0xd6, 0x94, 0xc7, 0xb7, 0x48, 0x46, 0x36, 0xb5, 0x11, 0xd9, 0xaf, 0x20, 0x7b, 0x1e, 0x02, 0x0a, 0x47, 0x1b, 0xca, 0xe3, 0x5b, 0x24, 0x23, 0x9b, 0xda, 0x8a, 0xec, 0x57, 0x90,
0xc7, 0xfc, 0xc9, 0x3c, 0x5a, 0x28, 0x46, 0x89, 0x34, 0x35, 0x8d, 0x84, 0x2c, 0x28, 0xf6, 0x3f, 0xbb, 0x65, 0xae, 0xb7, 0x08, 0x97, 0x8a, 0x51, 0x22, 0x4d, 0x6d, 0x2d, 0x21, 0x4b, 0x8a, 0xf9,
0xb2, 0x90, 0x8d, 0x41, 0x54, 0x85, 0xcc, 0x20, 0x1c, 0x2e, 0xb2, 0xfb, 0xea, 0xf1, 0xb1, 0xc5, 0x8f, 0x1c, 0xe4, 0x62, 0x10, 0xd5, 0x21, 0x33, 0x0a, 0xc6, 0xcb, 0xec, 0xbe, 0x78, 0x78, 0x6c,
0xdf, 0x7a, 0x38, 0xe4, 0x44, 0x73, 0x51, 0x15, 0x9e, 0xc5, 0xaa, 0xa8, 0x08, 0xe7, 0xd1, 0x80, 0xf9, 0xb7, 0x19, 0x8c, 0x39, 0x51, 0x5c, 0x54, 0x87, 0x27, 0xb1, 0x2a, 0x1a, 0x05, 0x8b, 0x70,
0xd3, 0xd9, 0xfc, 0xf6, 0x9e, 0x3f, 0xc4, 0x09, 0x3f, 0x8a, 0x85, 0x5d, 0x2d, 0xbb, 0xd6, 0x22, 0xc4, 0xe9, 0x7c, 0x71, 0x73, 0xc7, 0xef, 0xe3, 0x84, 0x1f, 0xc5, 0xc2, 0xbe, 0x92, 0x5d, 0x2b,
0xf4, 0x07, 0x28, 0xa9, 0x8a, 0x0e, 0xf8, 0x84, 0xce, 0x67, 0x43, 0xb6, 0x2c, 0x82, 0x72, 0xc2, 0x11, 0xfa, 0x03, 0x94, 0x65, 0x45, 0xfb, 0xdc, 0xa3, 0x8b, 0xf9, 0x98, 0xad, 0x8a, 0xa0, 0x9a,
0x62, 0xdd, 0x10, 0xfa, 0x5a, 0x4e, 0x8a, 0x83, 0xe4, 0x27, 0x3a, 0x85, 0xdc, 0x58, 0x4e, 0x06, 0xb0, 0xd8, 0xd4, 0x84, 0xa1, 0x92, 0x93, 0xd2, 0x28, 0xf9, 0x89, 0x4e, 0x21, 0x3f, 0x15, 0xde,
0x26, 0x7b, 0x19, 0xdd, 0x14, 0xfb, 0x0a, 0xd0, 0x79, 0xb3, 0xa1, 0x18, 0x06, 0x7e, 0x18, 0x50, 0x48, 0x67, 0x2f, 0xa3, 0x9a, 0xe2, 0x40, 0x02, 0x2a, 0x6f, 0x26, 0x94, 0x02, 0xdf, 0x0d, 0x7c,
0x31, 0x66, 0xb4, 0xfa, 0xf6, 0x6b, 0xdd, 0xac, 0x05, 0x92, 0xd7, 0x60, 0x77, 0xcc, 0xaa, 0x6f, 0x1a, 0x4d, 0x19, 0xad, 0xbf, 0xfe, 0x5a, 0x35, 0x6b, 0x91, 0x14, 0x14, 0xd8, 0x9f, 0xb2, 0xfa,
0xbf, 0x46, 0x9f, 0x43, 0x5e, 0xb7, 0x0c, 0xff, 0x38, 0xf3, 0xa3, 0x07, 0xdd, 0xa5, 0x45, 0xa2, 0xeb, 0xaf, 0xd1, 0xe7, 0x50, 0x50, 0x2d, 0xc3, 0x3f, 0xcc, 0xdd, 0xf0, 0x5e, 0x75, 0x69, 0x89,
0xbb, 0x08, 0x6b, 0x04, 0x1d, 0xc3, 0xee, 0xdd, 0x84, 0x8d, 0x84, 0xee, 0xcc, 0x22, 0x31, 0x1f, 0xa8, 0x2e, 0xc2, 0x0a, 0x41, 0xc7, 0x90, 0xbd, 0xf5, 0xd8, 0x24, 0x52, 0x9d, 0x59, 0x22, 0xfa,
0xf6, 0x7f, 0x33, 0x90, 0x4f, 0x84, 0x00, 0x15, 0x60, 0x9f, 0xe0, 0x2e, 0x26, 0x1f, 0x70, 0xc3, 0xc3, 0xfc, 0x5f, 0x06, 0x0a, 0x89, 0x10, 0xa0, 0x22, 0x1c, 0x10, 0xdc, 0xc7, 0xe4, 0x1d, 0x6e,
0xfa, 0x0c, 0x95, 0xe1, 0xb8, 0xef, 0xbe, 0x77, 0xbd, 0xef, 0x5d, 0x7a, 0x5d, 0xbb, 0xe9, 0x60, 0x19, 0x9f, 0xa1, 0x2a, 0x1c, 0x0f, 0xed, 0xb7, 0xb6, 0xf3, 0xbd, 0x4d, 0xaf, 0x1b, 0xef, 0x7b,
0xb7, 0x47, 0x5b, 0xb5, 0x6e, 0xcb, 0x4a, 0xa1, 0x97, 0x50, 0x76, 0xdc, 0xba, 0x47, 0x08, 0xae, 0xd8, 0x1e, 0xd0, 0x4e, 0xa3, 0xdf, 0x31, 0x52, 0xe8, 0x39, 0x54, 0x2d, 0xbb, 0xe9, 0x10, 0x82,
0xf7, 0x96, 0xb2, 0x5a, 0xc7, 0xeb, 0xbb, 0x3d, 0x6b, 0x07, 0x7d, 0x0e, 0xa7, 0x4d, 0xc7, 0xad, 0x9b, 0x83, 0x95, 0xac, 0xd1, 0x73, 0x86, 0xf6, 0xc0, 0xd8, 0x43, 0x9f, 0xc3, 0x69, 0xdb, 0xb2,
0xb5, 0xe9, 0x8a, 0x53, 0x6f, 0xf7, 0x3e, 0x50, 0xfc, 0xc3, 0xb5, 0x43, 0x6e, 0xac, 0xf4, 0x36, 0x1b, 0x5d, 0xba, 0xe6, 0x34, 0xbb, 0x83, 0x77, 0x14, 0xff, 0x70, 0x6d, 0x91, 0xf7, 0x46, 0x7a,
0x42, 0xab, 0xd7, 0xae, 0x2f, 0x34, 0x64, 0xd0, 0x0b, 0x78, 0x66, 0x08, 0xe6, 0x08, 0xed, 0x79, 0x17, 0xa1, 0x33, 0xe8, 0x36, 0x97, 0x1a, 0x32, 0xe8, 0x19, 0x3c, 0xd1, 0x04, 0x7d, 0x84, 0x0e,
0x1e, 0xed, 0x7a, 0x9e, 0x6b, 0xed, 0xa2, 0x43, 0x28, 0x3a, 0xee, 0x87, 0x5a, 0xdb, 0x69, 0x50, 0x1c, 0x87, 0xf6, 0x1d, 0xc7, 0x36, 0xb2, 0xe8, 0x10, 0x4a, 0x96, 0xfd, 0xae, 0xd1, 0xb5, 0x5a,
0x82, 0x6b, 0xed, 0x8e, 0xb5, 0x87, 0x8e, 0xe0, 0x60, 0x93, 0x97, 0x55, 0x2a, 0x16, 0x3c, 0xcf, 0x94, 0xe0, 0x46, 0xb7, 0x67, 0xec, 0xa3, 0x23, 0xa8, 0x6c, 0xf3, 0x72, 0x52, 0xc5, 0x92, 0xe7,
0x75, 0x3c, 0x97, 0x7e, 0xc0, 0xa4, 0xeb, 0x78, 0xae, 0xb5, 0x8f, 0x4e, 0x00, 0xad, 0x8b, 0x5a, 0xd8, 0x96, 0x63, 0xd3, 0x77, 0x98, 0xf4, 0x2d, 0xc7, 0x36, 0x0e, 0xd0, 0x09, 0xa0, 0x4d, 0x51,
0x9d, 0x5a, 0xdd, 0xca, 0xa1, 0x67, 0x70, 0xb8, 0x8e, 0xbf, 0xc7, 0x37, 0x16, 0xa8, 0x30, 0x18, 0xa7, 0xd7, 0x68, 0x1a, 0x79, 0xf4, 0x04, 0x0e, 0x37, 0xf1, 0xb7, 0xf8, 0xbd, 0x01, 0x32, 0x0c,
0xc7, 0xe8, 0x3b, 0xdc, 0xf6, 0xbe, 0xa7, 0x1d, 0xc7, 0x75, 0x3a, 0xfd, 0x8e, 0x95, 0x47, 0xc7, 0xda, 0x31, 0xfa, 0x06, 0x77, 0x9d, 0xef, 0x69, 0xcf, 0xb2, 0xad, 0xde, 0xb0, 0x67, 0x14, 0xd0,
0x60, 0x35, 0x31, 0xa6, 0x8e, 0xdb, 0xed, 0x37, 0x9b, 0x4e, 0xdd, 0xc1, 0x6e, 0xcf, 0x2a, 0x18, 0x31, 0x18, 0x6d, 0x8c, 0xa9, 0x65, 0xf7, 0x87, 0xed, 0xb6, 0xd5, 0xb4, 0xb0, 0x3d, 0x30, 0x8a,
0xcb, 0xdb, 0x2e, 0x5e, 0x54, 0x07, 0xea, 0xad, 0x9a, 0xeb, 0xe2, 0x36, 0x6d, 0x38, 0xdd, 0xda, 0xda, 0xf2, 0xae, 0x8b, 0x97, 0xe4, 0x81, 0x66, 0xa7, 0x61, 0xdb, 0xb8, 0x4b, 0x5b, 0x56, 0xbf,
0xbb, 0x36, 0x6e, 0x58, 0x25, 0x74, 0x06, 0x2f, 0x7a, 0xb8, 0x73, 0xed, 0x91, 0x1a, 0xb9, 0xa1, 0xf1, 0xa6, 0x8b, 0x5b, 0x46, 0x19, 0x9d, 0xc1, 0xb3, 0x01, 0xee, 0x5d, 0x3b, 0xa4, 0x41, 0xde,
0x0b, 0x79, 0xb3, 0xe6, 0xb4, 0xfb, 0x04, 0x5b, 0x07, 0xe8, 0x0b, 0x38, 0x23, 0xf8, 0xbb, 0xbe, 0xd3, 0xa5, 0xbc, 0xdd, 0xb0, 0xba, 0x43, 0x82, 0x8d, 0x0a, 0xfa, 0x02, 0xce, 0x08, 0xfe, 0x6e,
0x43, 0x70, 0x83, 0xba, 0x5e, 0x03, 0xd3, 0x26, 0xae, 0xf5, 0xfa, 0x04, 0xd3, 0x8e, 0xd3, 0xed, 0x68, 0x11, 0xdc, 0xa2, 0xb6, 0xd3, 0xc2, 0xb4, 0x8d, 0x1b, 0x83, 0x21, 0xc1, 0xb4, 0x67, 0xf5,
0x3a, 0xee, 0xb7, 0x96, 0x85, 0x7e, 0x09, 0xe7, 0x4b, 0xca, 0x52, 0xc1, 0x06, 0xeb, 0x50, 0xdd, 0xfb, 0x96, 0xfd, 0xad, 0x61, 0xa0, 0x5f, 0xc2, 0xf9, 0x8a, 0xb2, 0x52, 0xb0, 0xc5, 0x3a, 0x94,
0x6f, 0x91, 0x4f, 0x17, 0xff, 0xd0, 0xa3, 0xd7, 0x18, 0x13, 0x0b, 0xa1, 0x0a, 0x9c, 0xac, 0xcc, 0xf7, 0x5b, 0xe6, 0xd3, 0xc6, 0x3f, 0x0c, 0xe8, 0x35, 0xc6, 0xc4, 0x40, 0xa8, 0x06, 0x27, 0x6b,
0x1b, 0x03, 0xb1, 0xed, 0x23, 0x25, 0xbb, 0xc6, 0xa4, 0x53, 0x73, 0x55, 0x82, 0xd7, 0x64, 0xc7, 0xf3, 0xda, 0x40, 0x6c, 0xfb, 0x48, 0xca, 0xae, 0x31, 0xe9, 0x35, 0x6c, 0x99, 0xe0, 0x0d, 0xd9,
0xca, 0xed, 0x95, 0x6c, 0xd3, 0xed, 0x67, 0xf6, 0x3f, 0xd3, 0x50, 0x5c, 0x2b, 0x7a, 0xf4, 0x12, 0xb1, 0x74, 0x7b, 0x2d, 0xdb, 0x76, 0xfb, 0x89, 0xf9, 0xaf, 0x34, 0x94, 0x36, 0x8a, 0x1e, 0x3d,
0x72, 0xc2, 0x1f, 0x05, 0x4c, 0xaa, 0x56, 0x36, 0x5d, 0xbe, 0x02, 0xf4, 0xd4, 0x1f, 0x33, 0x3f, 0x87, 0x7c, 0xe4, 0x4e, 0x7c, 0x26, 0x64, 0x2b, 0xeb, 0x2e, 0x5f, 0x03, 0x6a, 0xea, 0x4f, 0x99,
0x30, 0xe3, 0xc5, 0x74, 0x5b, 0x4e, 0x23, 0x7a, 0xb8, 0x3c, 0x87, 0xec, 0xe2, 0xd5, 0x48, 0xeb, 0xeb, 0xeb, 0xf1, 0xa2, 0xbb, 0x2d, 0xaf, 0x10, 0x35, 0x5c, 0x9e, 0x42, 0x6e, 0xf9, 0x6a, 0xa4,
0x06, 0xd9, 0x1b, 0x98, 0xd7, 0xe2, 0x25, 0xe4, 0xd4, 0xfc, 0x12, 0x92, 0x4d, 0x67, 0xba, 0x77, 0x55, 0x83, 0xec, 0x8f, 0xf4, 0x6b, 0xf1, 0x1c, 0xf2, 0x72, 0x7e, 0x45, 0x82, 0xcd, 0xe6, 0xaa,
0x8a, 0x64, 0x05, 0xa0, 0x5f, 0x40, 0x71, 0xca, 0x85, 0x60, 0x23, 0x4e, 0x4d, 0xfd, 0x83, 0x66, 0x77, 0x4a, 0x64, 0x0d, 0xa0, 0x5f, 0x40, 0x69, 0xc6, 0xa3, 0x88, 0x4d, 0x38, 0xd5, 0xf5, 0x0f,
0x14, 0x62, 0xb0, 0xa9, 0x30, 0x45, 0x5a, 0xf4, 0xaf, 0x21, 0xed, 0x1a, 0x52, 0x0c, 0x1a, 0xd2, 0x8a, 0x51, 0x8c, 0xc1, 0xb6, 0xc4, 0x24, 0x69, 0xd9, 0xbf, 0x9a, 0x94, 0xd5, 0xa4, 0x18, 0xd4,
0xe6, 0xf8, 0x94, 0x2c, 0x6e, 0xb3, 0xe4, 0xf8, 0x94, 0x0c, 0xbd, 0x81, 0x43, 0xd3, 0xcb, 0x7e, 0xa4, 0xed, 0xf1, 0x29, 0x58, 0xdc, 0x66, 0xc9, 0xf1, 0x29, 0x18, 0x7a, 0x05, 0x87, 0xba, 0x97,
0xe0, 0x4f, 0xe7, 0x53, 0xd3, 0xd3, 0x59, 0xed, 0xf2, 0x81, 0xee, 0x69, 0x83, 0xeb, 0xd6, 0x7e, 0x5d, 0xdf, 0x9d, 0x2d, 0x66, 0xba, 0xa7, 0x73, 0xca, 0xe5, 0x8a, 0xea, 0x69, 0x8d, 0xab, 0xd6,
0x01, 0xfb, 0xb7, 0x4c, 0x70, 0x35, 0xb9, 0xf5, 0x5b, 0x58, 0x24, 0x59, 0xf5, 0xdd, 0xe4, 0x5c, 0x7e, 0x06, 0x07, 0x37, 0x2c, 0xe2, 0x72, 0x72, 0xab, 0xb7, 0xb0, 0x44, 0x72, 0xf2, 0xbb, 0xcd,
0x89, 0xd4, 0x3c, 0x8f, 0xd4, 0x34, 0xc9, 0x19, 0xd1, 0x1d, 0xe7, 0x44, 0xc5, 0x71, 0x69, 0x81, 0xb9, 0x14, 0xc9, 0x79, 0x1e, 0xca, 0x69, 0x92, 0xd7, 0xa2, 0x5b, 0xce, 0x89, 0x8c, 0xe3, 0xca,
0x7d, 0x5c, 0x59, 0xc8, 0x27, 0x2c, 0x18, 0x5c, 0x5b, 0x78, 0x03, 0x87, 0xfc, 0xa3, 0x8c, 0x18, 0x02, 0xfb, 0xb0, 0xb6, 0x50, 0x48, 0x58, 0xd0, 0xb8, 0xb2, 0xf0, 0x0a, 0x0e, 0xf9, 0x07, 0x11,
0x0d, 0x67, 0xec, 0xc7, 0x39, 0xa7, 0x43, 0x26, 0x59, 0xb9, 0xa0, 0x83, 0x7b, 0xa0, 0x05, 0x9e, 0x32, 0x1a, 0xcc, 0xd9, 0x8f, 0x0b, 0x4e, 0xc7, 0x4c, 0xb0, 0x6a, 0x51, 0x05, 0xb7, 0xa2, 0x04,
0xc6, 0x1b, 0x4c, 0x32, 0xfb, 0x25, 0x54, 0x08, 0x17, 0x5c, 0x76, 0x7c, 0x21, 0xfc, 0x30, 0xa8, 0x8e, 0xc2, 0x5b, 0x4c, 0x30, 0xf3, 0x39, 0xd4, 0x08, 0x8f, 0xb8, 0xe8, 0xb9, 0x51, 0xe4, 0x06,
0x87, 0x81, 0x8c, 0xc2, 0x49, 0xfc, 0x00, 0xd8, 0x67, 0x70, 0xba, 0x55, 0x6a, 0x26, 0xb8, 0x3a, 0x7e, 0x33, 0xf0, 0x45, 0x18, 0x78, 0xf1, 0x03, 0x60, 0x9e, 0xc1, 0xe9, 0x4e, 0xa9, 0x9e, 0xe0,
0xfc, 0xdd, 0x9c, 0x47, 0x0f, 0xdb, 0x0f, 0xbf, 0x87, 0xd3, 0xad, 0xd2, 0x78, 0xfc, 0x7f, 0x05, 0xf2, 0xf0, 0x77, 0x0b, 0x1e, 0xde, 0xef, 0x3e, 0xfc, 0x16, 0x4e, 0x77, 0x4a, 0xe3, 0xf1, 0xff,
0xbb, 0x41, 0x38, 0xe4, 0xa2, 0x9c, 0x3a, 0x4f, 0x5f, 0xe4, 0xab, 0x27, 0x89, 0xb9, 0xe9, 0x86, 0x15, 0x64, 0xfd, 0x60, 0xcc, 0xa3, 0x6a, 0xea, 0x3c, 0x7d, 0x51, 0xa8, 0x9f, 0x24, 0xe6, 0xa6,
0x43, 0xde, 0xf2, 0x85, 0x0c, 0xa3, 0x07, 0x62, 0x48, 0xf6, 0xbf, 0x53, 0x90, 0x4f, 0xc0, 0xe8, 0x1d, 0x8c, 0x79, 0xc7, 0x8d, 0x44, 0x10, 0xde, 0x13, 0x4d, 0x32, 0xff, 0x93, 0x82, 0x42, 0x02,
0x04, 0xf6, 0xe2, 0x19, 0x6d, 0x8a, 0x2a, 0xfe, 0x42, 0xaf, 0xa1, 0x34, 0x61, 0x42, 0x52, 0x35, 0x46, 0x27, 0xb0, 0x1f, 0xcf, 0x68, 0x5d, 0x54, 0xf1, 0x17, 0x7a, 0x09, 0x65, 0x8f, 0x45, 0x82,
0xb2, 0xa9, 0x4a, 0x52, 0xfc, 0xde, 0x6d, 0xa0, 0xe8, 0x1b, 0x78, 0x1e, 0xca, 0x31, 0x8f, 0xcc, 0xca, 0x91, 0x4d, 0x65, 0x92, 0xe2, 0xf7, 0x6e, 0x0b, 0x45, 0xdf, 0xc0, 0xd3, 0x40, 0x4c, 0x79,
0x5a, 0x22, 0xe6, 0x83, 0x01, 0x17, 0x82, 0xce, 0xa2, 0xf0, 0x56, 0x97, 0xda, 0x0e, 0x79, 0x4a, 0xa8, 0xd7, 0x92, 0x68, 0x31, 0x1a, 0xf1, 0x28, 0xa2, 0xf3, 0x30, 0xb8, 0x51, 0xa5, 0xb6, 0x47,
0x8c, 0xde, 0xc2, 0x7e, 0x5c, 0x23, 0xa2, 0x9c, 0xd1, 0xae, 0xbf, 0x78, 0x3c, 0xf2, 0x17, 0xde, 0x1e, 0x13, 0xa3, 0xd7, 0x70, 0x10, 0xd7, 0x48, 0x54, 0xcd, 0x28, 0xd7, 0x9f, 0x3d, 0x1c, 0xf9,
0x2f, 0xa9, 0xf6, 0xbf, 0x52, 0x50, 0x5a, 0x17, 0xa2, 0x57, 0xba, 0xfa, 0x75, 0x09, 0xfa, 0x43, 0x4b, 0xef, 0x57, 0x54, 0xf3, 0xdf, 0x29, 0x28, 0x6f, 0x0a, 0xd1, 0x0b, 0x55, 0xfd, 0xaa, 0x04,
0x7d, 0x8f, 0x0c, 0x49, 0x20, 0x3f, 0xfb, 0x2e, 0x55, 0x38, 0x9e, 0xfa, 0x01, 0x9d, 0xf1, 0x80, 0xdd, 0xb1, 0xba, 0x47, 0x86, 0x24, 0x90, 0x4f, 0xbe, 0x4b, 0x1d, 0x8e, 0x67, 0xae, 0x4f, 0xe7,
0x4d, 0xfc, 0xbf, 0x72, 0xba, 0x58, 0x24, 0xd2, 0x9a, 0xbd, 0x55, 0x86, 0x6c, 0x28, 0xac, 0x5d, 0xdc, 0x67, 0x9e, 0xfb, 0x57, 0x4e, 0x97, 0x8b, 0x44, 0x5a, 0xb1, 0x77, 0xca, 0x90, 0x09, 0xc5,
0x3a, 0xa3, 0x2f, 0xbd, 0x86, 0xbd, 0xe9, 0x43, 0x21, 0xb9, 0x11, 0xa1, 0x22, 0xe4, 0x1c, 0x97, 0x8d, 0x4b, 0x67, 0xd4, 0xa5, 0x37, 0xb0, 0x57, 0xff, 0x4c, 0x41, 0x31, 0xb9, 0x12, 0xa1, 0x12,
0x36, 0xdb, 0xce, 0xb7, 0xad, 0x9e, 0xf5, 0x99, 0xfa, 0xec, 0xf6, 0xeb, 0x75, 0x8c, 0x1b, 0xb8, 0xe4, 0x2d, 0x9b, 0xb6, 0xbb, 0xd6, 0xb7, 0x9d, 0x81, 0xf1, 0x99, 0xfc, 0xec, 0x0f, 0x9b, 0x4d,
0x61, 0xa5, 0x10, 0x82, 0x92, 0x1a, 0x04, 0xb8, 0x41, 0x7b, 0x4e, 0x07, 0x7b, 0x7d, 0xf5, 0x2a, 0x8c, 0x5b, 0xb8, 0x65, 0xa4, 0x10, 0x82, 0xb2, 0x9c, 0x04, 0xb8, 0x45, 0x07, 0x56, 0x0f, 0x3b,
0x1c, 0xc1, 0x41, 0x8c, 0xb9, 0x1e, 0x25, 0x5e, 0xbf, 0x87, 0xad, 0x74, 0xf5, 0xef, 0x19, 0xd8, 0x43, 0xf9, 0x2c, 0x1c, 0x41, 0x25, 0xc6, 0x6c, 0x87, 0x12, 0x67, 0x38, 0xc0, 0x46, 0x1a, 0x19,
0xd3, 0x9b, 0x40, 0x84, 0x5a, 0x90, 0x4f, 0xac, 0xc7, 0xe8, 0x2c, 0x11, 0xc8, 0xc7, 0x6b, 0x73, 0x50, 0x8c, 0x41, 0x4c, 0x88, 0x43, 0x8c, 0x8c, 0x9c, 0x65, 0x31, 0xf2, 0xf0, 0x89, 0x69, 0xe1,
0xa5, 0xbc, 0x7d, 0x55, 0x9b, 0x8b, 0xdf, 0xa4, 0xd0, 0x1f, 0xa1, 0x90, 0x5c, 0x10, 0x51, 0xf2, 0x41, 0xc3, 0xea, 0xf6, 0x8d, 0x6c, 0xfd, 0xef, 0x19, 0xd8, 0x57, 0x2b, 0x44, 0x88, 0x3a, 0x50,
0xe1, 0xdf, 0xb2, 0x39, 0x7e, 0x52, 0xd7, 0x7b, 0xb0, 0xb0, 0x90, 0xfe, 0x54, 0x3d, 0xda, 0xf1, 0x48, 0xec, 0xd5, 0xe8, 0x2c, 0x91, 0x81, 0x87, 0xfb, 0x76, 0xad, 0xba, 0x7b, 0xc7, 0x5b, 0x44,
0xea, 0x85, 0x2a, 0x09, 0xfe, 0xc6, 0x3e, 0x57, 0x39, 0xdd, 0x2a, 0x8b, 0xcb, 0xbc, 0x6d, 0xae, 0xbf, 0x49, 0xa1, 0x3f, 0x42, 0x31, 0xb9, 0x59, 0xa2, 0xe4, 0xc6, 0xb0, 0x63, 0xe5, 0xfc, 0xa8,
0x18, 0x2f, 0x3f, 0x8f, 0xae, 0xb8, 0xbe, 0x71, 0x55, 0x5e, 0x3d, 0x25, 0x8e, 0xb5, 0x0d, 0xe1, 0xae, 0xb7, 0x60, 0xe0, 0x48, 0xb8, 0x33, 0xf9, 0xda, 0xc7, 0x3b, 0x1b, 0xaa, 0x25, 0xf8, 0x5b,
0x68, 0x4b, 0x43, 0xa2, 0x5f, 0x25, 0x3d, 0x78, 0xb2, 0x9d, 0x2b, 0xaf, 0xff, 0x1f, 0x6d, 0x65, 0x8b, 0x60, 0xed, 0x74, 0xa7, 0x2c, 0xee, 0x8f, 0xae, 0xbe, 0x62, 0xbc, 0x35, 0x3d, 0xb8, 0xe2,
0x65, 0x4b, 0xe7, 0xae, 0x59, 0x79, 0xba, 0xef, 0xd7, 0xac, 0x7c, 0x62, 0x00, 0xbc, 0xfb, 0xed, 0xe6, 0xaa, 0x56, 0x7b, 0xf1, 0x98, 0x38, 0xd6, 0x36, 0x86, 0xa3, 0x1d, 0x9d, 0x8c, 0x7e, 0x95,
0x9f, 0xae, 0x46, 0xbe, 0x1c, 0xcf, 0x6f, 0x2f, 0x07, 0xe1, 0xf4, 0x6a, 0xe2, 0x8f, 0xc6, 0x32, 0xf4, 0xe0, 0xd1, 0x39, 0x50, 0x7b, 0xf9, 0x73, 0xb4, 0xb5, 0x95, 0x1d, 0x2d, 0xbf, 0x61, 0xe5,
0xf0, 0x83, 0x51, 0xc0, 0xe5, 0x5f, 0xc2, 0xe8, 0xfe, 0x6a, 0x12, 0x0c, 0xaf, 0xf4, 0x32, 0x79, 0xf1, 0x81, 0xb1, 0x61, 0xe5, 0x23, 0x93, 0xe3, 0xcd, 0x6f, 0xff, 0x74, 0x35, 0x71, 0xc5, 0x74,
0xb5, 0x54, 0x77, 0xbb, 0xa7, 0xff, 0xad, 0xfa, 0xdd, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9a, 0x71, 0x73, 0x39, 0x0a, 0x66, 0x57, 0x9e, 0x3b, 0x99, 0x0a, 0xdf, 0xf5, 0x27, 0x3e, 0x17, 0x7f,
0xf3, 0x15, 0x70, 0x86, 0x0d, 0x00, 0x00, 0x09, 0xc2, 0xbb, 0x2b, 0xcf, 0x1f, 0x5f, 0xa9, 0x2d, 0xf4, 0x6a, 0xa5, 0xee, 0x66, 0x5f, 0xfd,
0x3f, 0xf6, 0xbb, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x24, 0x56, 0xf2, 0xbf, 0x0d, 0x00,
0x00,
} }
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

11
lnrpc/routerrpc/router.proto
View file

@ -86,6 +86,17 @@ enum PaymentState {
routes to the destination at all. routes to the destination at all.
*/ */
FAILED_NO_ROUTE = 3; FAILED_NO_ROUTE = 3;
/**
A non-recoverable error has occured.
*/
FAILED_ERROR = 4;
/**
Payment details incorrect (unknown hash, invalid amt or
invalid final cltv delta)
*/
FAILED_INCORRECT_PAYMENT_DETAILS = 5;
} }

39
lnrpc/routerrpc/router_server.go
View file

@ -539,17 +539,13 @@ func (s *Server) trackPayment(paymentHash lntypes.Hash,
result.Route, result.Route,
) )
} else { } else {
switch result.FailureReason { state, err := marshallFailureReason(
result.FailureReason,
case channeldb.FailureReasonTimeout: )
status.State = PaymentState_FAILED_TIMEOUT if err != nil {
return err
case channeldb.FailureReasonNoRoute:
status.State = PaymentState_FAILED_NO_ROUTE
default:
return errors.New("unknown failure reason")
} }
status.State = state
} }
// Send event to the client. // Send event to the client.
@ -565,3 +561,26 @@ func (s *Server) trackPayment(paymentHash lntypes.Hash,
return nil return nil
} }
// marshallFailureReason marshalls the failure reason to the corresponding rpc
// type.
func marshallFailureReason(reason channeldb.FailureReason) (
PaymentState, error) {
switch reason {
case channeldb.FailureReasonTimeout:
return PaymentState_FAILED_TIMEOUT, nil
case channeldb.FailureReasonNoRoute:
return PaymentState_FAILED_NO_ROUTE, nil
case channeldb.FailureReasonError:
return PaymentState_FAILED_ERROR, nil
case channeldb.FailureReasonIncorrectPaymentDetails:
return PaymentState_FAILED_INCORRECT_PAYMENT_DETAILS, nil
}
return 0, errors.New("unknown failure reason")
}

2
lntest/itest/lnd_test.go
View file

@ -13803,7 +13803,7 @@ func testHoldInvoicePersistence(net *lntest.NetworkHarness, t *harnessTest) {
status.State) status.State)
} }
} else { } else {
if status.State != routerrpc.PaymentState_FAILED_NO_ROUTE { if status.State != routerrpc.PaymentState_FAILED_INCORRECT_PAYMENT_DETAILS {
t.Fatalf("state not failed: %v", t.Fatalf("state not failed: %v",
status.State) status.State)
} }

48
routing/payment_lifecycle.go
View file

@ -338,39 +338,41 @@ func (p *paymentLifecycle) sendPaymentAttempt(firstHop lnwire.ShortChannelID,
// handleSendError inspects the given error from the Switch and determines // handleSendError inspects the given error from the Switch and determines
// whether we should make another payment attempt. // whether we should make another payment attempt.
func (p *paymentLifecycle) handleSendError(sendErr error) error { func (p *paymentLifecycle) handleSendError(sendErr error) error {
var finalOutcome bool var reason channeldb.FailureReason
// If an internal, non-forwarding error occurred, we can stop trying. // If an internal, non-forwarding error occurred, we can stop trying.
fErr, ok := sendErr.(*htlcswitch.ForwardingError) fErr, ok := sendErr.(*htlcswitch.ForwardingError)
if !ok { if !ok {
finalOutcome = true reason = channeldb.FailureReasonError
} else { } else {
finalOutcome = p.router.processSendError( var final bool
final, reason = p.router.processSendError(
p.paySession, &p.attempt.Route, fErr, p.paySession, &p.attempt.Route, fErr,
) )
// Save the forwarding error so it can be returned if this turns if !final {
// out to be the last attempt. // Save the forwarding error so it can be returned if
p.lastError = fErr // this turns out to be the last attempt.
} p.lastError = fErr
if finalOutcome { return nil
log.Errorf("Payment %x failed with final outcome: %v",
p.payment.PaymentHash, sendErr)
// Mark the payment failed with no route.
// TODO(halseth): make payment codes for the actual reason we
// don't continue path finding.
err := p.router.cfg.Control.Fail(
p.payment.PaymentHash, channeldb.FailureReasonNoRoute,
)
if err != nil {
return err
} }
// Terminal state, return the error we encountered.
return sendErr
} }
return nil log.Debugf("Payment %x failed: final_outcome=%v, raw_err=%v",
p.payment.PaymentHash, reason, sendErr)
// Mark the payment failed with no route.
//
// TODO(halseth): make payment codes for the actual reason we don't
// continue path finding.
err := p.router.cfg.Control.Fail(
p.payment.PaymentHash, reason,
)
if err != nil {
return err
}
// Terminal state, return the error we encountered.
return sendErr
} }

74
routing/router.go
View file

@ -1805,7 +1805,8 @@ func (r *ChannelRouter) sendPayment(
// to continue with an alternative route. This is indicated by the boolean // to continue with an alternative route. This is indicated by the boolean
// return value. // return value.
func (r *ChannelRouter) processSendError(paySession PaymentSession, func (r *ChannelRouter) processSendError(paySession PaymentSession,
rt *route.Route, fErr *htlcswitch.ForwardingError) bool { rt *route.Route, fErr *htlcswitch.ForwardingError) (
bool, channeldb.FailureReason) {
errSource := fErr.ErrorSource errSource := fErr.ErrorSource
errVertex := route.NewVertex(errSource) errVertex := route.NewVertex(errSource)
@ -1818,7 +1819,7 @@ func (r *ChannelRouter) processSendError(paySession PaymentSession,
rt, route.Vertex(errVertex), rt, route.Vertex(errVertex),
) )
if err != nil { if err != nil {
return true return true, channeldb.FailureReasonError
} }
// processChannelUpdateAndRetry is a closure that // processChannelUpdateAndRetry is a closure that
@ -1861,22 +1862,33 @@ func (r *ChannelRouter) processSendError(paySession PaymentSession,
// hash or we sent the wrong payment amount to the // hash or we sent the wrong payment amount to the
// destination, then we'll terminate immediately. // destination, then we'll terminate immediately.
case *lnwire.FailUnknownPaymentHash: case *lnwire.FailUnknownPaymentHash:
return true // TODO(joostjager): Check onionErr.Amount() whether it matches
// what we expect. (Will it ever not match, because if not
// final_incorrect_htlc_amount would be returned?)
return true, channeldb.FailureReasonIncorrectPaymentDetails
// If we sent the wrong amount to the destination, then // If we sent the wrong amount to the destination, then
// we'll exit early. // we'll exit early.
case *lnwire.FailIncorrectPaymentAmount: case *lnwire.FailIncorrectPaymentAmount:
return true return true, channeldb.FailureReasonIncorrectPaymentDetails
// If the time-lock that was extended to the final node // If the time-lock that was extended to the final node
// was incorrect, then we can't proceed. // was incorrect, then we can't proceed.
case *lnwire.FailFinalIncorrectCltvExpiry: case *lnwire.FailFinalIncorrectCltvExpiry:
return true // TODO(joostjager): Take into account that second last hop may
// have deliberately handed out an htlc that expires too soon.
// In that case we should continue routing.
return true, channeldb.FailureReasonError
// If we crafted an invalid onion payload for the final // If we crafted an invalid onion payload for the final
// node, then we'll exit early. // node, then we'll exit early.
case *lnwire.FailFinalIncorrectHtlcAmount: case *lnwire.FailFinalIncorrectHtlcAmount:
return true // TODO(joostjager): Take into account that second last hop may
// have deliberately handed out an htlc with a too low value. In
// that case we should continue routing.
return true, channeldb.FailureReasonError
// Similarly, if the HTLC expiry that we extended to // Similarly, if the HTLC expiry that we extended to
// the final hop expires too soon, then will fail the // the final hop expires too soon, then will fail the
@ -1885,12 +1897,15 @@ func (r *ChannelRouter) processSendError(paySession PaymentSession,
// TODO(roasbeef): can happen to to race condition, try // TODO(roasbeef): can happen to to race condition, try
// again with recent block height // again with recent block height
case *lnwire.FailFinalExpiryTooSoon: case *lnwire.FailFinalExpiryTooSoon:
return true // TODO(joostjager): Take into account that any hop may have
// delayed. Ideally we should continue routing. Knowing the
// delaying node at this point would help.
return true, channeldb.FailureReasonIncorrectPaymentDetails
// If we erroneously attempted to cross a chain border, // If we erroneously attempted to cross a chain border,
// then we'll cancel the payment. // then we'll cancel the payment.
case *lnwire.FailInvalidRealm: case *lnwire.FailInvalidRealm:
return true return true, channeldb.FailureReasonError
// If we get a notice that the expiry was too soon for // If we get a notice that the expiry was too soon for
// an intermediate node, then we'll prune out the node // an intermediate node, then we'll prune out the node
@ -1899,17 +1914,20 @@ func (r *ChannelRouter) processSendError(paySession PaymentSession,
case *lnwire.FailExpiryTooSoon: case *lnwire.FailExpiryTooSoon:
r.applyChannelUpdate(&onionErr.Update, errSource) r.applyChannelUpdate(&onionErr.Update, errSource)
paySession.ReportVertexFailure(errVertex) paySession.ReportVertexFailure(errVertex)
return false return false, 0
// If we hit an instance of onion payload corruption or // If we hit an instance of onion payload corruption or an invalid
// an invalid version, then we'll exit early as this // version, then we'll exit early as this shouldn't happen in the
// shouldn't happen in the typical case. // typical case.
//
// TODO(joostjager): Take into account that the previous hop may have
// tampered with the onion. Routing should continue using other paths.
case *lnwire.FailInvalidOnionVersion: case *lnwire.FailInvalidOnionVersion:
return true return true, channeldb.FailureReasonError
case *lnwire.FailInvalidOnionHmac: case *lnwire.FailInvalidOnionHmac:
return true return true, channeldb.FailureReasonError
case *lnwire.FailInvalidOnionKey: case *lnwire.FailInvalidOnionKey:
return true return true, channeldb.FailureReasonError
// If we get a failure due to violating the minimum // If we get a failure due to violating the minimum
// amount, we'll apply the new minimum amount and retry // amount, we'll apply the new minimum amount and retry
@ -1918,7 +1936,7 @@ func (r *ChannelRouter) processSendError(paySession PaymentSession,
processChannelUpdateAndRetry( processChannelUpdateAndRetry(
&onionErr.Update, errSource, &onionErr.Update, errSource,
) )
return false return false, 0
// If we get a failure due to a fee, we'll apply the // If we get a failure due to a fee, we'll apply the
// new fee update, and retry our attempt using the // new fee update, and retry our attempt using the
@ -1927,7 +1945,7 @@ func (r *ChannelRouter) processSendError(paySession PaymentSession,
processChannelUpdateAndRetry( processChannelUpdateAndRetry(
&onionErr.Update, errSource, &onionErr.Update, errSource,
) )
return false return false, 0
// If we get the failure for an intermediate node that // If we get the failure for an intermediate node that
// disagrees with our time lock values, then we'll // disagrees with our time lock values, then we'll
@ -1936,7 +1954,7 @@ func (r *ChannelRouter) processSendError(paySession PaymentSession,
processChannelUpdateAndRetry( processChannelUpdateAndRetry(
&onionErr.Update, errSource, &onionErr.Update, errSource,
) )
return false return false, 0
// The outgoing channel that this node was meant to // The outgoing channel that this node was meant to
// forward one is currently disabled, so we'll apply // forward one is currently disabled, so we'll apply
@ -1944,7 +1962,7 @@ func (r *ChannelRouter) processSendError(paySession PaymentSession,
case *lnwire.FailChannelDisabled: case *lnwire.FailChannelDisabled:
r.applyChannelUpdate(&onionErr.Update, errSource) r.applyChannelUpdate(&onionErr.Update, errSource)
paySession.ReportEdgeFailure(failedEdge, 0) paySession.ReportEdgeFailure(failedEdge, 0)
return false return false, 0
// It's likely that the outgoing channel didn't have // It's likely that the outgoing channel didn't have
// sufficient capacity, so we'll prune this edge for // sufficient capacity, so we'll prune this edge for
@ -1952,21 +1970,21 @@ func (r *ChannelRouter) processSendError(paySession PaymentSession,
case *lnwire.FailTemporaryChannelFailure: case *lnwire.FailTemporaryChannelFailure:
r.applyChannelUpdate(onionErr.Update, errSource) r.applyChannelUpdate(onionErr.Update, errSource)
paySession.ReportEdgeFailure(failedEdge, failedAmt) paySession.ReportEdgeFailure(failedEdge, failedAmt)
return false return false, 0
// If the send fail due to a node not having the // If the send fail due to a node not having the
// required features, then we'll note this error and // required features, then we'll note this error and
// continue. // continue.
case *lnwire.FailRequiredNodeFeatureMissing: case *lnwire.FailRequiredNodeFeatureMissing:
paySession.ReportVertexFailure(errVertex) paySession.ReportVertexFailure(errVertex)
return false return false, 0
// If the send fail due to a node not having the // If the send fail due to a node not having the
// required features, then we'll note this error and // required features, then we'll note this error and
// continue. // continue.
case *lnwire.FailRequiredChannelFeatureMissing: case *lnwire.FailRequiredChannelFeatureMissing:
paySession.ReportVertexFailure(errVertex) paySession.ReportVertexFailure(errVertex)
return false return false, 0
// If the next hop in the route wasn't known or // If the next hop in the route wasn't known or
// offline, we'll only the channel which we attempted // offline, we'll only the channel which we attempted
@ -1977,18 +1995,18 @@ func (r *ChannelRouter) processSendError(paySession PaymentSession,
// another node. // another node.
case *lnwire.FailUnknownNextPeer: case *lnwire.FailUnknownNextPeer:
paySession.ReportEdgeFailure(failedEdge, 0) paySession.ReportEdgeFailure(failedEdge, 0)
return false return false, 0
// If the node wasn't able to forward for which ever // If the node wasn't able to forward for which ever
// reason, then we'll note this and continue with the // reason, then we'll note this and continue with the
// routes. // routes.
case *lnwire.FailTemporaryNodeFailure: case *lnwire.FailTemporaryNodeFailure:
paySession.ReportVertexFailure(errVertex) paySession.ReportVertexFailure(errVertex)
return false return false, 0
case *lnwire.FailPermanentNodeFailure: case *lnwire.FailPermanentNodeFailure:
paySession.ReportVertexFailure(errVertex) paySession.ReportVertexFailure(errVertex)
return false return false, 0
// If we crafted a route that contains a too long time // If we crafted a route that contains a too long time
// lock for an intermediate node, we'll prune the node. // lock for an intermediate node, we'll prune the node.
@ -2001,7 +2019,7 @@ func (r *ChannelRouter) processSendError(paySession PaymentSession,
// that node. // that node.
case *lnwire.FailExpiryTooFar: case *lnwire.FailExpiryTooFar:
paySession.ReportVertexFailure(errVertex) paySession.ReportVertexFailure(errVertex)
return false return false, 0
// If we get a permanent channel or node failure, then // If we get a permanent channel or node failure, then
// we'll prune the channel in both directions and // we'll prune the channel in both directions and
@ -2013,10 +2031,10 @@ func (r *ChannelRouter) processSendError(paySession PaymentSession,
to: failedEdge.from, to: failedEdge.from,
channel: failedEdge.channel, channel: failedEdge.channel,
}, 0) }, 0)
return false return false, 0
default: default:
return true return true, channeldb.FailureReasonError
} }
} }