From 04e7c984613c09fbafa829c542f0938d262dbece Mon Sep 17 00:00:00 2001 From: Joost Jager Date: Mon, 30 Sep 2019 09:12:50 +0200 Subject: [PATCH] routerrpc: create pair data proto message With a separate proto message, it becomes possible to also return the pair data for a single pair. This prepares for the new mc probability querying rpc. --- cmd/lncli/cmd_query_mission_control.go | 6 +- lnrpc/routerrpc/router.pb.go | 301 ++++++++++++++----------- lnrpc/routerrpc/router.proto | 16 +- lnrpc/routerrpc/router_server.go | 26 ++- 4 files changed, 204 insertions(+), 145 deletions(-) diff --git a/cmd/lncli/cmd_query_mission_control.go b/cmd/lncli/cmd_query_mission_control.go index 0122fb02..2b1b99e2 100644 --- a/cmd/lncli/cmd_query_mission_control.go +++ b/cmd/lncli/cmd_query_mission_control.go @@ -48,9 +48,9 @@ func queryMissionControl(ctx *cli.Context) error { displayPairHistory{ NodeFrom: hex.EncodeToString(n.NodeFrom), NodeTo: hex.EncodeToString(n.NodeTo), - LastAttemptSuccessful: n.LastAttemptSuccessful, - Timestamp: n.Timestamp, - MinPenalizeAmtSat: n.MinPenalizeAmtSat, + LastAttemptSuccessful: n.History.LastAttemptSuccessful, + Timestamp: n.History.Timestamp, + MinPenalizeAmtSat: n.History.MinPenalizeAmtSat, }, ) } diff --git a/lnrpc/routerrpc/router.pb.go b/lnrpc/routerrpc/router.pb.go index 5463ee70..a718eb4b 100644 --- a/lnrpc/routerrpc/router.pb.go +++ b/lnrpc/routerrpc/router.pb.go @@ -1050,16 +1050,11 @@ type PairHistory struct { /// The source node pubkey of the pair. NodeFrom []byte `protobuf:"bytes,1,opt,name=node_from,proto3" json:"node_from,omitempty"` /// The destination node pubkey of the pair. - NodeTo []byte `protobuf:"bytes,2,opt,name=node_to,proto3" json:"node_to,omitempty"` - /// Time stamp of last result. - Timestamp int64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` - /// Minimum penalization amount (only applies to failed attempts). - MinPenalizeAmtSat int64 `protobuf:"varint,4,opt,name=min_penalize_amt_sat,proto3" json:"min_penalize_amt_sat,omitempty"` - /// Whether the last payment attempt through this pair was successful. - LastAttemptSuccessful bool `protobuf:"varint,6,opt,name=last_attempt_successful,proto3" json:"last_attempt_successful,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + NodeTo []byte `protobuf:"bytes,2,opt,name=node_to,proto3" json:"node_to,omitempty"` + History *PairData `protobuf:"bytes,7,opt,name=history,proto3" json:"history,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PairHistory) Reset() { *m = PairHistory{} } @@ -1101,21 +1096,65 @@ func (m *PairHistory) GetNodeTo() []byte { return nil } -func (m *PairHistory) GetTimestamp() int64 { +func (m *PairHistory) GetHistory() *PairData { + if m != nil { + return m.History + } + return nil +} + +type PairData struct { + /// Time stamp of last result. + Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + /// Minimum penalization amount (only applies to failed attempts). + MinPenalizeAmtSat int64 `protobuf:"varint,2,opt,name=min_penalize_amt_sat,proto3" json:"min_penalize_amt_sat,omitempty"` + /// 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"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *PairData) Reset() { *m = PairData{} } +func (m *PairData) String() string { return proto.CompactTextString(m) } +func (*PairData) ProtoMessage() {} +func (*PairData) Descriptor() ([]byte, []int) { + return fileDescriptor_7a0613f69d37b0a5, []int{14} +} + +func (m *PairData) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_PairData.Unmarshal(m, b) +} +func (m *PairData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_PairData.Marshal(b, m, deterministic) +} +func (m *PairData) XXX_Merge(src proto.Message) { + xxx_messageInfo_PairData.Merge(m, src) +} +func (m *PairData) XXX_Size() int { + return xxx_messageInfo_PairData.Size(m) +} +func (m *PairData) XXX_DiscardUnknown() { + xxx_messageInfo_PairData.DiscardUnknown(m) +} + +var xxx_messageInfo_PairData proto.InternalMessageInfo + +func (m *PairData) GetTimestamp() int64 { if m != nil { return m.Timestamp } return 0 } -func (m *PairHistory) GetMinPenalizeAmtSat() int64 { +func (m *PairData) GetMinPenalizeAmtSat() int64 { if m != nil { return m.MinPenalizeAmtSat } return 0 } -func (m *PairHistory) GetLastAttemptSuccessful() bool { +func (m *PairData) GetLastAttemptSuccessful() bool { if m != nil { return m.LastAttemptSuccessful } @@ -1148,7 +1187,7 @@ func (m *BuildRouteRequest) Reset() { *m = BuildRouteRequest{} } func (m *BuildRouteRequest) String() string { return proto.CompactTextString(m) } func (*BuildRouteRequest) ProtoMessage() {} func (*BuildRouteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_7a0613f69d37b0a5, []int{14} + return fileDescriptor_7a0613f69d37b0a5, []int{15} } func (m *BuildRouteRequest) XXX_Unmarshal(b []byte) error { @@ -1210,7 +1249,7 @@ func (m *BuildRouteResponse) Reset() { *m = BuildRouteResponse{} } func (m *BuildRouteResponse) String() string { return proto.CompactTextString(m) } func (*BuildRouteResponse) ProtoMessage() {} func (*BuildRouteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_7a0613f69d37b0a5, []int{15} + return fileDescriptor_7a0613f69d37b0a5, []int{16} } func (m *BuildRouteResponse) XXX_Unmarshal(b []byte) error { @@ -1256,6 +1295,7 @@ func init() { proto.RegisterType((*QueryMissionControlRequest)(nil), "routerrpc.QueryMissionControlRequest") proto.RegisterType((*QueryMissionControlResponse)(nil), "routerrpc.QueryMissionControlResponse") proto.RegisterType((*PairHistory)(nil), "routerrpc.PairHistory") + proto.RegisterType((*PairData)(nil), "routerrpc.PairData") proto.RegisterType((*BuildRouteRequest)(nil), "routerrpc.BuildRouteRequest") proto.RegisterType((*BuildRouteResponse)(nil), "routerrpc.BuildRouteResponse") } @@ -1263,120 +1303,123 @@ func init() { func init() { proto.RegisterFile("routerrpc/router.proto", fileDescriptor_7a0613f69d37b0a5) } var fileDescriptor_7a0613f69d37b0a5 = []byte{ - // 1805 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0x4f, 0x73, 0x1a, 0xc9, - 0x15, 0xdf, 0x11, 0x20, 0xe0, 0x01, 0xd2, 0xa8, 0x25, 0xcb, 0x63, 0x64, 0xad, 0xb5, 0xec, 0x66, - 0x57, 0xe5, 0x72, 0x24, 0x47, 0xa9, 0xdd, 0x72, 0xed, 0x21, 0x29, 0x0c, 0xcd, 0x6a, 0x6c, 0x98, - 0x91, 0x1b, 0xf0, 0xae, 0x93, 0x43, 0x57, 0x1b, 0x5a, 0x62, 0x4a, 0xc3, 0x0c, 0x3b, 0xd3, 0x38, - 0x56, 0x0e, 0xa9, 0xca, 0x07, 0xc8, 0xe7, 0xc8, 0x25, 0xb7, 0x7c, 0x91, 0xdc, 0xf2, 0x0d, 0x92, - 0x4f, 0x90, 0x7b, 0xaa, 0xbb, 0x67, 0x60, 0x90, 0x90, 0x93, 0x93, 0xe8, 0xdf, 0xfb, 0xd7, 0xf3, - 0xde, 0xeb, 0xdf, 0x7b, 0x82, 0xfd, 0x28, 0x9c, 0x0b, 0x1e, 0x45, 0xb3, 0xd1, 0xa9, 0xfe, 0x75, - 0x32, 0x8b, 0x42, 0x11, 0xa2, 0xf2, 0x02, 0xaf, 0x97, 0xa3, 0xd9, 0x48, 0xa3, 0x8d, 0x3f, 0xe7, - 0x01, 0xf5, 0x79, 0x30, 0xbe, 0x60, 0x37, 0x53, 0x1e, 0x08, 0xc2, 0x7f, 0x9e, 0xf3, 0x58, 0x20, - 0x04, 0xf9, 0x31, 0x8f, 0x85, 0x65, 0x1c, 0x19, 0xc7, 0x55, 0xa2, 0x7e, 0x23, 0x13, 0x72, 0x6c, - 0x2a, 0xac, 0x8d, 0x23, 0xe3, 0x38, 0x47, 0xe4, 0x4f, 0xf4, 0x05, 0x54, 0x67, 0xda, 0x8e, 0x4e, - 0x58, 0x3c, 0xb1, 0x72, 0x4a, 0xbb, 0x92, 0x60, 0xe7, 0x2c, 0x9e, 0xa0, 0x63, 0x30, 0x2f, 0xbd, - 0x80, 0xf9, 0x74, 0xe4, 0x8b, 0x0f, 0x74, 0xcc, 0x7d, 0xc1, 0xac, 0xfc, 0x91, 0x71, 0x5c, 0x20, - 0x5b, 0x0a, 0x6f, 0xf9, 0xe2, 0x43, 0x5b, 0xa2, 0xe8, 0x1b, 0xd8, 0x4e, 0x9d, 0x45, 0xfa, 0x16, - 0x56, 0xe1, 0xc8, 0x38, 0x2e, 0x93, 0xad, 0xd9, 0xea, 0xdd, 0xbe, 0x81, 0x6d, 0xe1, 0x4d, 0x79, - 0x38, 0x17, 0x34, 0xe6, 0xa3, 0x30, 0x18, 0xc7, 0xd6, 0xa6, 0xf6, 0x98, 0xc0, 0x7d, 0x8d, 0xa2, - 0x06, 0xd4, 0x2e, 0x39, 0xa7, 0xbe, 0x37, 0xf5, 0x04, 0x8d, 0x99, 0xb0, 0x8a, 0xea, 0xea, 0x95, - 0x4b, 0xce, 0xbb, 0x12, 0xeb, 0x33, 0x81, 0x9e, 0x81, 0x19, 0xce, 0xc5, 0x55, 0xe8, 0x05, 0x57, - 0x74, 0x34, 0x61, 0x01, 0xf5, 0xc6, 0x56, 0xe9, 0xc8, 0x38, 0xce, 0xbf, 0xdc, 0x78, 0x6e, 0x90, - 0xad, 0x54, 0xd6, 0x9a, 0xb0, 0xc0, 0x1e, 0xa3, 0x43, 0x00, 0xf5, 0x1d, 0xca, 0xa5, 0x55, 0x56, - 0x51, 0xcb, 0x12, 0x51, 0xfe, 0xd0, 0x19, 0x54, 0x54, 0x92, 0xe9, 0xc4, 0x0b, 0x44, 0x6c, 0xc1, - 0x51, 0xee, 0xb8, 0x72, 0x66, 0x9e, 0xf8, 0x81, 0xcc, 0x37, 0x91, 0x92, 0x73, 0x2f, 0x10, 0x24, - 0xab, 0x84, 0x30, 0x94, 0x64, 0x76, 0xa9, 0xf0, 0x3f, 0x58, 0x15, 0x65, 0xf0, 0xf4, 0x64, 0x51, - 0xa9, 0x93, 0xbb, 0xa5, 0x39, 0x69, 0xf3, 0x58, 0x0c, 0xfc, 0x0f, 0x38, 0x10, 0xd1, 0x0d, 0x29, - 0x8e, 0xf5, 0xa9, 0xfe, 0x3d, 0x54, 0xb3, 0x02, 0x59, 0xac, 0x6b, 0x7e, 0xa3, 0xea, 0x97, 0x27, - 0xf2, 0x27, 0xda, 0x83, 0xc2, 0x07, 0xe6, 0xcf, 0xb9, 0x2a, 0x60, 0x95, 0xe8, 0xc3, 0xf7, 0x1b, - 0x2f, 0x8c, 0xc6, 0x0b, 0xd8, 0x1d, 0x44, 0x6c, 0x74, 0x7d, 0xab, 0x07, 0x6e, 0x57, 0xd7, 0xb8, - 0x53, 0xdd, 0xc6, 0x9f, 0xa0, 0x96, 0x18, 0xf5, 0x05, 0x13, 0xf3, 0x18, 0xfd, 0x12, 0x0a, 0xb1, - 0x60, 0x82, 0x2b, 0xe5, 0xad, 0xb3, 0x87, 0x99, 0x4f, 0xc9, 0x28, 0x72, 0xa2, 0xb5, 0x50, 0x1d, - 0x4a, 0xb3, 0x88, 0x7b, 0x53, 0x76, 0x95, 0x5e, 0x6b, 0x71, 0x46, 0x0d, 0x28, 0x28, 0x63, 0xd5, - 0x55, 0x95, 0xb3, 0x6a, 0x36, 0x8d, 0x44, 0x8b, 0x1a, 0xbf, 0x81, 0x6d, 0x75, 0xee, 0x70, 0xfe, - 0xa9, 0xce, 0x7d, 0x08, 0x45, 0x36, 0xd5, 0x2d, 0xa0, 0xbb, 0x77, 0x93, 0x4d, 0x65, 0xf5, 0x1b, - 0x63, 0x30, 0x97, 0xf6, 0xf1, 0x2c, 0x0c, 0x62, 0x2e, 0x3b, 0x56, 0x3a, 0x97, 0x0d, 0x21, 0xbb, - 0x67, 0x2a, 0xad, 0x0c, 0x65, 0xb5, 0x95, 0xe0, 0x1d, 0xce, 0x7b, 0x31, 0x13, 0xe8, 0x6b, 0xdd, - 0x88, 0xd4, 0x0f, 0x47, 0xd7, 0xb2, 0xb5, 0xd9, 0x4d, 0xe2, 0xbe, 0x26, 0xe1, 0x6e, 0x38, 0xba, - 0x6e, 0x4b, 0xb0, 0xf1, 0x7b, 0xfd, 0xc4, 0x06, 0xa1, 0xbe, 0xfb, 0xff, 0x9d, 0xde, 0x65, 0x0a, - 0x36, 0xee, 0x4f, 0x01, 0x85, 0xdd, 0x15, 0xe7, 0xc9, 0x57, 0x64, 0x33, 0x6b, 0xdc, 0xca, 0xec, - 0x33, 0x28, 0x5e, 0x32, 0xcf, 0x9f, 0x47, 0xa9, 0x63, 0x94, 0x29, 0x53, 0x47, 0x4b, 0x48, 0xaa, - 0xd2, 0xf8, 0x4f, 0x11, 0x8a, 0x09, 0x88, 0xce, 0x20, 0x3f, 0x0a, 0xc7, 0x69, 0x75, 0x3f, 0xbf, - 0x6b, 0x96, 0xfe, 0x6d, 0x85, 0x63, 0x4e, 0x94, 0x2e, 0xfa, 0x2d, 0x6c, 0xc9, 0x87, 0x15, 0x70, - 0x9f, 0xce, 0x67, 0x63, 0xb6, 0x28, 0xa8, 0x95, 0xb1, 0x6e, 0x69, 0x85, 0xa1, 0x92, 0x93, 0xda, - 0x28, 0x7b, 0x44, 0x07, 0x50, 0x9e, 0x08, 0x7f, 0xa4, 0x2b, 0x91, 0x57, 0x0d, 0x5d, 0x92, 0x80, - 0xaa, 0x41, 0x03, 0x6a, 0x61, 0xe0, 0x85, 0x01, 0x8d, 0x27, 0x8c, 0x9e, 0x7d, 0xfb, 0x9d, 0xe2, - 0x8c, 0x2a, 0xa9, 0x28, 0xb0, 0x3f, 0x61, 0x67, 0xdf, 0x7e, 0x87, 0x9e, 0x40, 0x45, 0xbd, 0x5a, - 0xfe, 0x71, 0xe6, 0x45, 0x37, 0x8a, 0x2c, 0x6a, 0x44, 0x3d, 0x64, 0xac, 0x10, 0xf9, 0x34, 0x2e, - 0x7d, 0x76, 0x15, 0x2b, 0x82, 0xa8, 0x11, 0x7d, 0x40, 0xcf, 0x61, 0x2f, 0xc9, 0x01, 0x8d, 0xc3, - 0x79, 0x34, 0xe2, 0xd4, 0x0b, 0xc6, 0xfc, 0xa3, 0xa2, 0x87, 0x1a, 0x41, 0x89, 0xac, 0xaf, 0x44, - 0xb6, 0x94, 0xa0, 0x7d, 0xd8, 0x9c, 0x70, 0xef, 0x6a, 0xa2, 0xa9, 0xa1, 0x46, 0x92, 0x53, 0xe3, - 0x6f, 0x05, 0xa8, 0x64, 0x12, 0x83, 0xaa, 0x50, 0x22, 0xb8, 0x8f, 0xc9, 0x5b, 0xdc, 0x36, 0x3f, - 0x43, 0xc7, 0xf0, 0x95, 0xed, 0xb4, 0x5c, 0x42, 0x70, 0x6b, 0x40, 0x5d, 0x42, 0x87, 0xce, 0x6b, - 0xc7, 0xfd, 0xd1, 0xa1, 0x17, 0xcd, 0x77, 0x3d, 0xec, 0x0c, 0x68, 0x1b, 0x0f, 0x9a, 0x76, 0xb7, - 0x6f, 0x1a, 0xe8, 0x31, 0x58, 0x4b, 0xcd, 0x54, 0xdc, 0xec, 0xb9, 0x43, 0x67, 0x60, 0x6e, 0xa0, - 0x27, 0x70, 0xd0, 0xb1, 0x9d, 0x66, 0x97, 0x2e, 0x75, 0x5a, 0xdd, 0xc1, 0x5b, 0x8a, 0x7f, 0xba, - 0xb0, 0xc9, 0x3b, 0x33, 0xb7, 0x4e, 0xe1, 0x7c, 0xd0, 0x6d, 0xa5, 0x1e, 0xf2, 0xe8, 0x11, 0x3c, - 0xd0, 0x0a, 0xda, 0x84, 0x0e, 0x5c, 0x97, 0xf6, 0x5d, 0xd7, 0x31, 0x0b, 0x68, 0x07, 0x6a, 0xb6, - 0xf3, 0xb6, 0xd9, 0xb5, 0xdb, 0x94, 0xe0, 0x66, 0xb7, 0x67, 0x6e, 0xa2, 0x5d, 0xd8, 0xbe, 0xad, - 0x57, 0x94, 0x2e, 0x52, 0x3d, 0xd7, 0xb1, 0x5d, 0x87, 0xbe, 0xc5, 0xa4, 0x6f, 0xbb, 0x8e, 0x59, - 0x42, 0xfb, 0x80, 0x56, 0x45, 0xe7, 0xbd, 0x66, 0xcb, 0x2c, 0xa3, 0x07, 0xb0, 0xb3, 0x8a, 0xbf, - 0xc6, 0xef, 0x4c, 0x40, 0x16, 0xec, 0xe9, 0x8b, 0xd1, 0x97, 0xb8, 0xeb, 0xfe, 0x48, 0x7b, 0xb6, - 0x63, 0xf7, 0x86, 0x3d, 0xb3, 0x82, 0xf6, 0xc0, 0xec, 0x60, 0x4c, 0x6d, 0xa7, 0x3f, 0xec, 0x74, - 0xec, 0x96, 0x8d, 0x9d, 0x81, 0x59, 0xd5, 0x91, 0xd7, 0x7d, 0x78, 0x4d, 0x1a, 0xb4, 0xce, 0x9b, - 0x8e, 0x83, 0xbb, 0xb4, 0x6d, 0xf7, 0x9b, 0x2f, 0xbb, 0xb8, 0x6d, 0x6e, 0xa1, 0x43, 0x78, 0x34, - 0xc0, 0xbd, 0x0b, 0x97, 0x34, 0xc9, 0x3b, 0x9a, 0xca, 0x3b, 0x4d, 0xbb, 0x3b, 0x24, 0xd8, 0xdc, - 0x46, 0x5f, 0xc0, 0x21, 0xc1, 0x6f, 0x86, 0x36, 0xc1, 0x6d, 0xea, 0xb8, 0x6d, 0x4c, 0x3b, 0xb8, - 0x39, 0x18, 0x12, 0x4c, 0x7b, 0x76, 0xbf, 0x6f, 0x3b, 0x3f, 0x98, 0x26, 0xfa, 0x0a, 0x8e, 0x16, - 0x2a, 0x0b, 0x07, 0xb7, 0xb4, 0x76, 0xe4, 0xf7, 0xa5, 0x25, 0x75, 0xf0, 0x4f, 0x03, 0x7a, 0x81, - 0x31, 0x31, 0x11, 0xaa, 0xc3, 0xfe, 0x32, 0xbc, 0x0e, 0x90, 0xc4, 0xde, 0x95, 0xb2, 0x0b, 0x4c, - 0x7a, 0x4d, 0x47, 0x16, 0x78, 0x45, 0xb6, 0x27, 0xaf, 0xbd, 0x94, 0xdd, 0xbe, 0xf6, 0x03, 0x84, - 0x60, 0x2b, 0x53, 0x95, 0x4e, 0x93, 0x98, 0xfb, 0x68, 0x0f, 0xb6, 0xd3, 0x1b, 0xa4, 0x8a, 0xff, - 0x2a, 0xa2, 0x87, 0x80, 0x86, 0x0e, 0xc1, 0xcd, 0xb6, 0x4c, 0xc8, 0x42, 0xf0, 0xef, 0xe2, 0xab, - 0x7c, 0x69, 0xc3, 0xcc, 0x35, 0xfe, 0x9e, 0x83, 0xda, 0xca, 0xbb, 0x44, 0x8f, 0xa1, 0x1c, 0x7b, - 0x57, 0x01, 0x13, 0x92, 0x39, 0x34, 0xa9, 0x2c, 0x01, 0x35, 0x1b, 0x27, 0xcc, 0x0b, 0x34, 0x9b, - 0x69, 0x36, 0x2f, 0x2b, 0x44, 0x71, 0xd9, 0x01, 0x14, 0xd3, 0xf9, 0x9a, 0x5b, 0xcc, 0xd7, 0xcd, - 0x91, 0x9e, 0xab, 0x8f, 0xa1, 0x2c, 0x29, 0x33, 0x16, 0x6c, 0x3a, 0x53, 0x4f, 0xbc, 0x46, 0x96, - 0x00, 0xfa, 0x12, 0x6a, 0x53, 0x1e, 0xc7, 0xec, 0x8a, 0x53, 0xfd, 0x4c, 0x41, 0x69, 0x54, 0x13, - 0xb0, 0xa3, 0x5e, 0xeb, 0x97, 0x90, 0xd2, 0x46, 0xa2, 0x54, 0xd0, 0x4a, 0x09, 0xa8, 0x95, 0x6e, - 0x33, 0xb6, 0x60, 0x09, 0x1b, 0x64, 0x19, 0x5b, 0x30, 0xf4, 0x14, 0x76, 0x34, 0xe5, 0x78, 0x81, - 0x37, 0x9d, 0x4f, 0x35, 0xf5, 0x14, 0x15, 0xf5, 0x6c, 0x2b, 0xea, 0xd1, 0xb8, 0x62, 0xa0, 0x47, - 0x50, 0x7a, 0xcf, 0x62, 0x2e, 0x87, 0x45, 0x42, 0x0d, 0x45, 0x79, 0xee, 0x70, 0x2e, 0x45, 0x72, - 0x84, 0x44, 0x92, 0xf4, 0x34, 0x23, 0x14, 0x2f, 0x39, 0x27, 0x32, 0x97, 0x8b, 0x08, 0xec, 0xe3, - 0x32, 0x42, 0x25, 0x13, 0x41, 0xe3, 0x2a, 0xc2, 0x53, 0xd8, 0xe1, 0x1f, 0x45, 0xc4, 0x68, 0x38, - 0x63, 0x3f, 0xcf, 0x39, 0x1d, 0x33, 0xc1, 0xac, 0xaa, 0x4a, 0xf0, 0xb6, 0x12, 0xb8, 0x0a, 0x6f, - 0x33, 0xc1, 0x1a, 0x8f, 0xa1, 0x4e, 0x78, 0xcc, 0x45, 0xcf, 0x8b, 0x63, 0x2f, 0x0c, 0x5a, 0x61, - 0x20, 0xa2, 0xd0, 0x4f, 0x66, 0x4e, 0xe3, 0x10, 0x0e, 0xd6, 0x4a, 0xf5, 0xd0, 0x90, 0xc6, 0x6f, - 0xe6, 0x3c, 0xba, 0x59, 0x6f, 0xfc, 0x06, 0x0e, 0xd6, 0x4a, 0x93, 0x89, 0xf3, 0x0c, 0x0a, 0x33, - 0xe6, 0x45, 0xb1, 0xb5, 0xa1, 0xb6, 0x98, 0xfd, 0x95, 0xd1, 0xef, 0x45, 0xe7, 0x5e, 0x2c, 0xc2, - 0xe8, 0x86, 0x68, 0xa5, 0x57, 0xf9, 0x92, 0x61, 0x6e, 0x34, 0xfe, 0x69, 0x40, 0x25, 0x23, 0x94, - 0x7d, 0x10, 0x84, 0x63, 0x4e, 0x2f, 0xa3, 0x70, 0x9a, 0x76, 0xd8, 0x02, 0x40, 0x16, 0x14, 0xd5, - 0x41, 0x84, 0x49, 0x7b, 0xa5, 0xc7, 0xd5, 0xfe, 0xc9, 0xa9, 0x19, 0x9c, 0xe9, 0x9f, 0x33, 0xd8, - 0x9b, 0x7a, 0x01, 0x9d, 0xf1, 0x80, 0xf9, 0xde, 0x1f, 0x39, 0x4d, 0x77, 0x81, 0xbc, 0x52, 0x5c, - 0x2b, 0x43, 0x2f, 0xe0, 0xa1, 0xcf, 0x62, 0x41, 0x99, 0x10, 0x7c, 0x3a, 0x13, 0x34, 0x9e, 0x8f, - 0x46, 0x3c, 0x8e, 0x2f, 0xe7, 0xbe, 0xea, 0x98, 0x12, 0xb9, 0x4f, 0xfc, 0x2a, 0x5f, 0x2a, 0x98, - 0x9b, 0x8d, 0xbf, 0x1a, 0xb0, 0xf3, 0x72, 0xee, 0xf9, 0xe3, 0x95, 0x99, 0xff, 0x08, 0x4a, 0x32, - 0x40, 0x66, 0xa7, 0x90, 0x8b, 0x89, 0x2a, 0xf2, 0xba, 0x45, 0x79, 0x63, 0xed, 0xa2, 0xbc, 0x6e, - 0x65, 0xcd, 0xdd, 0xbb, 0xb2, 0x3e, 0x81, 0xca, 0x24, 0x9c, 0xd1, 0xd9, 0xfc, 0xfd, 0x35, 0xbf, - 0x89, 0xad, 0xfc, 0x51, 0xee, 0xb8, 0x4a, 0x60, 0x12, 0xce, 0x2e, 0x34, 0xd2, 0x78, 0x01, 0x28, - 0x7b, 0xd1, 0xa4, 0x9a, 0x8b, 0xd5, 0xc3, 0xb8, 0x77, 0xf5, 0x78, 0xfa, 0x17, 0x03, 0xaa, 0xd9, - 0xad, 0x0e, 0xd5, 0xa0, 0x6c, 0x3b, 0xb4, 0xd3, 0xb5, 0x7f, 0x38, 0x1f, 0x98, 0x9f, 0xc9, 0x63, - 0x7f, 0xd8, 0x6a, 0x61, 0xdc, 0xc6, 0x6d, 0xd3, 0x90, 0xcc, 0x24, 0x49, 0x06, 0xb7, 0xe9, 0xc0, - 0xee, 0x61, 0x77, 0x28, 0x67, 0xd6, 0x2e, 0x6c, 0x27, 0x98, 0xe3, 0x52, 0xe2, 0x0e, 0x07, 0xd8, - 0xcc, 0x21, 0x13, 0xaa, 0x09, 0x88, 0x09, 0x71, 0x89, 0x99, 0x97, 0x44, 0x9b, 0x20, 0x77, 0xe7, - 0x5f, 0x3a, 0x1e, 0x0b, 0x67, 0xff, 0xc8, 0xc3, 0xa6, 0xba, 0x60, 0x84, 0xce, 0xa1, 0x92, 0x59, - 0x9d, 0xd1, 0xe1, 0x27, 0x57, 0xea, 0xba, 0xb5, 0x7e, 0x4d, 0x9d, 0xc7, 0xcf, 0x0d, 0xf4, 0x0a, - 0xaa, 0xd9, 0xe5, 0x18, 0x65, 0x97, 0x9e, 0x35, 0x5b, 0xf3, 0x27, 0x7d, 0xbd, 0x06, 0x13, 0xc7, - 0xc2, 0x9b, 0xca, 0x25, 0x27, 0x59, 0x3b, 0x51, 0x3d, 0xa3, 0x7f, 0x6b, 0x97, 0xad, 0x1f, 0xac, - 0x95, 0x25, 0x15, 0xea, 0xea, 0x4f, 0x4c, 0x16, 0xbf, 0x3b, 0x9f, 0xb8, 0xba, 0x6d, 0xd6, 0x3f, - 0xbf, 0x4f, 0x9c, 0x78, 0x1b, 0xc3, 0xee, 0x1a, 0x66, 0x40, 0xbf, 0xc8, 0xde, 0xe0, 0x5e, 0x5e, - 0xa9, 0x7f, 0xfd, 0xbf, 0xd4, 0x96, 0x51, 0xd6, 0x50, 0xc8, 0x4a, 0x94, 0xfb, 0x09, 0x68, 0x25, - 0xca, 0xa7, 0x98, 0xc8, 0x06, 0x58, 0x76, 0x34, 0x7a, 0x9c, 0xb1, 0xba, 0xf3, 0x22, 0xeb, 0x87, - 0xf7, 0x48, 0xb5, 0xab, 0x97, 0xbf, 0xfa, 0xdd, 0xe9, 0x95, 0x27, 0x26, 0xf3, 0xf7, 0x27, 0xa3, - 0x70, 0x7a, 0xea, 0xcb, 0x6d, 0x2e, 0xf0, 0x82, 0xab, 0x80, 0x8b, 0x3f, 0x84, 0xd1, 0xf5, 0xa9, - 0x1f, 0x8c, 0x4f, 0xd5, 0xc3, 0x38, 0x5d, 0x78, 0x79, 0xbf, 0xa9, 0xfe, 0xb1, 0xfe, 0xf5, 0x7f, - 0x03, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x15, 0x37, 0x36, 0x88, 0x0f, 0x00, 0x00, + // 1843 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0x41, 0x73, 0x22, 0xc7, + 0x15, 0xf6, 0x08, 0x10, 0xf0, 0x00, 0x69, 0xd4, 0x92, 0xb5, 0x2c, 0x5a, 0x79, 0x65, 0xec, 0xd8, + 0xaa, 0xad, 0xb5, 0xb4, 0x21, 0x65, 0xd7, 0x96, 0x0f, 0x49, 0xb1, 0xd0, 0x58, 0xa3, 0x85, 0x19, + 0x6d, 0x03, 0x6b, 0x6f, 0x72, 0xe8, 0xea, 0x85, 0x96, 0x98, 0xd2, 0x30, 0x83, 0x67, 0x1a, 0x65, + 0x95, 0x43, 0xaa, 0x72, 0x4f, 0xae, 0xf9, 0x0b, 0xb9, 0xe4, 0x96, 0x3f, 0x92, 0x5f, 0x91, 0xfc, + 0x82, 0xdc, 0x53, 0xdd, 0x3d, 0x03, 0x83, 0x84, 0x36, 0x39, 0x89, 0xfe, 0xde, 0xf7, 0x5e, 0xf7, + 0xbc, 0xf7, 0xfa, 0xeb, 0x27, 0xd8, 0x0f, 0x83, 0xb9, 0xe0, 0x61, 0x38, 0x1b, 0x9d, 0xea, 0x5f, + 0x27, 0xb3, 0x30, 0x10, 0x01, 0x2a, 0x2e, 0xf0, 0x5a, 0x31, 0x9c, 0x8d, 0x34, 0x5a, 0xff, 0x53, + 0x16, 0x50, 0x9f, 0xfb, 0xe3, 0x0b, 0x76, 0x3b, 0xe5, 0xbe, 0x20, 0xfc, 0xe7, 0x39, 0x8f, 0x04, + 0x42, 0x90, 0x1d, 0xf3, 0x48, 0x54, 0x8d, 0x23, 0xe3, 0xb8, 0x4c, 0xd4, 0x6f, 0x64, 0x42, 0x86, + 0x4d, 0x45, 0x75, 0xe3, 0xc8, 0x38, 0xce, 0x10, 0xf9, 0x13, 0x7d, 0x0e, 0xe5, 0x99, 0xf6, 0xa3, + 0x13, 0x16, 0x4d, 0xaa, 0x19, 0xc5, 0x2e, 0xc5, 0xd8, 0x19, 0x8b, 0x26, 0xe8, 0x18, 0xcc, 0x4b, + 0xd7, 0x67, 0x1e, 0x1d, 0x79, 0xe2, 0x86, 0x8e, 0xb9, 0x27, 0x58, 0x35, 0x7b, 0x64, 0x1c, 0xe7, + 0xc8, 0x96, 0xc2, 0x5b, 0x9e, 0xb8, 0x69, 0x4b, 0x14, 0x7d, 0x0d, 0xdb, 0x49, 0xb0, 0x50, 0x9f, + 0xa2, 0x9a, 0x3b, 0x32, 0x8e, 0x8b, 0x64, 0x6b, 0xb6, 0x7a, 0xb6, 0xaf, 0x61, 0x5b, 0xb8, 0x53, + 0x1e, 0xcc, 0x05, 0x8d, 0xf8, 0x28, 0xf0, 0xc7, 0x51, 0x75, 0x53, 0x47, 0x8c, 0xe1, 0xbe, 0x46, + 0x51, 0x1d, 0x2a, 0x97, 0x9c, 0x53, 0xcf, 0x9d, 0xba, 0x82, 0x46, 0x4c, 0x54, 0xf3, 0xea, 0xe8, + 0xa5, 0x4b, 0xce, 0xbb, 0x12, 0xeb, 0x33, 0x81, 0x9e, 0x83, 0x19, 0xcc, 0xc5, 0x55, 0xe0, 0xfa, + 0x57, 0x74, 0x34, 0x61, 0x3e, 0x75, 0xc7, 0xd5, 0xc2, 0x91, 0x71, 0x9c, 0x7d, 0xb5, 0xf1, 0xc2, + 0x20, 0x5b, 0x89, 0xad, 0x35, 0x61, 0xbe, 0x35, 0x46, 0x87, 0x00, 0xea, 0x3b, 0x54, 0xc8, 0x6a, + 0x51, 0xed, 0x5a, 0x94, 0x88, 0x8a, 0x87, 0x1a, 0x50, 0x52, 0x49, 0xa6, 0x13, 0xd7, 0x17, 0x51, + 0x15, 0x8e, 0x32, 0xc7, 0xa5, 0x86, 0x79, 0xe2, 0xf9, 0x32, 0xdf, 0x44, 0x5a, 0xce, 0x5c, 0x5f, + 0x90, 0x34, 0x09, 0x61, 0x28, 0xc8, 0xec, 0x52, 0xe1, 0xdd, 0x54, 0x4b, 0xca, 0xe1, 0xd9, 0xc9, + 0xa2, 0x52, 0x27, 0xf7, 0x4b, 0x73, 0xd2, 0xe6, 0x91, 0x18, 0x78, 0x37, 0xd8, 0x17, 0xe1, 0x2d, + 0xc9, 0x8f, 0xf5, 0xaa, 0xf6, 0x3d, 0x94, 0xd3, 0x06, 0x59, 0xac, 0x6b, 0x7e, 0xab, 0xea, 0x97, + 0x25, 0xf2, 0x27, 0xda, 0x83, 0xdc, 0x0d, 0xf3, 0xe6, 0x5c, 0x15, 0xb0, 0x4c, 0xf4, 0xe2, 0xfb, + 0x8d, 0x97, 0x46, 0xfd, 0x25, 0xec, 0x0e, 0x42, 0x36, 0xba, 0xbe, 0xd3, 0x03, 0x77, 0xab, 0x6b, + 0xdc, 0xab, 0x6e, 0xfd, 0x8f, 0x50, 0x89, 0x9d, 0xfa, 0x82, 0x89, 0x79, 0x84, 0xbe, 0x81, 0x5c, + 0x24, 0x98, 0xe0, 0x8a, 0xbc, 0xd5, 0x78, 0x94, 0xfa, 0x94, 0x14, 0x91, 0x13, 0xcd, 0x42, 0x35, + 0x28, 0xcc, 0x42, 0xee, 0x4e, 0xd9, 0x55, 0x72, 0xac, 0xc5, 0x1a, 0xd5, 0x21, 0xa7, 0x9c, 0x55, + 0x57, 0x95, 0x1a, 0xe5, 0x74, 0x1a, 0x89, 0x36, 0xd5, 0x7f, 0x0d, 0xdb, 0x6a, 0xdd, 0xe1, 0xfc, + 0x63, 0x9d, 0xfb, 0x08, 0xf2, 0x6c, 0xaa, 0x5b, 0x40, 0x77, 0xef, 0x26, 0x9b, 0xca, 0xea, 0xd7, + 0xc7, 0x60, 0x2e, 0xfd, 0xa3, 0x59, 0xe0, 0x47, 0x5c, 0x76, 0xac, 0x0c, 0x2e, 0x1b, 0x42, 0x76, + 0xcf, 0x54, 0x7a, 0x19, 0xca, 0x6b, 0x2b, 0xc6, 0x3b, 0x9c, 0xf7, 0x22, 0x26, 0xd0, 0x57, 0xba, + 0x11, 0xa9, 0x17, 0x8c, 0xae, 0x65, 0x6b, 0xb3, 0xdb, 0x38, 0x7c, 0x45, 0xc2, 0xdd, 0x60, 0x74, + 0xdd, 0x96, 0x60, 0xfd, 0x77, 0xfa, 0x8a, 0x0d, 0x02, 0x7d, 0xf6, 0xff, 0x3b, 0xbd, 0xcb, 0x14, + 0x6c, 0x3c, 0x9c, 0x02, 0x0a, 0xbb, 0x2b, 0xc1, 0xe3, 0xaf, 0x48, 0x67, 0xd6, 0xb8, 0x93, 0xd9, + 0xe7, 0x90, 0xbf, 0x64, 0xae, 0x37, 0x0f, 0x93, 0xc0, 0x28, 0x55, 0xa6, 0x8e, 0xb6, 0x90, 0x84, + 0x52, 0xff, 0x4f, 0x1e, 0xf2, 0x31, 0x88, 0x1a, 0x90, 0x1d, 0x05, 0xe3, 0xa4, 0xba, 0x9f, 0xdd, + 0x77, 0x4b, 0xfe, 0xb6, 0x82, 0x31, 0x27, 0x8a, 0x8b, 0x7e, 0x03, 0x5b, 0xf2, 0x62, 0xf9, 0xdc, + 0xa3, 0xf3, 0xd9, 0x98, 0x2d, 0x0a, 0x5a, 0x4d, 0x79, 0xb7, 0x34, 0x61, 0xa8, 0xec, 0xa4, 0x32, + 0x4a, 0x2f, 0xd1, 0x01, 0x14, 0x27, 0xc2, 0x1b, 0xe9, 0x4a, 0x64, 0x55, 0x43, 0x17, 0x24, 0xa0, + 0x6a, 0x50, 0x87, 0x4a, 0xe0, 0xbb, 0x81, 0x4f, 0xa3, 0x09, 0xa3, 0x8d, 0x6f, 0xbf, 0x53, 0x9a, + 0x51, 0x26, 0x25, 0x05, 0xf6, 0x27, 0xac, 0xf1, 0xed, 0x77, 0xe8, 0x29, 0x94, 0xd4, 0xad, 0xe5, + 0x1f, 0x66, 0x6e, 0x78, 0xab, 0xc4, 0xa2, 0x42, 0xd4, 0x45, 0xc6, 0x0a, 0x91, 0x57, 0xe3, 0xd2, + 0x63, 0x57, 0x91, 0x12, 0x88, 0x0a, 0xd1, 0x0b, 0xf4, 0x02, 0xf6, 0xe2, 0x1c, 0xd0, 0x28, 0x98, + 0x87, 0x23, 0x4e, 0x5d, 0x7f, 0xcc, 0x3f, 0x28, 0x79, 0xa8, 0x10, 0x14, 0xdb, 0xfa, 0xca, 0x64, + 0x49, 0x0b, 0xda, 0x87, 0xcd, 0x09, 0x77, 0xaf, 0x26, 0x5a, 0x1a, 0x2a, 0x24, 0x5e, 0xd5, 0xff, + 0x9e, 0x83, 0x52, 0x2a, 0x31, 0xa8, 0x0c, 0x05, 0x82, 0xfb, 0x98, 0xbc, 0xc5, 0x6d, 0xf3, 0x13, + 0x74, 0x0c, 0x5f, 0x5a, 0x76, 0xcb, 0x21, 0x04, 0xb7, 0x06, 0xd4, 0x21, 0x74, 0x68, 0xbf, 0xb6, + 0x9d, 0x1f, 0x6d, 0x7a, 0xd1, 0x7c, 0xd7, 0xc3, 0xf6, 0x80, 0xb6, 0xf1, 0xa0, 0x69, 0x75, 0xfb, + 0xa6, 0x81, 0x9e, 0x40, 0x75, 0xc9, 0x4c, 0xcc, 0xcd, 0x9e, 0x33, 0xb4, 0x07, 0xe6, 0x06, 0x7a, + 0x0a, 0x07, 0x1d, 0xcb, 0x6e, 0x76, 0xe9, 0x92, 0xd3, 0xea, 0x0e, 0xde, 0x52, 0xfc, 0xd3, 0x85, + 0x45, 0xde, 0x99, 0x99, 0x75, 0x84, 0xb3, 0x41, 0xb7, 0x95, 0x44, 0xc8, 0xa2, 0xc7, 0xf0, 0xa9, + 0x26, 0x68, 0x17, 0x3a, 0x70, 0x1c, 0xda, 0x77, 0x1c, 0xdb, 0xcc, 0xa1, 0x1d, 0xa8, 0x58, 0xf6, + 0xdb, 0x66, 0xd7, 0x6a, 0x53, 0x82, 0x9b, 0xdd, 0x9e, 0xb9, 0x89, 0x76, 0x61, 0xfb, 0x2e, 0x2f, + 0x2f, 0x43, 0x24, 0x3c, 0xc7, 0xb6, 0x1c, 0x9b, 0xbe, 0xc5, 0xa4, 0x6f, 0x39, 0xb6, 0x59, 0x40, + 0xfb, 0x80, 0x56, 0x4d, 0x67, 0xbd, 0x66, 0xcb, 0x2c, 0xa2, 0x4f, 0x61, 0x67, 0x15, 0x7f, 0x8d, + 0xdf, 0x99, 0x80, 0xaa, 0xb0, 0xa7, 0x0f, 0x46, 0x5f, 0xe1, 0xae, 0xf3, 0x23, 0xed, 0x59, 0xb6, + 0xd5, 0x1b, 0xf6, 0xcc, 0x12, 0xda, 0x03, 0xb3, 0x83, 0x31, 0xb5, 0xec, 0xfe, 0xb0, 0xd3, 0xb1, + 0x5a, 0x16, 0xb6, 0x07, 0x66, 0x59, 0xef, 0xbc, 0xee, 0xc3, 0x2b, 0xd2, 0xa1, 0x75, 0xd6, 0xb4, + 0x6d, 0xdc, 0xa5, 0x6d, 0xab, 0xdf, 0x7c, 0xd5, 0xc5, 0x6d, 0x73, 0x0b, 0x1d, 0xc2, 0xe3, 0x01, + 0xee, 0x5d, 0x38, 0xa4, 0x49, 0xde, 0xd1, 0xc4, 0xde, 0x69, 0x5a, 0xdd, 0x21, 0xc1, 0xe6, 0x36, + 0xfa, 0x1c, 0x0e, 0x09, 0x7e, 0x33, 0xb4, 0x08, 0x6e, 0x53, 0xdb, 0x69, 0x63, 0xda, 0xc1, 0xcd, + 0xc1, 0x90, 0x60, 0xda, 0xb3, 0xfa, 0x7d, 0xcb, 0xfe, 0xc1, 0x34, 0xd1, 0x97, 0x70, 0xb4, 0xa0, + 0x2c, 0x02, 0xdc, 0x61, 0xed, 0xc8, 0xef, 0x4b, 0x4a, 0x6a, 0xe3, 0x9f, 0x06, 0xf4, 0x02, 0x63, + 0x62, 0x22, 0x54, 0x83, 0xfd, 0xe5, 0xf6, 0x7a, 0x83, 0x78, 0xef, 0x5d, 0x69, 0xbb, 0xc0, 0xa4, + 0xd7, 0xb4, 0x65, 0x81, 0x57, 0x6c, 0x7b, 0xf2, 0xd8, 0x4b, 0xdb, 0xdd, 0x63, 0x7f, 0x8a, 0x10, + 0x6c, 0xa5, 0xaa, 0xd2, 0x69, 0x12, 0x73, 0x1f, 0xed, 0xc1, 0x76, 0x72, 0x82, 0x84, 0xf8, 0xaf, + 0x3c, 0x7a, 0x04, 0x68, 0x68, 0x13, 0xdc, 0x6c, 0xcb, 0x84, 0x2c, 0x0c, 0xff, 0xce, 0x9f, 0x67, + 0x0b, 0x1b, 0x66, 0xa6, 0xfe, 0x8f, 0x0c, 0x54, 0x56, 0xee, 0x25, 0x7a, 0x02, 0xc5, 0xc8, 0xbd, + 0xf2, 0x99, 0x90, 0xca, 0xa1, 0x45, 0x65, 0x09, 0xa8, 0xb7, 0x71, 0xc2, 0x5c, 0x5f, 0xab, 0x99, + 0x56, 0xf3, 0xa2, 0x42, 0x94, 0x96, 0x1d, 0x40, 0x3e, 0x79, 0x5f, 0x33, 0x8b, 0xf7, 0x75, 0x73, + 0xa4, 0xdf, 0xd5, 0x27, 0x50, 0x94, 0x92, 0x19, 0x09, 0x36, 0x9d, 0xa9, 0x2b, 0x5e, 0x21, 0x4b, + 0x00, 0x7d, 0x01, 0x95, 0x29, 0x8f, 0x22, 0x76, 0xc5, 0xa9, 0xbe, 0xa6, 0xa0, 0x18, 0xe5, 0x18, + 0xec, 0xa8, 0xdb, 0xfa, 0x05, 0x24, 0xb2, 0x11, 0x93, 0x72, 0x9a, 0x14, 0x83, 0x9a, 0x74, 0x57, + 0xb1, 0x05, 0x8b, 0xd5, 0x20, 0xad, 0xd8, 0x82, 0xa1, 0x67, 0xb0, 0xa3, 0x25, 0xc7, 0xf5, 0xdd, + 0xe9, 0x7c, 0xaa, 0xa5, 0x27, 0xaf, 0xa4, 0x67, 0x5b, 0x49, 0x8f, 0xc6, 0x95, 0x02, 0x3d, 0x86, + 0xc2, 0x7b, 0x16, 0x71, 0xf9, 0x58, 0xc4, 0xd2, 0x90, 0x97, 0xeb, 0x0e, 0xe7, 0xd2, 0x24, 0x9f, + 0x90, 0x50, 0x8a, 0x9e, 0x56, 0x84, 0xfc, 0x25, 0xe7, 0x44, 0xe6, 0x72, 0xb1, 0x03, 0xfb, 0xb0, + 0xdc, 0xa1, 0x94, 0xda, 0x41, 0xe3, 0x6a, 0x87, 0x67, 0xb0, 0xc3, 0x3f, 0x88, 0x90, 0xd1, 0x60, + 0xc6, 0x7e, 0x9e, 0x73, 0x3a, 0x66, 0x82, 0x55, 0xcb, 0x2a, 0xc1, 0xdb, 0xca, 0xe0, 0x28, 0xbc, + 0xcd, 0x04, 0xab, 0x3f, 0x81, 0x1a, 0xe1, 0x11, 0x17, 0x3d, 0x37, 0x8a, 0xdc, 0xc0, 0x6f, 0x05, + 0xbe, 0x08, 0x03, 0x2f, 0x7e, 0x73, 0xea, 0x87, 0x70, 0xb0, 0xd6, 0xaa, 0x1f, 0x0d, 0xe9, 0xfc, + 0x66, 0xce, 0xc3, 0xdb, 0xf5, 0xce, 0x6f, 0xe0, 0x60, 0xad, 0x35, 0x7e, 0x71, 0x9e, 0x43, 0x6e, + 0xc6, 0xdc, 0x30, 0xaa, 0x6e, 0xa8, 0x29, 0x66, 0x7f, 0xe5, 0xe9, 0x77, 0xc3, 0x33, 0x37, 0x12, + 0x41, 0x78, 0x4b, 0x34, 0xe9, 0x3c, 0x5b, 0x30, 0xcc, 0x8d, 0xfa, 0x9f, 0x0d, 0x28, 0xa5, 0x8c, + 0xb2, 0x0f, 0xfc, 0x60, 0xcc, 0xe9, 0x65, 0x18, 0x4c, 0x93, 0x0e, 0x5b, 0x00, 0xa8, 0x0a, 0x79, + 0xb5, 0x10, 0x41, 0xdc, 0x5e, 0xc9, 0x12, 0x7d, 0x03, 0xf9, 0x89, 0x0e, 0xa1, 0xaa, 0x54, 0x6a, + 0xec, 0xde, 0xd9, 0x5d, 0xe6, 0x86, 0x24, 0x9c, 0xf3, 0x6c, 0x21, 0x63, 0x66, 0xcf, 0xb3, 0x85, + 0xac, 0x99, 0x3b, 0xcf, 0x16, 0x72, 0xe6, 0xe6, 0x79, 0xb6, 0xb0, 0x69, 0xe6, 0xeb, 0x7f, 0x35, + 0xa0, 0x90, 0xb0, 0x57, 0x7b, 0x52, 0x0f, 0x00, 0xa9, 0x9e, 0x6c, 0xc0, 0xde, 0xd4, 0xf5, 0xe9, + 0x8c, 0xfb, 0xcc, 0x73, 0xff, 0xc0, 0xe9, 0xea, 0x7c, 0xb1, 0xd6, 0x86, 0x5e, 0xc2, 0x23, 0x8f, + 0x45, 0x82, 0x32, 0x21, 0xf8, 0x74, 0x26, 0x68, 0x34, 0x1f, 0x8d, 0x78, 0x14, 0x5d, 0xce, 0x3d, + 0x75, 0x25, 0x0a, 0xe4, 0x21, 0x73, 0xfd, 0x6f, 0x06, 0xec, 0xbc, 0x9a, 0xbb, 0xde, 0x78, 0x65, + 0x82, 0x78, 0x0c, 0x05, 0x19, 0x3a, 0x35, 0xa1, 0xc8, 0x31, 0x47, 0xb5, 0xcc, 0xba, 0xb1, 0x7b, + 0x63, 0xed, 0xd8, 0xbd, 0x6e, 0x00, 0xce, 0x3c, 0x38, 0x00, 0x3f, 0x85, 0xd2, 0x24, 0x98, 0xd1, + 0xd9, 0xfc, 0xfd, 0x35, 0xbf, 0x8d, 0xaa, 0xd9, 0xa3, 0xcc, 0x71, 0x99, 0xc0, 0x24, 0x98, 0x5d, + 0x68, 0xa4, 0xfe, 0x12, 0x50, 0xfa, 0xa0, 0x71, 0x6f, 0x2c, 0x06, 0x19, 0xe3, 0xc1, 0x41, 0xe6, + 0xd9, 0x5f, 0x0c, 0x28, 0xa7, 0x67, 0x44, 0x54, 0x81, 0xa2, 0x65, 0xd3, 0x4e, 0xd7, 0xfa, 0xe1, + 0x6c, 0x60, 0x7e, 0x22, 0x97, 0xfd, 0x61, 0xab, 0x85, 0x71, 0x1b, 0xb7, 0x4d, 0x43, 0xea, 0x9c, + 0x94, 0x2c, 0xdc, 0xa6, 0x03, 0xab, 0x87, 0x9d, 0xa1, 0x7c, 0x01, 0x77, 0x61, 0x3b, 0xc6, 0x6c, + 0x87, 0x12, 0x67, 0x38, 0xc0, 0x66, 0x06, 0x99, 0x50, 0x8e, 0x41, 0x4c, 0x88, 0x43, 0xcc, 0xac, + 0x94, 0xed, 0x18, 0xb9, 0xff, 0x9a, 0x26, 0x8f, 0x6d, 0xae, 0xf1, 0xcf, 0x2c, 0x6c, 0xaa, 0x03, + 0x86, 0xe8, 0x0c, 0x4a, 0xa9, 0x41, 0x1c, 0x1d, 0x7e, 0x74, 0x40, 0xaf, 0x55, 0xd7, 0x0f, 0xbd, + 0xf3, 0xe8, 0x85, 0x81, 0xce, 0xa1, 0x9c, 0x1e, 0xb5, 0x51, 0x7a, 0x84, 0x5a, 0x33, 0x83, 0x7f, + 0x34, 0xd6, 0x6b, 0x30, 0x71, 0x24, 0xdc, 0xa9, 0x1c, 0x99, 0xe2, 0x21, 0x16, 0xd5, 0x52, 0xfc, + 0x3b, 0x93, 0x71, 0xed, 0x60, 0xad, 0x2d, 0xae, 0x50, 0x57, 0x7f, 0x62, 0x3c, 0x46, 0xde, 0xfb, + 0xc4, 0xd5, 0xd9, 0xb5, 0xf6, 0xd9, 0x43, 0xe6, 0x38, 0xda, 0x18, 0x76, 0xd7, 0xe8, 0x0c, 0xfa, + 0x45, 0xfa, 0x04, 0x0f, 0xaa, 0x54, 0xed, 0xab, 0xff, 0x45, 0x5b, 0xee, 0xb2, 0x46, 0x90, 0x56, + 0x76, 0x79, 0x58, 0xce, 0x56, 0x76, 0xf9, 0x98, 0xae, 0x59, 0x00, 0xcb, 0x8e, 0x46, 0x4f, 0x52, + 0x5e, 0xf7, 0x6e, 0x64, 0xed, 0xf0, 0x01, 0xab, 0x0e, 0xf5, 0xea, 0x97, 0xbf, 0x3d, 0xbd, 0x72, + 0xc5, 0x64, 0xfe, 0xfe, 0x64, 0x14, 0x4c, 0x4f, 0x3d, 0x39, 0x1b, 0xfa, 0xae, 0x7f, 0xe5, 0x73, + 0xf1, 0xfb, 0x20, 0xbc, 0x3e, 0xf5, 0xfc, 0xf1, 0xa9, 0xba, 0x18, 0xa7, 0x8b, 0x28, 0xef, 0x37, + 0xd5, 0xbf, 0xe9, 0xbf, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x33, 0xcc, 0xf1, 0xd6, + 0x0f, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/lnrpc/routerrpc/router.proto b/lnrpc/routerrpc/router.proto index 906f2542..f7df3dc2 100644 --- a/lnrpc/routerrpc/router.proto +++ b/lnrpc/routerrpc/router.proto @@ -350,17 +350,21 @@ message PairHistory { /// The destination node pubkey of the pair. bytes node_to = 2 [json_name="node_to"]; - + + reserved 3, 4, 5, 6; + + PairData history = 7 [json_name="history"]; +} + +message PairData { /// Time stamp of last result. - int64 timestamp = 3 [json_name = "timestamp"]; + int64 timestamp = 1 [json_name = "timestamp"]; /// Minimum penalization amount (only applies to failed attempts). - int64 min_penalize_amt_sat = 4 [json_name = "min_penalize_amt_sat"]; - - reserved 5; + int64 min_penalize_amt_sat = 2 [json_name = "min_penalize_amt_sat"]; /// Whether the last payment attempt through this pair was successful. - bool last_attempt_successful = 6 [json_name = "last_attempt_successful"]; + bool last_attempt_successful = 3 [json_name = "last_attempt_successful"]; } message BuildRouteRequest { diff --git a/lnrpc/routerrpc/router_server.go b/lnrpc/routerrpc/router_server.go index 51691edf..6503a861 100644 --- a/lnrpc/routerrpc/router_server.go +++ b/lnrpc/routerrpc/router_server.go @@ -472,13 +472,9 @@ func (s *Server) QueryMissionControl(ctx context.Context, pair := p rpcPair := PairHistory{ - NodeFrom: pair.Pair.From[:], - NodeTo: pair.Pair.To[:], - Timestamp: pair.Timestamp.Unix(), - MinPenalizeAmtSat: int64( - pair.MinPenalizeAmt.ToSatoshis(), - ), - LastAttemptSuccessful: pair.Success, + NodeFrom: pair.Pair.From[:], + NodeTo: pair.Pair.To[:], + History: toRPCPairData(&pair.TimedPairResult), } rpcPairs = append(rpcPairs, &rpcPair) @@ -491,6 +487,22 @@ func (s *Server) QueryMissionControl(ctx context.Context, return &response, nil } +// toRPCPairData marshalls mission control pair data to the rpc struct. +func toRPCPairData(data *routing.TimedPairResult) *PairData { + rpcData := PairData{ + MinPenalizeAmtSat: int64( + data.MinPenalizeAmt.ToSatoshis(), + ), + LastAttemptSuccessful: data.Success, + } + + if !data.Timestamp.IsZero() { + rpcData.Timestamp = data.Timestamp.Unix() + } + + return &rpcData +} + // TrackPayment returns a stream of payment state updates. The stream is // closed when the payment completes. func (s *Server) TrackPayment(request *TrackPaymentRequest,