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

routing+routerrpc: also expose amt for success results in mc

Browse Source
This commit is contained in:
Joost Jager 2019-09-26 16:33:08 +02:00
parent 6f9fcfaccc
commit 62f8cca75b
No known key found for this signature in database
GPG Key ID: A61B9D4C393C59C7
9 changed files with 187 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/lncli/cmd_query_mission_control.go
View File

@ -35,7 +35,7 @@ func queryMissionControl(ctx *cli.Context) error {
NodeFrom, NodeTo string NodeFrom, NodeTo string
LastAttemptSuccessful bool LastAttemptSuccessful bool
Timestamp int64 Timestamp int64
MinPenalizeAmtSat int64 AmtSat, AmtMsat int64
} }
displayResp := struct { displayResp := struct {
@ -50,7 +50,8 @@ func queryMissionControl(ctx *cli.Context) error {
NodeTo: hex.EncodeToString(n.NodeTo), NodeTo: hex.EncodeToString(n.NodeTo),
LastAttemptSuccessful: n.History.LastAttemptSuccessful, LastAttemptSuccessful: n.History.LastAttemptSuccessful,
Timestamp: n.History.Timestamp, Timestamp: n.History.Timestamp,
MinPenalizeAmtSat: n.History.MinPenalizeAmtSat, AmtMsat: n.History.AmtMsat,
AmtSat: n.History.AmtSat,
}, },
) )
} }

269
lnrpc/routerrpc/router.pb.go
View File

@ -1159,8 +1159,10 @@ func (m *PairHistory) GetHistory() *PairData {
type PairData struct { type PairData struct {
/// Time stamp of last result. /// Time stamp of last result.
Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
/// Minimum penalization amount (only applies to failed attempts). /// Last amount that was forwarded rounded to whole satoshis.
MinPenalizeAmtSat int64 `protobuf:"varint,2,opt,name=min_penalize_amt_sat,proto3" json:"min_penalize_amt_sat,omitempty"` AmtSat int64 `protobuf:"varint,2,opt,name=amt_sat,proto3" json:"amt_sat,omitempty"`
/// Last amount that was forwarded in millisatoshis.
AmtMsat int64 `protobuf:"varint,4,opt,name=amt_msat,proto3" json:"amt_msat,omitempty"`
/// Whether the last payment attempt through this pair was successful. /// Whether the last payment attempt through this pair was successful.
LastAttemptSuccessful bool `protobuf:"varint,3,opt,name=last_attempt_successful,proto3" json:"last_attempt_successful,omitempty"` LastAttemptSuccessful bool `protobuf:"varint,3,opt,name=last_attempt_successful,proto3" json:"last_attempt_successful,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
@ -1200,9 +1202,16 @@ func (m *PairData) GetTimestamp() int64 {
return 0 return 0
} }
func (m *PairData) GetMinPenalizeAmtSat() int64 { func (m *PairData) GetAmtSat() int64 {
if m != nil { if m != nil {
return m.MinPenalizeAmtSat return m.AmtSat
}
return 0
}
func (m *PairData) GetAmtMsat() int64 {
if m != nil {
return m.AmtMsat
} }
return 0 return 0
} }
@ -1465,132 +1474,132 @@ 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{
// 1993 bytes of a gzipped FileDescriptorProto // 1986 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0x4f, 0x73, 0x1a, 0xc9, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0x51, 0x73, 0x1a, 0xc9,
0x15, 0xdf, 0x11, 0x20, 0xe0, 0x01, 0xd2, 0xa8, 0xa5, 0x95, 0xc7, 0x48, 0x5a, 0x6b, 0xc7, 0x8e, 0xf1, 0xbf, 0x15, 0x20, 0xa0, 0x01, 0x69, 0x35, 0x92, 0xe5, 0x35, 0x92, 0xce, 0xba, 0xb5, 0xff,
0x57, 0xe5, 0xf2, 0x4a, 0x8e, 0x52, 0xbb, 0xe5, 0xda, 0x43, 0x52, 0x18, 0x86, 0xd5, 0xc8, 0x30, 0x3e, 0x95, 0xcb, 0x27, 0xf9, 0xaf, 0xd4, 0x5d, 0xb9, 0xee, 0x21, 0x29, 0x0c, 0xcb, 0x69, 0x65,
0xc8, 0x0d, 0x78, 0xd7, 0xd9, 0x43, 0x57, 0x0b, 0x5a, 0x62, 0x4a, 0xc3, 0x0c, 0x3b, 0xd3, 0x38, 0x58, 0xe4, 0x01, 0x7c, 0xe7, 0xdc, 0xc3, 0xd4, 0x08, 0x46, 0x62, 0x4b, 0xcb, 0x2e, 0xb7, 0x3b,
0x56, 0x3e, 0x43, 0x72, 0xcd, 0x57, 0x48, 0x0e, 0xc9, 0x29, 0xdf, 0x29, 0xa9, 0xca, 0x3d, 0xf7, 0x38, 0xd6, 0x77, 0x48, 0xde, 0xf3, 0x0d, 0x92, 0x87, 0xe4, 0x29, 0xdf, 0x29, 0xa9, 0xca, 0x7b,
0x54, 0x77, 0xcf, 0xc0, 0x80, 0x90, 0x36, 0x27, 0xa6, 0x7f, 0xef, 0x75, 0xbf, 0xee, 0xf7, 0xe7, 0xde, 0x53, 0x33, 0xb3, 0x0b, 0x0b, 0x42, 0xba, 0x3c, 0xb1, 0xf3, 0xeb, 0x9e, 0xe9, 0x9e, 0xe9,
0xd7, 0xaf, 0x81, 0xdd, 0x30, 0x98, 0x72, 0x16, 0x86, 0x93, 0xc1, 0x89, 0xfa, 0x3a, 0x9e, 0x84, 0xee, 0xdf, 0xf4, 0x00, 0xbb, 0x61, 0x30, 0xe5, 0x2c, 0x0c, 0x27, 0x83, 0x13, 0xf5, 0x75, 0x3c,
0x01, 0x0f, 0x50, 0x71, 0x86, 0x57, 0x8b, 0xe1, 0x64, 0xa0, 0x50, 0xf3, 0x3f, 0x59, 0x40, 0x5d, 0x09, 0x03, 0x1e, 0xa0, 0xe2, 0x0c, 0xaf, 0x16, 0xc3, 0xc9, 0x40, 0xa1, 0xe6, 0xbf, 0xb3, 0x80,
0xe6, 0x0f, 0x2f, 0xe8, 0xed, 0x98, 0xf9, 0x1c, 0xb3, 0x9f, 0xa7, 0x2c, 0xe2, 0x08, 0x41, 0x76, 0xba, 0xcc, 0x1f, 0x5e, 0xd0, 0xdb, 0x31, 0xf3, 0x39, 0x66, 0xbf, 0x4c, 0x59, 0xc4, 0x11, 0x82,
0xc8, 0x22, 0x6e, 0x68, 0x87, 0xda, 0x51, 0x19, 0xcb, 0x6f, 0xa4, 0x43, 0x86, 0x8e, 0xb9, 0xb1, 0xec, 0x90, 0x45, 0xdc, 0xd0, 0x0e, 0xb5, 0xa3, 0x32, 0x96, 0xdf, 0x48, 0x87, 0x0c, 0x1d, 0x73,
0x76, 0xa8, 0x1d, 0x65, 0xb0, 0xf8, 0x44, 0x8f, 0xa1, 0x40, 0xc7, 0x9c, 0x8c, 0x23, 0xca, 0x8d, 0x63, 0xed, 0x50, 0x3b, 0xca, 0x60, 0xf1, 0x89, 0x9e, 0x40, 0x81, 0x8e, 0x39, 0x19, 0x47, 0x94,
0xb2, 0x84, 0xf3, 0x74, 0xcc, 0xdb, 0x11, 0xe5, 0xe8, 0x4b, 0x28, 0x4f, 0xd4, 0x92, 0x64, 0x44, 0x1b, 0x65, 0x09, 0xe7, 0xe9, 0x98, 0xb7, 0x23, 0xca, 0xd1, 0x57, 0x50, 0x9e, 0xa8, 0x25, 0xc9,
0xa3, 0x91, 0x91, 0x91, 0x0b, 0x95, 0x62, 0xec, 0x8c, 0x46, 0x23, 0x74, 0x04, 0xfa, 0x95, 0xeb, 0x88, 0x46, 0x23, 0x23, 0x23, 0x17, 0x2a, 0xc5, 0xd8, 0x19, 0x8d, 0x46, 0xe8, 0x08, 0xf4, 0x2b,
0x53, 0x8f, 0x0c, 0x3c, 0xfe, 0x91, 0x0c, 0x99, 0xc7, 0xa9, 0x91, 0x3d, 0xd4, 0x8e, 0x72, 0x78, 0xd7, 0xa7, 0x1e, 0x19, 0x78, 0xfc, 0x13, 0x19, 0x32, 0x8f, 0x53, 0x23, 0x7b, 0xa8, 0x1d, 0xe5,
0x43, 0xe2, 0x75, 0x8f, 0x7f, 0x6c, 0x08, 0x14, 0x7d, 0x05, 0x9b, 0xc9, 0x62, 0xa1, 0xda, 0xa0, 0xf0, 0x86, 0xc4, 0xeb, 0x1e, 0xff, 0xd4, 0x10, 0x28, 0xfa, 0x1a, 0x36, 0x93, 0xc5, 0x42, 0xe5,
0x91, 0x3b, 0xd4, 0x8e, 0x8a, 0x78, 0x63, 0xb2, 0xb8, 0xed, 0xaf, 0x60, 0x93, 0xbb, 0x63, 0x16, 0xa0, 0x91, 0x3b, 0xd4, 0x8e, 0x8a, 0x78, 0x63, 0xb2, 0xe8, 0xf6, 0xd7, 0xb0, 0xc9, 0xdd, 0x31,
0x4c, 0x39, 0x89, 0xd8, 0x20, 0xf0, 0x87, 0x91, 0xb1, 0xae, 0x56, 0x8c, 0xe1, 0xae, 0x42, 0x91, 0x0b, 0xa6, 0x9c, 0x44, 0x6c, 0x10, 0xf8, 0xc3, 0xc8, 0x58, 0x57, 0x2b, 0xc6, 0x70, 0x57, 0xa1,
0x09, 0x95, 0x2b, 0xc6, 0x88, 0xe7, 0x8e, 0x5d, 0x4e, 0xc4, 0xf6, 0xf3, 0x72, 0xfb, 0xa5, 0x2b, 0xc8, 0x84, 0xca, 0x15, 0x63, 0xc4, 0x73, 0xc7, 0x2e, 0x27, 0xc2, 0xfd, 0xbc, 0x74, 0xbf, 0x74,
0xc6, 0x5a, 0x02, 0xeb, 0x52, 0x8e, 0x9e, 0xc1, 0xc6, 0x5c, 0x47, 0x9e, 0xb1, 0x22, 0x95, 0xca, 0xc5, 0x58, 0x4b, 0x60, 0x5d, 0xca, 0xd1, 0x73, 0xd8, 0x98, 0xeb, 0xc8, 0x3d, 0x56, 0xa4, 0x52,
0x89, 0x92, 0x3c, 0xe8, 0x4b, 0xd0, 0x83, 0x29, 0xbf, 0x0e, 0x5c, 0xff, 0x9a, 0x0c, 0x46, 0xd4, 0x39, 0x51, 0x92, 0x1b, 0x7d, 0x05, 0x7a, 0x30, 0xe5, 0xd7, 0x81, 0xeb, 0x5f, 0x93, 0xc1, 0x88,
0x27, 0xee, 0xd0, 0x28, 0x1c, 0x6a, 0x47, 0xd9, 0x37, 0x6b, 0xaf, 0x34, 0xbc, 0x91, 0xc8, 0xea, 0xfa, 0xc4, 0x1d, 0x1a, 0x85, 0x43, 0xed, 0x28, 0xfb, 0x76, 0xed, 0xb5, 0x86, 0x37, 0x12, 0x59,
0x23, 0xea, 0xdb, 0x43, 0xf4, 0x1c, 0x36, 0x3d, 0x1a, 0x71, 0x32, 0x0a, 0x26, 0x64, 0x32, 0xbd, 0x7d, 0x44, 0x7d, 0x7b, 0x88, 0x5e, 0xc0, 0xa6, 0x47, 0x23, 0x4e, 0x46, 0xc1, 0x84, 0x4c, 0xa6,
0xbc, 0x61, 0xb7, 0xc6, 0x86, 0xf4, 0x4c, 0x45, 0xc0, 0x67, 0xc1, 0xe4, 0x42, 0x82, 0xe8, 0x00, 0x97, 0x37, 0xec, 0xd6, 0xd8, 0x90, 0x27, 0x53, 0x11, 0xf0, 0x59, 0x30, 0xb9, 0x90, 0x20, 0x3a,
0x40, 0x7a, 0x45, 0x1a, 0x37, 0x8a, 0xf2, 0x0c, 0x45, 0x81, 0x48, 0xc3, 0xe8, 0x14, 0x4a, 0x32, 0x00, 0x90, 0xa7, 0x22, 0x8d, 0x1b, 0x45, 0xb9, 0x87, 0xa2, 0x40, 0xa4, 0x61, 0x74, 0x0a, 0x25,
0x9a, 0x64, 0xe4, 0xfa, 0x3c, 0x32, 0xe0, 0x30, 0x73, 0x54, 0x3a, 0xd5, 0x8f, 0x3d, 0x5f, 0x04, 0x19, 0x4d, 0x32, 0x72, 0x7d, 0x1e, 0x19, 0x70, 0x98, 0x39, 0x2a, 0x9d, 0xea, 0xc7, 0x9e, 0x2f,
0x16, 0x0b, 0xc9, 0x99, 0xeb, 0x73, 0x9c, 0x56, 0x42, 0x16, 0x14, 0x44, 0x18, 0x09, 0xf7, 0x3e, 0x02, 0x8b, 0x85, 0xe4, 0xcc, 0xf5, 0x39, 0x4e, 0x2b, 0x21, 0x0b, 0x0a, 0x22, 0x8c, 0x84, 0x7b,
0x1a, 0x25, 0x39, 0xe1, 0xc5, 0xf1, 0x2c, 0x25, 0x8e, 0xef, 0xe6, 0xc0, 0x71, 0x83, 0x45, 0xbc, 0x9f, 0x8c, 0x92, 0x9c, 0xf0, 0xf2, 0x78, 0x96, 0x12, 0xc7, 0x77, 0x73, 0xe0, 0xb8, 0xc1, 0x22,
0xe7, 0x7d, 0xb4, 0x7c, 0x1e, 0xde, 0xe2, 0xfc, 0x50, 0x8d, 0xaa, 0xdf, 0x41, 0x39, 0x2d, 0x10, 0xde, 0xf3, 0x3e, 0x59, 0x3e, 0x0f, 0x6f, 0x71, 0x7e, 0xa8, 0x46, 0xd5, 0xef, 0xa1, 0x9c, 0x16,
0x59, 0x21, 0x4e, 0x21, 0x12, 0x25, 0x8b, 0xc5, 0x27, 0xda, 0x81, 0xdc, 0x47, 0xea, 0x4d, 0x99, 0x88, 0xac, 0x10, 0xbb, 0x10, 0x89, 0x92, 0xc5, 0xe2, 0x13, 0xed, 0x40, 0xee, 0x13, 0xf5, 0xa6,
0xcc, 0x94, 0x32, 0x56, 0x83, 0xef, 0xd6, 0x5e, 0x6b, 0xe6, 0x6b, 0xd8, 0xee, 0x85, 0x74, 0x70, 0x4c, 0x66, 0x4a, 0x19, 0xab, 0xc1, 0xf7, 0x6b, 0x6f, 0x34, 0xf3, 0x0d, 0x6c, 0xf7, 0x42, 0x3a,
0xb3, 0x94, 0x6c, 0xcb, 0xb9, 0xa2, 0xdd, 0xc9, 0x15, 0xf3, 0x6f, 0x1a, 0x54, 0xe2, 0x59, 0x5d, 0xb8, 0x59, 0x4a, 0xb6, 0xe5, 0x5c, 0xd1, 0xee, 0xe4, 0x8a, 0xf9, 0x57, 0x0d, 0x2a, 0xf1, 0xac,
0x4e, 0xf9, 0x34, 0x42, 0x5f, 0x43, 0x2e, 0xe2, 0x94, 0x33, 0xa9, 0xbd, 0x71, 0xfa, 0x28, 0x75, 0x2e, 0xa7, 0x7c, 0x1a, 0xa1, 0x6f, 0x20, 0x17, 0x71, 0xca, 0x99, 0xd4, 0xde, 0x38, 0x7d, 0x9c,
0x96, 0x94, 0x22, 0xc3, 0x4a, 0x0b, 0x55, 0xa1, 0x30, 0x09, 0x99, 0x3b, 0xa6, 0xd7, 0xc9, 0xbe, 0xda, 0x4b, 0x4a, 0x91, 0x61, 0xa5, 0x85, 0xaa, 0x50, 0x98, 0x84, 0xcc, 0x1d, 0xd3, 0xeb, 0xc4,
0x66, 0x63, 0x64, 0x42, 0x4e, 0x4e, 0x96, 0x49, 0x5a, 0x3a, 0x2d, 0xa7, 0xfd, 0x88, 0x95, 0x08, 0xaf, 0xd9, 0x18, 0x99, 0x90, 0x93, 0x93, 0x65, 0x92, 0x96, 0x4e, 0xcb, 0xe9, 0x73, 0xc4, 0x4a,
0x1d, 0x41, 0x6e, 0xc4, 0xbd, 0x41, 0x64, 0x64, 0xa5, 0xeb, 0x50, 0xac, 0x73, 0xd6, 0x6b, 0xd5, 0x84, 0x8e, 0x20, 0x37, 0xe2, 0xde, 0x20, 0x32, 0xb2, 0xf2, 0xe8, 0x50, 0xac, 0x73, 0xd6, 0x6b,
0x6b, 0x9c, 0xb3, 0xf1, 0x84, 0x63, 0xa5, 0x60, 0xfe, 0x16, 0x36, 0xe5, 0xcc, 0x26, 0x63, 0x0f, 0xd5, 0x6b, 0x9c, 0xb3, 0xf1, 0x84, 0x63, 0xa5, 0x60, 0xfe, 0x16, 0x36, 0xe5, 0xcc, 0x26, 0x63,
0x55, 0xd3, 0x23, 0x10, 0xb5, 0x22, 0x73, 0x4f, 0x55, 0xd4, 0x3a, 0x1d, 0x8b, 0xb4, 0x33, 0x87, 0x0f, 0x55, 0xd3, 0x63, 0x10, 0xb5, 0x22, 0x73, 0x4f, 0x55, 0xd4, 0x3a, 0x1d, 0x8b, 0xb4, 0x33,
0xa0, 0xcf, 0xe7, 0x47, 0x93, 0xc0, 0x8f, 0x84, 0x75, 0x5d, 0x6c, 0x43, 0xe4, 0x98, 0x48, 0x49, 0x87, 0xa0, 0xcf, 0xe7, 0x47, 0x93, 0xc0, 0x8f, 0x84, 0x75, 0x5d, 0xb8, 0x21, 0x72, 0x4c, 0xa4,
0x99, 0x8c, 0x9a, 0x9c, 0xb5, 0x11, 0xe3, 0x4d, 0xc6, 0x64, 0x3a, 0x3e, 0x57, 0x15, 0x40, 0xbc, 0xa4, 0x4c, 0x46, 0x4d, 0xce, 0xda, 0x88, 0xf1, 0x26, 0x63, 0x32, 0x1d, 0x5f, 0xa8, 0x0a, 0x20,
0x60, 0x70, 0x23, 0x6a, 0x8a, 0xde, 0xc6, 0xcb, 0x57, 0x04, 0xdc, 0x0a, 0x06, 0x37, 0x0d, 0x01, 0x5e, 0x30, 0xb8, 0x11, 0x35, 0x45, 0x6f, 0xe3, 0xe5, 0x2b, 0x02, 0x6e, 0x05, 0x83, 0x9b, 0x86,
0x9a, 0x3f, 0xa9, 0xb2, 0xef, 0x05, 0xea, 0x94, 0xff, 0x77, 0x24, 0xe6, 0xce, 0x5a, 0xbb, 0xd7, 0x00, 0xcd, 0x9f, 0x55, 0xd9, 0xf7, 0x02, 0xb5, 0xcb, 0xff, 0x39, 0x12, 0xf3, 0xc3, 0x5a, 0xbb,
0x59, 0x26, 0x81, 0xed, 0x85, 0xc5, 0xe3, 0x53, 0xa4, 0x63, 0xa0, 0x2d, 0xc5, 0xe0, 0x25, 0xe4, 0xf7, 0xb0, 0x4c, 0x02, 0xdb, 0x0b, 0x8b, 0xc7, 0xbb, 0x48, 0xc7, 0x40, 0x5b, 0x8a, 0xc1, 0x2b,
0xaf, 0xa8, 0xeb, 0x4d, 0xc3, 0x64, 0x61, 0x94, 0x0a, 0x68, 0x53, 0x49, 0x70, 0xa2, 0x62, 0xfe, 0xc8, 0x5f, 0x51, 0xd7, 0x9b, 0x86, 0xc9, 0xc2, 0x28, 0x15, 0xd0, 0xa6, 0x92, 0xe0, 0x44, 0xc5,
0x37, 0x0f, 0xf9, 0x18, 0x44, 0xa7, 0x90, 0x1d, 0x04, 0xc3, 0x24, 0x0f, 0xbe, 0xb8, 0x3b, 0x2d, 0xfc, 0x4f, 0x1e, 0xf2, 0x31, 0x88, 0x4e, 0x21, 0x3b, 0x08, 0x86, 0x49, 0x1e, 0x7c, 0x79, 0x77,
0xf9, 0xad, 0x07, 0x43, 0x86, 0xa5, 0x2e, 0xfa, 0x1d, 0x6c, 0x88, 0x5a, 0xf5, 0x99, 0x47, 0xa6, 0x5a, 0xf2, 0x5b, 0x0f, 0x86, 0x0c, 0x4b, 0x5d, 0xf4, 0x3b, 0xd8, 0x10, 0xb5, 0xea, 0x33, 0x8f,
0x93, 0x21, 0x9d, 0x85, 0xde, 0x48, 0xcd, 0xae, 0x2b, 0x85, 0xbe, 0x94, 0xe3, 0xca, 0x20, 0x3d, 0x4c, 0x27, 0x43, 0x3a, 0x0b, 0xbd, 0x91, 0x9a, 0x5d, 0x57, 0x0a, 0x7d, 0x29, 0xc7, 0x95, 0x41,
0x44, 0x7b, 0x50, 0x14, 0xd1, 0x56, 0x91, 0xc8, 0xca, 0xdc, 0x2f, 0x08, 0x40, 0xc6, 0xc0, 0x84, 0x7a, 0x88, 0xf6, 0xa0, 0x28, 0xa2, 0xad, 0x22, 0x91, 0x95, 0xb9, 0x5f, 0x10, 0x80, 0x8c, 0x81,
0x4a, 0xe0, 0xbb, 0x81, 0x4f, 0xa2, 0x11, 0x25, 0xa7, 0xdf, 0x7c, 0x2b, 0xc9, 0xaa, 0x8c, 0x4b, 0x09, 0x95, 0xc0, 0x77, 0x03, 0x9f, 0x44, 0x23, 0x4a, 0x4e, 0xbf, 0xfd, 0x4e, 0x92, 0x55, 0x19,
0x12, 0xec, 0x8e, 0xe8, 0xe9, 0x37, 0xdf, 0xa2, 0x27, 0x50, 0x92, 0x05, 0xce, 0x3e, 0x4d, 0xdc, 0x97, 0x24, 0xd8, 0x1d, 0xd1, 0xd3, 0x6f, 0xbf, 0x43, 0x4f, 0xa1, 0x24, 0x0b, 0x9c, 0x7d, 0x9e,
0xf0, 0x56, 0xb2, 0x54, 0x05, 0xcb, 0x9a, 0xb7, 0x24, 0x22, 0xaa, 0xe8, 0xca, 0xa3, 0xd7, 0x91, 0xb8, 0xe1, 0xad, 0x64, 0xa9, 0x0a, 0x96, 0x35, 0x6f, 0x49, 0x44, 0x54, 0xd1, 0x95, 0x47, 0xaf,
0x64, 0xa6, 0x0a, 0x56, 0x03, 0xf4, 0x0a, 0x76, 0x62, 0x1f, 0x90, 0x28, 0x98, 0x86, 0x03, 0x46, 0x23, 0xc9, 0x4c, 0x15, 0xac, 0x06, 0xe8, 0x35, 0xec, 0xc4, 0x67, 0x40, 0xa2, 0x60, 0x1a, 0x0e,
0x5c, 0x7f, 0xc8, 0x3e, 0x49, 0xc6, 0xa9, 0x60, 0x14, 0xcb, 0xba, 0x52, 0x64, 0x0b, 0x09, 0xda, 0x18, 0x71, 0xfd, 0x21, 0xfb, 0x2c, 0x19, 0xa7, 0x82, 0x51, 0x2c, 0xeb, 0x4a, 0x91, 0x2d, 0x24,
0x85, 0xf5, 0x11, 0x73, 0xaf, 0x47, 0x8a, 0x45, 0x2a, 0x38, 0x1e, 0x99, 0x7f, 0xcf, 0x41, 0x29, 0x68, 0x17, 0xd6, 0x47, 0xcc, 0xbd, 0x1e, 0x29, 0x16, 0xa9, 0xe0, 0x78, 0x64, 0xfe, 0x2d, 0x07,
0xe5, 0x18, 0x54, 0x86, 0x02, 0xb6, 0xba, 0x16, 0x7e, 0x6f, 0x35, 0xf4, 0xcf, 0xd0, 0x11, 0x3c, 0xa5, 0xd4, 0xc1, 0xa0, 0x32, 0x14, 0xb0, 0xd5, 0xb5, 0xf0, 0x07, 0xab, 0xa1, 0x7f, 0x81, 0x8e,
0xb3, 0x9d, 0x7a, 0x07, 0x63, 0xab, 0xde, 0x23, 0x1d, 0x4c, 0xfa, 0xce, 0x5b, 0xa7, 0xf3, 0x83, 0xe0, 0xb9, 0xed, 0xd4, 0x3b, 0x18, 0x5b, 0xf5, 0x1e, 0xe9, 0x60, 0xd2, 0x77, 0xde, 0x39, 0x9d,
0x43, 0x2e, 0x6a, 0x1f, 0xda, 0x96, 0xd3, 0x23, 0x0d, 0xab, 0x57, 0xb3, 0x5b, 0x5d, 0x5d, 0x43, 0x1f, 0x1d, 0x72, 0x51, 0xfb, 0xd8, 0xb6, 0x9c, 0x1e, 0x69, 0x58, 0xbd, 0x9a, 0xdd, 0xea, 0xea,
0xfb, 0x60, 0xcc, 0x35, 0x13, 0x71, 0xad, 0xdd, 0xe9, 0x3b, 0x3d, 0x7d, 0x0d, 0x3d, 0x81, 0xbd, 0x1a, 0xda, 0x07, 0x63, 0xae, 0x99, 0x88, 0x6b, 0xed, 0x4e, 0xdf, 0xe9, 0xe9, 0x6b, 0xe8, 0x29,
0xa6, 0xed, 0xd4, 0x5a, 0x64, 0xae, 0x53, 0x6f, 0xf5, 0xde, 0x13, 0xeb, 0xc7, 0x0b, 0x1b, 0x7f, 0xec, 0x35, 0x6d, 0xa7, 0xd6, 0x22, 0x73, 0x9d, 0x7a, 0xab, 0xf7, 0x81, 0x58, 0x3f, 0x5d, 0xd8,
0xd0, 0x33, 0xab, 0x14, 0x44, 0x4d, 0x25, 0x2b, 0x64, 0xd1, 0x63, 0xf8, 0x5c, 0x29, 0xa8, 0x29, 0xf8, 0xa3, 0x9e, 0x59, 0xa5, 0x20, 0x6a, 0x2a, 0x59, 0x21, 0x8b, 0x9e, 0xc0, 0x23, 0xa5, 0xa0,
0xa4, 0xd7, 0xe9, 0x90, 0x6e, 0xa7, 0xe3, 0xe8, 0x39, 0xb4, 0x05, 0x15, 0xdb, 0x79, 0x5f, 0x6b, 0xa6, 0x90, 0x5e, 0xa7, 0x43, 0xba, 0x9d, 0x8e, 0xa3, 0xe7, 0xd0, 0x16, 0x54, 0x6c, 0xe7, 0x43,
0xd9, 0x0d, 0x82, 0xad, 0x5a, 0xab, 0xad, 0xaf, 0xa3, 0x6d, 0xd8, 0x5c, 0xd6, 0xcb, 0x8b, 0x25, 0xad, 0x65, 0x37, 0x08, 0xb6, 0x6a, 0xad, 0xb6, 0xbe, 0x8e, 0xb6, 0x61, 0x73, 0x59, 0x2f, 0x2f,
0x12, 0xbd, 0x8e, 0x63, 0x77, 0x1c, 0xf2, 0xde, 0xc2, 0x5d, 0xbb, 0xe3, 0xe8, 0x05, 0xb4, 0x0b, 0x96, 0x48, 0xf4, 0x3a, 0x8e, 0xdd, 0x71, 0xc8, 0x07, 0x0b, 0x77, 0xed, 0x8e, 0xa3, 0x17, 0xd0,
0x68, 0x51, 0x74, 0xd6, 0xae, 0xd5, 0xf5, 0x22, 0xfa, 0x1c, 0xb6, 0x16, 0xf1, 0xb7, 0xd6, 0x07, 0x2e, 0xa0, 0x45, 0xd1, 0x59, 0xbb, 0x56, 0xd7, 0x8b, 0xe8, 0x11, 0x6c, 0x2d, 0xe2, 0xef, 0xac,
0x1d, 0x90, 0x01, 0x3b, 0x6a, 0x63, 0xe4, 0x8d, 0xd5, 0xea, 0xfc, 0x40, 0xda, 0xb6, 0x63, 0xb7, 0x8f, 0x3a, 0x20, 0x03, 0x76, 0x94, 0x63, 0xe4, 0xad, 0xd5, 0xea, 0xfc, 0x48, 0xda, 0xb6, 0x63,
0xfb, 0x6d, 0xbd, 0x84, 0x76, 0x40, 0x6f, 0x5a, 0x16, 0xb1, 0x9d, 0x6e, 0xbf, 0xd9, 0xb4, 0xeb, 0xb7, 0xfb, 0x6d, 0xbd, 0x84, 0x76, 0x40, 0x6f, 0x5a, 0x16, 0xb1, 0x9d, 0x6e, 0xbf, 0xd9, 0xb4,
0xb6, 0xe5, 0xf4, 0xf4, 0xb2, 0xb2, 0xbc, 0xea, 0xe0, 0x15, 0x31, 0xa1, 0x7e, 0x56, 0x73, 0x1c, 0xeb, 0xb6, 0xe5, 0xf4, 0xf4, 0xb2, 0xb2, 0xbc, 0x6a, 0xe3, 0x15, 0x31, 0xa1, 0x7e, 0x56, 0x73,
0xab, 0x45, 0x1a, 0x76, 0xb7, 0xf6, 0xa6, 0x65, 0x35, 0xf4, 0x0d, 0x74, 0x00, 0x8f, 0x7b, 0x56, 0x1c, 0xab, 0x45, 0x1a, 0x76, 0xb7, 0xf6, 0xb6, 0x65, 0x35, 0xf4, 0x0d, 0x74, 0x00, 0x4f, 0x7a,
0xfb, 0xa2, 0x83, 0x6b, 0xf8, 0x03, 0x49, 0xe4, 0xcd, 0x9a, 0xdd, 0xea, 0x63, 0x4b, 0xdf, 0x44, 0x56, 0xfb, 0xa2, 0x83, 0x6b, 0xf8, 0x23, 0x49, 0xe4, 0xcd, 0x9a, 0xdd, 0xea, 0x63, 0x4b, 0xdf,
0x5f, 0xc2, 0x01, 0xb6, 0xde, 0xf5, 0x6d, 0x6c, 0x35, 0x88, 0xd3, 0x69, 0x58, 0xa4, 0x69, 0xd5, 0x44, 0x5f, 0xc1, 0x01, 0xb6, 0xde, 0xf7, 0x6d, 0x6c, 0x35, 0x88, 0xd3, 0x69, 0x58, 0xa4, 0x69,
0x7a, 0x7d, 0x6c, 0x91, 0xb6, 0xdd, 0xed, 0xda, 0xce, 0xf7, 0xba, 0x8e, 0x9e, 0xc1, 0xe1, 0x4c, 0xd5, 0x7a, 0x7d, 0x6c, 0x91, 0xb6, 0xdd, 0xed, 0xda, 0xce, 0x0f, 0xba, 0x8e, 0x9e, 0xc3, 0xe1,
0x65, 0xb6, 0xc0, 0x92, 0xd6, 0x96, 0x38, 0x5f, 0x12, 0x52, 0xc7, 0xfa, 0xb1, 0x47, 0x2e, 0x2c, 0x4c, 0x65, 0xb6, 0xc0, 0x92, 0xd6, 0x96, 0xd8, 0x5f, 0x12, 0x52, 0xc7, 0xfa, 0xa9, 0x47, 0x2e,
0x0b, 0xeb, 0x08, 0x55, 0x61, 0x77, 0x6e, 0x5e, 0x19, 0x88, 0x6d, 0x6f, 0x0b, 0xd9, 0x85, 0x85, 0x2c, 0x0b, 0xeb, 0x08, 0x55, 0x61, 0x77, 0x6e, 0x5e, 0x19, 0x88, 0x6d, 0x6f, 0x0b, 0xd9, 0x85,
0xdb, 0x35, 0x47, 0x04, 0x78, 0x41, 0xb6, 0x23, 0xb6, 0x3d, 0x97, 0x2d, 0x6f, 0xfb, 0x73, 0x84, 0x85, 0xdb, 0x35, 0x47, 0x04, 0x78, 0x41, 0xb6, 0x23, 0xdc, 0x9e, 0xcb, 0x96, 0xdd, 0x7e, 0x84,
0x60, 0x23, 0x15, 0x95, 0x66, 0x0d, 0xeb, 0xbb, 0x68, 0x07, 0x36, 0x93, 0x1d, 0x24, 0x8a, 0xff, 0x10, 0x6c, 0xa4, 0xa2, 0xd2, 0xac, 0x61, 0x7d, 0x17, 0xed, 0xc0, 0x66, 0xe2, 0x41, 0xa2, 0xf8,
0xca, 0xa3, 0x47, 0x80, 0xfa, 0x0e, 0xb6, 0x6a, 0x0d, 0xe1, 0x90, 0x99, 0xe0, 0xdf, 0xf9, 0xf3, 0xcf, 0x3c, 0x7a, 0x0c, 0xa8, 0xef, 0x60, 0xab, 0xd6, 0x10, 0x07, 0x32, 0x13, 0xfc, 0x2b, 0x7f,
0x6c, 0x61, 0x4d, 0xcf, 0x98, 0xff, 0xcc, 0x40, 0x65, 0xa1, 0x2e, 0xd1, 0x3e, 0x14, 0x23, 0xf7, 0x9e, 0x2d, 0xac, 0xe9, 0x19, 0xf3, 0x1f, 0x19, 0xa8, 0x2c, 0xd4, 0x25, 0xda, 0x87, 0x62, 0xe4,
0xda, 0xa7, 0x5c, 0x30, 0x87, 0x22, 0x95, 0x39, 0x20, 0xaf, 0xd1, 0x11, 0x75, 0x7d, 0xc5, 0x66, 0x5e, 0xfb, 0x94, 0x0b, 0xe6, 0x50, 0xa4, 0x32, 0x07, 0xe4, 0x35, 0x3a, 0xa2, 0xae, 0xaf, 0xd8,
0x8a, 0xf7, 0x8b, 0x12, 0x91, 0x5c, 0xb6, 0x07, 0xf9, 0xe4, 0xca, 0xce, 0xcc, 0xae, 0xec, 0xf5, 0x4c, 0xf1, 0x7e, 0x51, 0x22, 0x92, 0xcb, 0xf6, 0x20, 0x9f, 0x5c, 0xd9, 0x99, 0xd9, 0x95, 0xbd,
0x81, 0xba, 0xaa, 0xf7, 0xa1, 0x28, 0x28, 0x33, 0xe2, 0x74, 0x3c, 0x91, 0x25, 0x5e, 0xc1, 0x73, 0x3e, 0x50, 0x57, 0xf5, 0x3e, 0x14, 0x05, 0x65, 0x46, 0x9c, 0x8e, 0x27, 0xb2, 0xc4, 0x2b, 0x78,
0x00, 0x3d, 0x85, 0xca, 0x98, 0x45, 0x11, 0xbd, 0x66, 0x44, 0x95, 0x29, 0x48, 0x8d, 0x72, 0x0c, 0x0e, 0xa0, 0x67, 0x50, 0x19, 0xb3, 0x28, 0xa2, 0xd7, 0x8c, 0xa8, 0x32, 0x05, 0xa9, 0x51, 0x8e,
0x36, 0x65, 0xb5, 0x3e, 0x85, 0x84, 0x36, 0x62, 0xa5, 0x9c, 0x52, 0x8a, 0x41, 0xa5, 0xb4, 0xcc, 0xc1, 0xa6, 0xac, 0xd6, 0x67, 0x90, 0xd0, 0x46, 0xac, 0x94, 0x53, 0x4a, 0x31, 0xa8, 0x94, 0x96,
0xd8, 0x9c, 0xc6, 0x6c, 0x90, 0x66, 0x6c, 0x4e, 0xd1, 0x0b, 0xd8, 0x52, 0x94, 0xe3, 0xfa, 0xee, 0x19, 0x9b, 0xd3, 0x98, 0x0d, 0xd2, 0x8c, 0xcd, 0x29, 0x7a, 0x09, 0x5b, 0x8a, 0x72, 0x5c, 0xdf,
0x78, 0x3a, 0x56, 0xd4, 0x93, 0x97, 0xd4, 0xb3, 0x29, 0xa9, 0x47, 0xe1, 0x92, 0x81, 0x1e, 0x43, 0x1d, 0x4f, 0xc7, 0x8a, 0x7a, 0xf2, 0x92, 0x7a, 0x36, 0x25, 0xf5, 0x28, 0x5c, 0x32, 0xd0, 0x13,
0xe1, 0x92, 0x46, 0x4c, 0x5c, 0x16, 0x31, 0x35, 0xe4, 0xc5, 0xb8, 0xc9, 0x98, 0x10, 0x89, 0x2b, 0x28, 0x5c, 0xd2, 0x88, 0x89, 0xcb, 0x22, 0xa6, 0x86, 0xbc, 0x18, 0x37, 0x19, 0x13, 0x22, 0x71,
0x24, 0x14, 0xa4, 0xa7, 0x18, 0x21, 0x7f, 0xc5, 0x18, 0x16, 0xbe, 0x9c, 0x59, 0xa0, 0x9f, 0xe6, 0x85, 0x84, 0x82, 0xf4, 0x14, 0x23, 0xe4, 0xaf, 0x18, 0xc3, 0xe2, 0x2c, 0x67, 0x16, 0xe8, 0xe7,
0x16, 0x4a, 0x29, 0x0b, 0x0a, 0x97, 0x16, 0x5e, 0xc0, 0x16, 0xfb, 0xc4, 0x43, 0x4a, 0x82, 0x09, 0xb9, 0x85, 0x52, 0xca, 0x82, 0xc2, 0xa5, 0x85, 0x97, 0xb0, 0xc5, 0x3e, 0xf3, 0x90, 0x92, 0x60,
0xfd, 0x79, 0xca, 0xc8, 0x90, 0x72, 0x2a, 0x7b, 0xc0, 0x32, 0xde, 0x94, 0x82, 0x8e, 0xc4, 0x1b, 0x42, 0x7f, 0x99, 0x32, 0x32, 0xa4, 0x9c, 0xca, 0x1e, 0xb0, 0x8c, 0x37, 0xa5, 0xa0, 0x23, 0xf1,
0x94, 0x53, 0x73, 0x1f, 0xaa, 0x98, 0x45, 0x8c, 0xb7, 0xdd, 0x28, 0x72, 0x03, 0xbf, 0x1e, 0xf8, 0x06, 0xe5, 0xd4, 0xdc, 0x87, 0x2a, 0x66, 0x11, 0xe3, 0x6d, 0x37, 0x8a, 0xdc, 0xc0, 0xaf, 0x07,
0x3c, 0x0c, 0xbc, 0xf8, 0xce, 0x31, 0x0f, 0x60, 0x6f, 0xa5, 0x54, 0x5d, 0x1a, 0x62, 0xf2, 0xbb, 0x3e, 0x0f, 0x03, 0x2f, 0xbe, 0x73, 0xcc, 0x03, 0xd8, 0x5b, 0x29, 0x55, 0x97, 0x86, 0x98, 0xfc,
0x29, 0x0b, 0x6f, 0x57, 0x4f, 0x7e, 0x07, 0x7b, 0x2b, 0xa5, 0xf1, 0x8d, 0xf3, 0x12, 0x72, 0x13, 0x7e, 0xca, 0xc2, 0xdb, 0xd5, 0x93, 0xdf, 0xc3, 0xde, 0x4a, 0x69, 0x7c, 0xe3, 0xbc, 0x82, 0xdc,
0xea, 0x86, 0x91, 0xb1, 0x26, 0x6f, 0xed, 0xdd, 0x85, 0x26, 0xc1, 0x0d, 0xcf, 0xdc, 0x88, 0x07, 0x84, 0xba, 0x61, 0x64, 0xac, 0xc9, 0x5b, 0x7b, 0x77, 0xa1, 0x49, 0x70, 0xc3, 0x33, 0x37, 0xe2,
0xe1, 0x2d, 0x56, 0x4a, 0xe7, 0xd9, 0x82, 0xa6, 0xaf, 0x99, 0x7f, 0xd2, 0xa0, 0x94, 0x12, 0x8a, 0x41, 0x78, 0x8b, 0x95, 0xd2, 0x79, 0xb6, 0xa0, 0xe9, 0x6b, 0xe6, 0x1f, 0x35, 0x28, 0xa5, 0x84,
0x3c, 0xf0, 0x83, 0x21, 0x23, 0x57, 0x61, 0x30, 0x4e, 0x32, 0x6c, 0x06, 0x20, 0x03, 0xf2, 0x72, 0x22, 0x0f, 0xfc, 0x60, 0xc8, 0xc8, 0x55, 0x18, 0x8c, 0x93, 0x0c, 0x9b, 0x01, 0xc8, 0x80, 0xbc,
0xc0, 0x83, 0x38, 0xbd, 0x92, 0x21, 0xfa, 0x1a, 0xf2, 0x23, 0xb5, 0x84, 0x8c, 0x52, 0xe9, 0x74, 0x1c, 0xf0, 0x20, 0x4e, 0xaf, 0x64, 0x88, 0xbe, 0x81, 0xfc, 0x48, 0x2d, 0x21, 0xa3, 0x54, 0x3a,
0x7b, 0xc9, 0xba, 0xf0, 0x0d, 0x4e, 0x74, 0xce, 0xb3, 0x85, 0x8c, 0x9e, 0x3d, 0xcf, 0x16, 0xb2, 0xdd, 0x5e, 0xb2, 0x2e, 0xce, 0x06, 0x27, 0x3a, 0xe7, 0xd9, 0x42, 0x46, 0xcf, 0x9e, 0x67, 0x0b,
0x7a, 0xee, 0x3c, 0x5b, 0xc8, 0xe9, 0xeb, 0xe7, 0xd9, 0xc2, 0xba, 0x9e, 0x37, 0xff, 0xa2, 0x41, 0x59, 0x3d, 0x77, 0x9e, 0x2d, 0xe4, 0xf4, 0xf5, 0xf3, 0x6c, 0x61, 0x5d, 0xcf, 0x9b, 0x7f, 0xd6,
0x21, 0xd1, 0x5e, 0xcc, 0x49, 0xd5, 0x00, 0xa4, 0x72, 0xf2, 0x14, 0x76, 0xc6, 0xae, 0x4f, 0x26, 0xa0, 0x90, 0x68, 0x2f, 0xe6, 0xa4, 0x6a, 0x00, 0x52, 0x39, 0x69, 0x2c, 0xb7, 0x14, 0xc9, 0x50,
0xcc, 0xa7, 0x9e, 0xfb, 0x47, 0x46, 0x16, 0xfb, 0x8b, 0x95, 0x32, 0xf4, 0x1a, 0x1e, 0xc9, 0x86, 0xdc, 0xbc, 0xb3, 0x46, 0x3d, 0x2b, 0x45, 0xb3, 0x31, 0x7a, 0x03, 0x8f, 0x65, 0x4b, 0x4a, 0x55,
0x94, 0xaa, 0x26, 0x86, 0x44, 0xd3, 0xc1, 0x80, 0x45, 0xd1, 0xd5, 0xd4, 0x93, 0x25, 0x51, 0xc0, 0x1b, 0x43, 0xa2, 0xe9, 0x60, 0xc0, 0xa2, 0xe8, 0x6a, 0xea, 0xc9, 0xa2, 0x28, 0xe0, 0xfb, 0xc4,
0xf7, 0x89, 0xcd, 0x31, 0x3c, 0x92, 0xae, 0xbf, 0x08, 0x83, 0x4b, 0x7a, 0xe9, 0x7a, 0x2e, 0xbf, 0xe6, 0x18, 0x1e, 0xcb, 0xc3, 0xbf, 0x08, 0x83, 0x4b, 0x7a, 0xe9, 0x7a, 0x2e, 0xbf, 0x4d, 0x1a,
0x4d, 0xda, 0x88, 0x7d, 0x28, 0x0a, 0xe7, 0x10, 0x3f, 0xb9, 0x97, 0xcb, 0x78, 0x0e, 0x08, 0x97, 0x89, 0x7d, 0x28, 0x8a, 0xe3, 0x21, 0x7e, 0x72, 0x33, 0x97, 0xf1, 0x1c, 0x10, 0x8e, 0xf2, 0x40,
0xf1, 0x40, 0xc9, 0x62, 0x97, 0xc5, 0x43, 0xd1, 0x20, 0xcc, 0xde, 0x13, 0x19, 0xb9, 0xe9, 0xd9, 0xc9, 0xe2, 0x43, 0x8b, 0x87, 0x0b, 0x8e, 0x66, 0x16, 0x1d, 0x35, 0x6f, 0xc0, 0xb8, 0x6b, 0x2e,
0xd8, 0xbc, 0x01, 0xe3, 0xae, 0xb9, 0x38, 0xcc, 0x87, 0x50, 0x9a, 0xcc, 0x61, 0x69, 0x51, 0xc3, 0x0e, 0xf4, 0x21, 0x94, 0x26, 0x73, 0x58, 0x5a, 0xd4, 0x70, 0x1a, 0x4a, 0x87, 0x63, 0xed, 0xd7,
0x69, 0x28, 0x1d, 0x8c, 0xb5, 0x5f, 0x0e, 0x86, 0xf9, 0x57, 0x0d, 0xb6, 0xde, 0x4c, 0x5d, 0x6f, 0xc3, 0x61, 0xfe, 0x45, 0x83, 0xad, 0xb7, 0x53, 0xd7, 0x1b, 0x2e, 0xf4, 0x47, 0xe9, 0x07, 0x8f,
0xb8, 0xd0, 0x1d, 0xa5, 0x9f, 0x3b, 0xda, 0xe2, 0x73, 0x67, 0xd5, 0x5b, 0x66, 0x6d, 0xe5, 0x5b, 0xb6, 0xf8, 0xe0, 0x59, 0xf5, 0x9a, 0x59, 0x5b, 0xf9, 0x9a, 0x59, 0xf5, 0x62, 0xc8, 0xdc, 0xfb,
0x66, 0xd5, 0x7b, 0x21, 0x73, 0xef, 0x7b, 0xe1, 0x09, 0x94, 0xe6, 0x4f, 0x05, 0xd5, 0x7c, 0x96, 0x62, 0x78, 0x0a, 0xa5, 0xf9, 0x63, 0x41, 0xb5, 0x9f, 0x65, 0x0c, 0xa3, 0xe4, 0xa5, 0x10, 0x99,
0x31, 0x8c, 0x92, 0x77, 0x42, 0x64, 0xbe, 0x06, 0x94, 0xde, 0x68, 0xec, 0x90, 0x59, 0x93, 0xa6, 0x6f, 0x00, 0xa5, 0x1d, 0x8d, 0x0f, 0x64, 0xd6, 0xa6, 0x69, 0xf7, 0xb6, 0x69, 0x2f, 0xff, 0xa4,
0xdd, 0xdb, 0xa4, 0xbd, 0xf8, 0xb3, 0x06, 0xe5, 0x74, 0xa7, 0x8c, 0x2a, 0x50, 0xb4, 0x1d, 0xd2, 0x41, 0x39, 0xdd, 0x2b, 0xa3, 0x0a, 0x14, 0x6d, 0x87, 0x34, 0x5b, 0xf6, 0x0f, 0x67, 0x3d, 0xfd,
0x6c, 0xd9, 0xdf, 0x9f, 0xf5, 0xf4, 0xcf, 0xc4, 0xb0, 0xdb, 0xaf, 0xd7, 0x2d, 0xab, 0x61, 0x35, 0x0b, 0x31, 0xec, 0xf6, 0xeb, 0x75, 0xcb, 0x6a, 0x58, 0x0d, 0x5d, 0x13, 0x2c, 0x2e, 0x08, 0xd9,
0x74, 0x4d, 0x70, 0xb8, 0xa0, 0x63, 0xab, 0x41, 0x7a, 0x76, 0xdb, 0xea, 0xf4, 0xc5, 0xed, 0xbe, 0x6a, 0x90, 0x9e, 0xdd, 0xb6, 0x3a, 0x7d, 0x71, 0xbf, 0x6f, 0xc3, 0x66, 0x8c, 0x39, 0x1d, 0x82,
0x0d, 0x9b, 0x31, 0xe6, 0x74, 0x08, 0xee, 0xf4, 0x7b, 0x96, 0x9e, 0x41, 0x3a, 0x94, 0x63, 0xd0, 0x3b, 0xfd, 0x9e, 0xa5, 0x67, 0x90, 0x0e, 0xe5, 0x18, 0xb4, 0x30, 0xee, 0x60, 0x3d, 0x2b, 0x2e,
0xc2, 0xb8, 0x83, 0xf5, 0xac, 0xb8, 0x92, 0x62, 0xe4, 0x6e, 0xa7, 0x90, 0x34, 0x12, 0xb9, 0xd3, 0xa5, 0x18, 0xb9, 0xdb, 0x2b, 0x24, 0xad, 0x44, 0xee, 0xf4, 0xef, 0x39, 0x58, 0x97, 0x0e, 0x86,
0x7f, 0xe4, 0x60, 0x5d, 0x6e, 0x30, 0x44, 0x67, 0x50, 0x4a, 0xbd, 0x47, 0xd0, 0xc1, 0x83, 0xef, 0xe8, 0x0c, 0x4a, 0xa9, 0x17, 0x09, 0x3a, 0x78, 0xf0, 0xa5, 0x52, 0x35, 0x56, 0x37, 0xff, 0xd3,
0x94, 0xaa, 0xb1, 0xba, 0xf5, 0x9f, 0x46, 0xaf, 0x34, 0x74, 0x0e, 0xe5, 0xf4, 0x8b, 0x03, 0xa5, 0xe8, 0xb5, 0x86, 0xce, 0xa1, 0x9c, 0x7e, 0x73, 0xa0, 0x74, 0x83, 0xb8, 0xe2, 0x31, 0xf2, 0xe0,
0xdb, 0xc3, 0x15, 0x4f, 0x91, 0x07, 0xd7, 0x7a, 0x0b, 0xba, 0x15, 0x71, 0x77, 0x2c, 0xda, 0xc1, 0x5a, 0xef, 0x40, 0xb7, 0x22, 0xee, 0x8e, 0x45, 0x43, 0x18, 0xb7, 0xe8, 0xa8, 0x9a, 0xd2, 0x5f,
0xb8, 0x41, 0x47, 0xd5, 0x94, 0xfe, 0x52, 0xd7, 0x5f, 0xdd, 0x5b, 0x29, 0x8b, 0x23, 0xd4, 0x52, 0xea, 0xfb, 0xab, 0x7b, 0x2b, 0x65, 0x71, 0x84, 0x5a, 0x6a, 0x8b, 0x71, 0x93, 0x7c, 0x67, 0x8b,
0x47, 0x8c, 0x5b, 0xe4, 0x3b, 0x47, 0x5c, 0xec, 0xcb, 0xab, 0x5f, 0xdc, 0x27, 0x8e, 0x57, 0x1b, 0x8b, 0x9d, 0x79, 0xf5, 0xcb, 0xfb, 0xc4, 0xf1, 0x6a, 0x43, 0xd8, 0x5e, 0xc1, 0xa2, 0xe8, 0xff,
0xc2, 0xf6, 0x0a, 0x0e, 0x45, 0xbf, 0x4a, 0xef, 0xe0, 0x5e, 0x06, 0xae, 0x3e, 0xff, 0x25, 0xb5, 0xd2, 0x1e, 0xdc, 0xcb, 0xc1, 0xd5, 0x17, 0xbf, 0xa6, 0x36, 0xb7, 0xb2, 0x82, 0x6e, 0x17, 0xac,
0xb9, 0x95, 0x15, 0x64, 0xbb, 0x60, 0xe5, 0x7e, 0xaa, 0x5e, 0xb0, 0xf2, 0x10, 0x67, 0xff, 0x04, 0xdc, 0x4f, 0xd6, 0x0b, 0x56, 0x1e, 0x62, 0xed, 0x9f, 0x41, 0x5f, 0x2e, 0x74, 0x64, 0x2e, 0xcf,
0xfa, 0x72, 0xa1, 0x23, 0x73, 0x79, 0xee, 0x5d, 0xd2, 0xa9, 0x3e, 0x7d, 0x50, 0x27, 0x5e, 0xdc, 0xbd, 0x4b, 0x3a, 0xd5, 0x67, 0x0f, 0xea, 0xc4, 0x8b, 0xdb, 0x00, 0xf3, 0x72, 0x41, 0xfb, 0xa9,
0x06, 0x98, 0x97, 0x0b, 0xda, 0x4f, 0x4d, 0xb9, 0x53, 0xee, 0xd5, 0x83, 0x7b, 0xa4, 0x6a, 0xa9, 0x29, 0x77, 0xca, 0xbd, 0x7a, 0x70, 0x8f, 0x54, 0x2d, 0xf5, 0xf6, 0xff, 0x7f, 0x7f, 0x72, 0xed,
0x37, 0xbf, 0xfe, 0xfd, 0xc9, 0xb5, 0xcb, 0x47, 0xd3, 0xcb, 0xe3, 0x41, 0x30, 0x3e, 0xf1, 0x44, 0xf2, 0xd1, 0xf4, 0xf2, 0x78, 0x10, 0x8c, 0x4f, 0x3c, 0xd1, 0x56, 0xfb, 0xae, 0x7f, 0xed, 0x33,
0x53, 0xed, 0xbb, 0xfe, 0xb5, 0xcf, 0xf8, 0x1f, 0x82, 0xf0, 0xe6, 0xc4, 0xf3, 0x87, 0x27, 0xb2, 0xfe, 0x87, 0x20, 0xbc, 0x39, 0xf1, 0xfc, 0xe1, 0x89, 0xac, 0xba, 0x93, 0xd9, 0x2a, 0x97, 0xeb,
0xea, 0x4e, 0x66, 0xab, 0x5c, 0xae, 0xcb, 0xff, 0x5c, 0x7e, 0xf3, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xf2, 0x5f, 0x97, 0xdf, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0x40, 0x5c, 0x73, 0x19, 0xa5, 0x11,
0xff, 0x78, 0xac, 0xbb, 0x04, 0xa3, 0x11, 0x00, 0x00, 0x00, 0x00,
} }
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

7
lnrpc/routerrpc/router.proto
View File

@ -394,8 +394,11 @@ message PairData {
/// Time stamp of last result. /// Time stamp of last result.
int64 timestamp = 1 [json_name = "timestamp"]; int64 timestamp = 1 [json_name = "timestamp"];
/// Minimum penalization amount (only applies to failed attempts). /// Last amount that was forwarded rounded to whole satoshis.
int64 min_penalize_amt_sat = 2 [json_name = "min_penalize_amt_sat"]; int64 amt_sat = 2 [json_name = "amt_sat"];
/// Last amount that was forwarded in millisatoshis.
int64 amt_msat = 4 [json_name = "amt_msat"];
/// Whether the last payment attempt through this pair was successful. /// Whether the last payment attempt through this pair was successful.
bool last_attempt_successful = 3 [json_name = "last_attempt_successful"]; bool last_attempt_successful = 3 [json_name = "last_attempt_successful"];

5
lnrpc/routerrpc/router_server.go
View File

@ -494,9 +494,8 @@ func (s *Server) QueryMissionControl(ctx context.Context,
// toRPCPairData marshalls mission control pair data to the rpc struct. // toRPCPairData marshalls mission control pair data to the rpc struct.
func toRPCPairData(data *routing.TimedPairResult) *PairData { func toRPCPairData(data *routing.TimedPairResult) *PairData {
rpcData := PairData{ rpcData := PairData{
MinPenalizeAmtSat: int64( AmtSat: int64(data.Amt.ToSatoshis()),
data.MinPenalizeAmt.ToSatoshis(), AmtMsat: int64(data.Amt),
),
LastAttemptSuccessful: data.Success, LastAttemptSuccessful: data.Success,
} }

17
routing/missioncontrol.go
View File

@ -128,11 +128,10 @@ type TimedPairResult struct {
// timestamp is the time when this result was obtained. // timestamp is the time when this result was obtained.
Timestamp time.Time Timestamp time.Time
// minPenalizeAmt is the minimum amount for which a penalty should be // Amt is the amount that was forwarded in the last payment attempt.
// applied based on this result. Only applies to fail results. Amt lnwire.MilliSatoshi
MinPenalizeAmt lnwire.MilliSatoshi
// success indicates whether the payment attempt was successful through // Success indicates whether the payment attempt was successful through
// this pair. // this pair.
Success bool Success bool
} }
@ -142,9 +141,9 @@ func newTimedPairResult(timestamp time.Time,
result pairResult) TimedPairResult { result pairResult) TimedPairResult {
return TimedPairResult{ return TimedPairResult{
Timestamp: timestamp, Timestamp: timestamp,
MinPenalizeAmt: result.minPenalizeAmt, Amt: result.amt,
Success: result.success, Success: result.success,
} }
} }
@ -497,8 +496,8 @@ func (m *MissionControl) applyPaymentResult(
"Control: pair=%v", pair) "Control: pair=%v", pair)
} else { } else {
log.Debugf("Reporting pair failure to Mission "+ log.Debugf("Reporting pair failure to Mission "+
"Control: pair=%v, minPenalizeAmt=%v", "Control: pair=%v, amt=%v",
pair, pairResult.minPenalizeAmt) pair, pairResult.amt)
} }
m.setLastPairResult( m.setLastPairResult(

4
routing/probability_estimator.go
View File

@ -92,7 +92,7 @@ func (p *probabilityEstimator) getNodeProbability(now time.Time,
// Weigh failures in accordance with their age. The base // Weigh failures in accordance with their age. The base
// probability of a failure is considered zero, so nothing needs // probability of a failure is considered zero, so nothing needs
// to be added to probabilitiesTotal. // to be added to probabilitiesTotal.
case amt >= result.MinPenalizeAmt: case amt >= result.Amt:
totalWeight += p.getWeight(age) totalWeight += p.getWeight(age)
} }
} }
@ -166,7 +166,7 @@ func (p *probabilityEstimator) calculateProbability(
// penalization. If the current amount is smaller than the amount that // penalization. If the current amount is smaller than the amount that
// previously triggered a failure, we act as if this is an untried // previously triggered a failure, we act as if this is an untried
// channel. // channel.
if amt < lastPairResult.MinPenalizeAmt { if amt < lastPairResult.Amt {
return nodeProbability return nodeProbability
} }

4
routing/probability_estimator_test.go
View File

@ -86,7 +86,7 @@ func TestProbabilityEstimatorOneSuccess(t *testing.T) {
ctx.results = map[int]TimedPairResult{ ctx.results = map[int]TimedPairResult{
node1: newTimedPairResult( node1: newTimedPairResult(
testTime.Add(-time.Hour), testTime.Add(-time.Hour),
successPairResult(), successPairResult(100),
), ),
} }
@ -133,7 +133,7 @@ func TestProbabilityEstimatorMix(t *testing.T) {
ctx.results = map[int]TimedPairResult{ ctx.results = map[int]TimedPairResult{
node1: newTimedPairResult( node1: newTimedPairResult(
testTime.Add(-time.Hour), testTime.Add(-time.Hour),
successPairResult(), successPairResult(100),
), ),
node2: newTimedPairResult( node2: newTimedPairResult(
testTime.Add(-2*time.Hour), testTime.Add(-2*time.Hour),

24
routing/result_interpretation.go
View File

@ -17,9 +17,9 @@ var (
// pairResult contains the result of the interpretation of a payment attempt for // pairResult contains the result of the interpretation of a payment attempt for
// a specific node pair. // a specific node pair.
type pairResult struct { type pairResult struct {
// minPenalizeAmt is the minimum amount for which a penalty should be // amt is the amount that was forwarded for this pair. Can be set to
// applied based on this result. Only applies to fail results. // zero for failures that are amount independent.
minPenalizeAmt lnwire.MilliSatoshi amt lnwire.MilliSatoshi
// success indicates whether the payment attempt was successful through // success indicates whether the payment attempt was successful through
// this pair. // this pair.
@ -29,24 +29,28 @@ type pairResult struct {
// failPairResult creates a new result struct for a failure. // failPairResult creates a new result struct for a failure.
func failPairResult(minPenalizeAmt lnwire.MilliSatoshi) pairResult { func failPairResult(minPenalizeAmt lnwire.MilliSatoshi) pairResult {
return pairResult{ return pairResult{
minPenalizeAmt: minPenalizeAmt, amt: minPenalizeAmt,
} }
} }
// successPairResult creates a new result struct for a success. // newSuccessPairResult creates a new result struct for a success.
func successPairResult() pairResult { func successPairResult(successAmt lnwire.MilliSatoshi) pairResult {
return pairResult{ return pairResult{
success: true, success: true,
amt: successAmt,
} }
} }
// String returns the human-readable representation of a pair result. // String returns the human-readable representation of a pair result.
func (p pairResult) String() string { func (p pairResult) String() string {
var resultType string
if p.success { if p.success {
return "success" resultType = "success"
} else {
resultType = "failed"
} }
return fmt.Sprintf("failed (minPenalizeAmt=%v)", p.minPenalizeAmt) return fmt.Sprintf("%v (amt=%v)", resultType, p.amt)
} }
// interpretedResult contains the result of the interpretation of a payment // interpretedResult contains the result of the interpretation of a payment
@ -458,9 +462,9 @@ func (i *interpretedResult) successPairRange(
rt *route.Route, fromIdx, toIdx int) { rt *route.Route, fromIdx, toIdx int) {
for idx := fromIdx; idx <= toIdx; idx++ { for idx := fromIdx; idx <= toIdx; idx++ {
pair, _ := getPair(rt, idx) pair, amt := getPair(rt, idx)
i.pairResults[pair] = successPairResult() i.pairResults[pair] = successPairResult(amt)
} }
} }

18
routing/result_interpretation_test.go
View File

@ -74,7 +74,7 @@ var resultTestCases = []resultTestCase{
expectedResult: &interpretedResult{ expectedResult: &interpretedResult{
pairResults: map[DirectedNodePair]pairResult{ pairResults: map[DirectedNodePair]pairResult{
getTestPair(0, 1): successPairResult(), getTestPair(0, 1): successPairResult(100),
getTestPair(1, 2): failPairResult(99), getTestPair(1, 2): failPairResult(99),
}, },
}, },
@ -109,8 +109,8 @@ var resultTestCases = []resultTestCase{
expectedResult: &interpretedResult{ expectedResult: &interpretedResult{
pairResults: map[DirectedNodePair]pairResult{ pairResults: map[DirectedNodePair]pairResult{
getTestPair(0, 1): successPairResult(), getTestPair(0, 1): successPairResult(100),
getTestPair(1, 2): successPairResult(), getTestPair(1, 2): successPairResult(99),
}, },
finalFailureReason: &reasonIncorrectDetails, finalFailureReason: &reasonIncorrectDetails,
}, },
@ -124,7 +124,7 @@ var resultTestCases = []resultTestCase{
expectedResult: &interpretedResult{ expectedResult: &interpretedResult{
pairResults: map[DirectedNodePair]pairResult{ pairResults: map[DirectedNodePair]pairResult{
getTestPair(0, 1): successPairResult(), getTestPair(0, 1): successPairResult(100),
}, },
}, },
}, },
@ -137,8 +137,8 @@ var resultTestCases = []resultTestCase{
expectedResult: &interpretedResult{ expectedResult: &interpretedResult{
pairResults: map[DirectedNodePair]pairResult{ pairResults: map[DirectedNodePair]pairResult{
getTestPair(0, 1): successPairResult(), getTestPair(0, 1): successPairResult(100),
getTestPair(1, 2): successPairResult(), getTestPair(1, 2): successPairResult(99),
}, },
}, },
}, },
@ -190,6 +190,7 @@ var resultTestCases = []resultTestCase{
pairResults: map[DirectedNodePair]pairResult{ pairResults: map[DirectedNodePair]pairResult{
getTestPair(0, 1): { getTestPair(0, 1): {
success: true, success: true,
amt: 100,
}, },
getTestPair(1, 2): {}, getTestPair(1, 2): {},
getTestPair(2, 1): {}, getTestPair(2, 1): {},
@ -211,12 +212,15 @@ var resultTestCases = []resultTestCase{
pairResults: map[DirectedNodePair]pairResult{ pairResults: map[DirectedNodePair]pairResult{
getTestPair(0, 1): { getTestPair(0, 1): {
success: true, success: true,
amt: 100,
}, },
getTestPair(1, 2): { getTestPair(1, 2): {
success: true, success: true,
amt: 99,
}, },
getTestPair(2, 3): { getTestPair(2, 3): {
success: true, success: true,
amt: 97,
}, },
getTestPair(4, 3): {}, getTestPair(4, 3): {},
}, },
@ -238,9 +242,11 @@ var resultTestCases = []resultTestCase{
pairResults: map[DirectedNodePair]pairResult{ pairResults: map[DirectedNodePair]pairResult{
getTestPair(0, 1): { getTestPair(0, 1): {
success: true, success: true,
amt: 100,
}, },
getTestPair(1, 2): { getTestPair(1, 2): {
success: true, success: true,
amt: 99,
}, },
getTestPair(3, 2): {}, getTestPair(3, 2): {},
getTestPair(3, 4): {}, getTestPair(3, 4): {},