From 363142de3373ba2aa56099e8061d7552a9a608fc Mon Sep 17 00:00:00 2001 From: Joost Jager Date: Tue, 23 Jun 2020 16:22:00 +0200 Subject: [PATCH] htlcswitch: expose additional fields for intercepted packets --- htlcswitch/interceptable_switch.go | 3 + htlcswitch/interfaces.go | 10 + lnrpc/routerrpc/forward_interceptor.go | 9 +- lnrpc/routerrpc/router.pb.go | 349 ++++++++++--------- lnrpc/routerrpc/router.proto | 12 + lnrpc/routerrpc/router.swagger.json | 15 + lntest/itest/lnd_forward_interceptor_test.go | 16 + 7 files changed, 253 insertions(+), 161 deletions(-) diff --git a/htlcswitch/interceptable_switch.go b/htlcswitch/interceptable_switch.go index 2ca54e42..d510a5fb 100644 --- a/htlcswitch/interceptable_switch.go +++ b/htlcswitch/interceptable_switch.go @@ -121,9 +121,12 @@ func (f *interceptedForward) Packet() InterceptedPacket { ChanID: f.packet.incomingChanID, HtlcID: f.packet.incomingHTLCID, }, + OutgoingChanID: f.packet.outgoingChanID, Hash: f.htlc.PaymentHash, OutgoingExpiry: f.htlc.Expiry, OutgoingAmount: f.htlc.Amount, + IncomingAmount: f.packet.incomingAmount, + IncomingExpiry: f.packet.incomingTimeout, } } diff --git a/htlcswitch/interfaces.go b/htlcswitch/interfaces.go index 74b1a568..f9684c59 100644 --- a/htlcswitch/interfaces.go +++ b/htlcswitch/interfaces.go @@ -207,6 +207,9 @@ type InterceptedPacket struct { // packet. IncomingCircuit channeldb.CircuitKey + // OutgoingChanID is the destination channel for this packet. + OutgoingChanID lnwire.ShortChannelID + // Hash is the payment hash of the htlc. Hash lntypes.Hash @@ -216,6 +219,13 @@ type InterceptedPacket struct { // OutgoingAmount is the amount to forward. OutgoingAmount lnwire.MilliSatoshi + + // IncomingExpiry is the absolute block height at which the incoming + // htlc expires. + IncomingExpiry uint32 + + // IncomingAmount is the amount of the accepted htlc. + IncomingAmount lnwire.MilliSatoshi } // InterceptedForward is passed to the ForwardInterceptor for every forwarded diff --git a/lnrpc/routerrpc/forward_interceptor.go b/lnrpc/routerrpc/forward_interceptor.go index 00db973d..61260854 100644 --- a/lnrpc/routerrpc/forward_interceptor.go +++ b/lnrpc/routerrpc/forward_interceptor.go @@ -157,9 +157,12 @@ func (r *forwardInterceptor) holdAndForwardToClient( ChanId: inKey.ChanID.ToUint64(), HtlcId: inKey.HtlcID, }, - PaymentHash: htlc.Hash[:], - OutgoingAmountMsat: uint64(htlc.OutgoingAmount), - OutgoingExpiry: htlc.OutgoingExpiry, + OutgoingRequestedChanId: htlc.OutgoingChanID.ToUint64(), + PaymentHash: htlc.Hash[:], + OutgoingAmountMsat: uint64(htlc.OutgoingAmount), + OutgoingExpiry: htlc.OutgoingExpiry, + IncomingAmountMsat: uint64(htlc.IncomingAmount), + IncomingExpiry: htlc.IncomingExpiry, } return r.stream.Send(interceptionRequest) diff --git a/lnrpc/routerrpc/router.pb.go b/lnrpc/routerrpc/router.pb.go index ac2deeb0..a7c88235 100644 --- a/lnrpc/routerrpc/router.pb.go +++ b/lnrpc/routerrpc/router.pb.go @@ -1809,10 +1809,19 @@ type ForwardHtlcInterceptRequest struct { //The key of this forwarded htlc. It defines the incoming channel id and //the index in this channel. IncomingCircuitKey *CircuitKey `protobuf:"bytes,1,opt,name=incoming_circuit_key,json=incomingCircuitKey,proto3" json:"incoming_circuit_key,omitempty"` + // The incoming htlc amount. + IncomingAmountMsat uint64 `protobuf:"varint,5,opt,name=incoming_amount_msat,json=incomingAmountMsat,proto3" json:"incoming_amount_msat,omitempty"` + // The incoming htlc expiry. + IncomingExpiry uint32 `protobuf:"varint,6,opt,name=incoming_expiry,json=incomingExpiry,proto3" json:"incoming_expiry,omitempty"` // //The htlc payment hash. This value is not guaranteed to be unique per //request. PaymentHash []byte `protobuf:"bytes,2,opt,name=payment_hash,json=paymentHash,proto3" json:"payment_hash,omitempty"` + // The requested outgoing channel id for this forwarded htlc. Because of + // non-strict forwarding, this isn't necessarily the channel over which the + // packet will be forwarded eventually. A different channel to the same peer + // may be selected as well. + OutgoingRequestedChanId uint64 `protobuf:"varint,7,opt,name=outgoing_requested_chan_id,json=outgoingRequestedChanId,proto3" json:"outgoing_requested_chan_id,omitempty"` // The outgoing htlc amount. OutgoingAmountMsat uint64 `protobuf:"varint,3,opt,name=outgoing_amount_msat,json=outgoingAmountMsat,proto3" json:"outgoing_amount_msat,omitempty"` // The outgoing htlc expiry. @@ -1854,6 +1863,20 @@ func (m *ForwardHtlcInterceptRequest) GetIncomingCircuitKey() *CircuitKey { return nil } +func (m *ForwardHtlcInterceptRequest) GetIncomingAmountMsat() uint64 { + if m != nil { + return m.IncomingAmountMsat + } + return 0 +} + +func (m *ForwardHtlcInterceptRequest) GetIncomingExpiry() uint32 { + if m != nil { + return m.IncomingExpiry + } + return 0 +} + func (m *ForwardHtlcInterceptRequest) GetPaymentHash() []byte { if m != nil { return m.PaymentHash @@ -1861,6 +1884,13 @@ func (m *ForwardHtlcInterceptRequest) GetPaymentHash() []byte { return nil } +func (m *ForwardHtlcInterceptRequest) GetOutgoingRequestedChanId() uint64 { + if m != nil { + return m.OutgoingRequestedChanId + } + return 0 +} + func (m *ForwardHtlcInterceptRequest) GetOutgoingAmountMsat() uint64 { if m != nil { return m.OutgoingAmountMsat @@ -1979,164 +2009,167 @@ func init() { func init() { proto.RegisterFile("routerrpc/router.proto", fileDescriptor_7a0613f69d37b0a5) } var fileDescriptor_7a0613f69d37b0a5 = []byte{ - // 2501 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4b, 0x73, 0x1b, 0xc7, - 0xf1, 0xf7, 0xe2, 0x45, 0xa0, 0xf1, 0xe0, 0x72, 0x40, 0x4b, 0xf8, 0x83, 0x92, 0x0d, 0xaf, 0x6d, - 0x09, 0xa5, 0xbf, 0x4d, 0xc9, 0x4c, 0x2a, 0x71, 0xc5, 0x8f, 0x04, 0x04, 0x96, 0xe2, 0x4a, 0x20, - 0x00, 0x0f, 0x40, 0xda, 0x8e, 0x0f, 0x53, 0x4b, 0x60, 0x40, 0x6c, 0xb8, 0xd8, 0x45, 0x76, 0x07, - 0x92, 0x79, 0xcc, 0x2d, 0x95, 0x2f, 0x92, 0x5b, 0x3e, 0x41, 0x0e, 0x39, 0xe4, 0x7b, 0xe4, 0x92, - 0x43, 0xee, 0xa9, 0xca, 0x39, 0x35, 0x8f, 0x05, 0x76, 0x41, 0x50, 0x4a, 0xaa, 0x72, 0x91, 0xb8, - 0xbf, 0xee, 0xe9, 0xe9, 0x9e, 0xfe, 0x75, 0xf7, 0x0c, 0xe0, 0x5e, 0xe0, 0x2f, 0x19, 0x0d, 0x82, - 0xc5, 0xf8, 0xa9, 0xfc, 0xeb, 0x70, 0x11, 0xf8, 0xcc, 0x47, 0x85, 0x15, 0x5e, 0x2f, 0x04, 0x8b, - 0xb1, 0x44, 0x8d, 0x7f, 0xe6, 0x00, 0x0d, 0xa9, 0x37, 0x19, 0xd8, 0x37, 0x73, 0xea, 0x31, 0x4c, - 0x7f, 0xbb, 0xa4, 0x21, 0x43, 0x08, 0x32, 0x13, 0x1a, 0xb2, 0x9a, 0xd6, 0xd0, 0x9a, 0x25, 0x2c, - 0xfe, 0x46, 0x3a, 0xa4, 0xed, 0x39, 0xab, 0xa5, 0x1a, 0x5a, 0x33, 0x8d, 0xf9, 0x9f, 0xe8, 0xff, - 0x20, 0x6f, 0xcf, 0x19, 0x99, 0x87, 0x36, 0xab, 0x95, 0x04, 0xbc, 0x63, 0xcf, 0xd9, 0x59, 0x68, - 0x33, 0xf4, 0x01, 0x94, 0x16, 0xd2, 0x24, 0x99, 0xd9, 0xe1, 0xac, 0x96, 0x16, 0x86, 0x8a, 0x0a, - 0x3b, 0xb5, 0xc3, 0x19, 0x6a, 0x82, 0x3e, 0x75, 0x3c, 0xdb, 0x25, 0x63, 0x97, 0xbd, 0x22, 0x13, - 0xea, 0x32, 0xbb, 0x96, 0x69, 0x68, 0xcd, 0x2c, 0xae, 0x08, 0xbc, 0xed, 0xb2, 0x57, 0x1d, 0x8e, - 0xa2, 0xc7, 0xb0, 0x1b, 0x19, 0x0b, 0xa4, 0x83, 0xb5, 0x6c, 0x43, 0x6b, 0x16, 0x70, 0x65, 0x91, - 0x74, 0xfb, 0x31, 0xec, 0x32, 0x67, 0x4e, 0xfd, 0x25, 0x23, 0x21, 0x1d, 0xfb, 0xde, 0x24, 0xac, - 0xe5, 0xa4, 0x45, 0x05, 0x0f, 0x25, 0x8a, 0x0c, 0x28, 0x4f, 0x29, 0x25, 0xae, 0x33, 0x77, 0x18, - 0xe1, 0xee, 0xef, 0x08, 0xf7, 0x8b, 0x53, 0x4a, 0xbb, 0x1c, 0x1b, 0xda, 0x0c, 0x7d, 0x04, 0x95, - 0xb5, 0x8e, 0x88, 0xb1, 0x2c, 0x94, 0x4a, 0x91, 0x92, 0x08, 0xf4, 0x10, 0x74, 0x7f, 0xc9, 0xae, - 0x7c, 0xc7, 0xbb, 0x22, 0xe3, 0x99, 0xed, 0x11, 0x67, 0x52, 0xcb, 0x37, 0xb4, 0x66, 0xe6, 0x38, - 0x53, 0xd3, 0x9e, 0x69, 0xb8, 0x12, 0x49, 0xdb, 0x33, 0xdb, 0xb3, 0x26, 0xe8, 0x09, 0xec, 0x6d, - 0xea, 0x87, 0xb5, 0x6a, 0x23, 0xdd, 0xcc, 0xe0, 0xdd, 0xa4, 0x6a, 0x88, 0x1e, 0xc1, 0xae, 0x6b, - 0x87, 0x8c, 0xcc, 0xfc, 0x05, 0x59, 0x2c, 0x2f, 0xaf, 0xe9, 0x4d, 0xad, 0x22, 0xce, 0xb1, 0xcc, - 0xe1, 0x53, 0x7f, 0x31, 0x10, 0x20, 0x7a, 0x08, 0x20, 0xce, 0x50, 0xb8, 0x5a, 0x2b, 0x88, 0x88, - 0x0b, 0x1c, 0x11, 0x6e, 0xa2, 0xcf, 0xa0, 0x28, 0x72, 0x4f, 0x66, 0x8e, 0xc7, 0xc2, 0x1a, 0x34, - 0xd2, 0xcd, 0xe2, 0x91, 0x7e, 0xe8, 0x7a, 0x9c, 0x06, 0x98, 0x4b, 0x4e, 0x1d, 0x8f, 0x61, 0x08, - 0xa2, 0x3f, 0x43, 0x34, 0x81, 0x2a, 0xcf, 0x39, 0x19, 0x2f, 0x43, 0xe6, 0xcf, 0x49, 0x40, 0xc7, - 0x7e, 0x30, 0x09, 0x6b, 0x45, 0xb1, 0xf4, 0xa7, 0x87, 0x2b, 0x2a, 0x1d, 0xde, 0xe6, 0xce, 0x61, - 0x87, 0x86, 0xac, 0x2d, 0xd6, 0x61, 0xb9, 0xcc, 0xf4, 0x58, 0x70, 0x83, 0xf7, 0x26, 0x9b, 0x38, - 0xfa, 0x04, 0x90, 0xed, 0xba, 0xfe, 0x6b, 0x12, 0x52, 0x77, 0x4a, 0x54, 0x2e, 0x6b, 0xbb, 0x0d, - 0xad, 0x99, 0xc7, 0xba, 0x90, 0x0c, 0xa9, 0x3b, 0x55, 0xe6, 0xd1, 0xcf, 0xa0, 0x2c, 0x7c, 0x9a, - 0x52, 0x9b, 0x2d, 0x03, 0x1a, 0xd6, 0xf4, 0x46, 0xba, 0x59, 0x39, 0xda, 0x53, 0x81, 0x9c, 0x48, - 0xf8, 0xd8, 0x61, 0xb8, 0xc4, 0xf5, 0xd4, 0x77, 0x88, 0x0e, 0xa0, 0x30, 0xb7, 0x7f, 0x24, 0x0b, - 0x3b, 0x60, 0x61, 0x6d, 0xaf, 0xa1, 0x35, 0xcb, 0x38, 0x3f, 0xb7, 0x7f, 0x1c, 0xf0, 0x6f, 0x74, - 0x08, 0x55, 0xcf, 0x27, 0x8e, 0x37, 0x75, 0x9d, 0xab, 0x19, 0x23, 0xcb, 0xc5, 0xc4, 0x66, 0x34, - 0xac, 0x21, 0xe1, 0xc3, 0x9e, 0xe7, 0x5b, 0x4a, 0x72, 0x2e, 0x05, 0xf5, 0x0e, 0xdc, 0xdb, 0x1e, - 0x1f, 0x2f, 0x0f, 0x9e, 0x20, 0x5e, 0x31, 0x19, 0xcc, 0xff, 0x44, 0xfb, 0x90, 0x7d, 0x65, 0xbb, - 0x4b, 0x2a, 0x4a, 0xa6, 0x84, 0xe5, 0xc7, 0x2f, 0x52, 0x9f, 0x6b, 0xc6, 0x0c, 0xaa, 0xa3, 0xc0, - 0x1e, 0x5f, 0x6f, 0x54, 0xdd, 0x66, 0xd1, 0x68, 0xb7, 0x8b, 0xe6, 0x0e, 0x7f, 0x53, 0x77, 0xf8, - 0x6b, 0x7c, 0x0d, 0xbb, 0x22, 0xc3, 0x27, 0x94, 0xbe, 0xa9, 0xb6, 0xef, 0x03, 0xaf, 0x5c, 0x51, - 0x09, 0xb2, 0xbe, 0x73, 0xf6, 0x9c, 0x17, 0x81, 0x31, 0x01, 0x7d, 0xbd, 0x3e, 0x5c, 0xf8, 0x5e, - 0x48, 0x79, 0xe1, 0x72, 0x02, 0x70, 0x06, 0xf3, 0x02, 0x11, 0xa5, 0xa1, 0x89, 0x55, 0x15, 0x85, - 0x9f, 0x50, 0x2a, 0x8a, 0xe3, 0x91, 0xac, 0x47, 0xe2, 0xfa, 0xe3, 0x6b, 0x5e, 0xe1, 0xf6, 0x8d, - 0x32, 0x5f, 0xe6, 0x70, 0xd7, 0x1f, 0x5f, 0x77, 0x38, 0x68, 0xfc, 0x20, 0x9b, 0xd0, 0xc8, 0x17, - 0x7b, 0xfd, 0x17, 0xc7, 0x61, 0x40, 0x56, 0x70, 0x51, 0x98, 0x2d, 0x1e, 0x95, 0xe2, 0xa4, 0xc6, - 0x52, 0x64, 0xfc, 0x00, 0xd5, 0x84, 0x71, 0x15, 0x45, 0x1d, 0xf2, 0x8b, 0x80, 0x3a, 0x73, 0xfb, - 0x8a, 0x2a, 0xcb, 0xab, 0x6f, 0xd4, 0x84, 0x9d, 0xa9, 0xed, 0xb8, 0xcb, 0x20, 0x32, 0x5c, 0x89, - 0x48, 0x26, 0x51, 0x1c, 0x89, 0x8d, 0x07, 0x50, 0xc7, 0x34, 0xa4, 0xec, 0xcc, 0x09, 0x43, 0xc7, - 0xf7, 0xda, 0xbe, 0xc7, 0x02, 0xdf, 0x55, 0x11, 0x18, 0x0f, 0xe1, 0x60, 0xab, 0x54, 0xba, 0xc0, - 0x17, 0x7f, 0xb3, 0xa4, 0xc1, 0xcd, 0xf6, 0xc5, 0xdf, 0xc0, 0xc1, 0x56, 0xa9, 0xf2, 0xff, 0x13, - 0xc8, 0x2e, 0x6c, 0x27, 0xe0, 0xb9, 0xe7, 0x45, 0x79, 0x2f, 0x56, 0x94, 0x03, 0xdb, 0x09, 0x4e, - 0x9d, 0x90, 0xf9, 0xc1, 0x0d, 0x96, 0x4a, 0x2f, 0x32, 0x79, 0x4d, 0x4f, 0x19, 0x7f, 0xd0, 0xa0, - 0x18, 0x13, 0xf2, 0xd2, 0xf0, 0xfc, 0x09, 0x25, 0xd3, 0xc0, 0x9f, 0x47, 0x87, 0xc0, 0x81, 0x93, - 0xc0, 0x9f, 0x73, 0x4e, 0x08, 0x21, 0xf3, 0x15, 0x81, 0x73, 0xfc, 0x73, 0xe4, 0xa3, 0x4f, 0x61, - 0x67, 0x26, 0x0d, 0x88, 0xb6, 0x59, 0x3c, 0xaa, 0x6e, 0xec, 0xdd, 0xb1, 0x99, 0x8d, 0x23, 0x9d, - 0x17, 0x99, 0x7c, 0x5a, 0xcf, 0xbc, 0xc8, 0xe4, 0x33, 0x7a, 0xf6, 0x45, 0x26, 0x9f, 0xd5, 0x73, - 0x2f, 0x32, 0xf9, 0x9c, 0xbe, 0x63, 0xfc, 0x43, 0x83, 0x7c, 0xa4, 0xcd, 0x3d, 0xe1, 0x47, 0x4a, - 0x38, 0x2f, 0x14, 0x99, 0xf2, 0x1c, 0x18, 0x39, 0x73, 0x8a, 0x1a, 0x50, 0x12, 0xc2, 0x24, 0x45, - 0x81, 0x63, 0x2d, 0x41, 0x53, 0xd1, 0xcf, 0x23, 0x0d, 0xc1, 0xc7, 0x8c, 0xea, 0xe7, 0x52, 0x25, - 0x1a, 0x49, 0xe1, 0x72, 0x3c, 0xa6, 0x61, 0x28, 0x77, 0xc9, 0x4a, 0x15, 0x85, 0x89, 0x8d, 0x1e, - 0xc1, 0x6e, 0xa4, 0x12, 0xed, 0x95, 0x93, 0x7c, 0x55, 0xb0, 0xda, 0xae, 0x09, 0x7a, 0x5c, 0x6f, - 0xbe, 0x9e, 0x20, 0x95, 0xb5, 0x22, 0xdf, 0x54, 0x06, 0x6f, 0xfc, 0x06, 0xee, 0x8b, 0x54, 0x0e, - 0x02, 0xff, 0xd2, 0xbe, 0x74, 0x5c, 0x87, 0xdd, 0x44, 0x24, 0xe7, 0x81, 0x07, 0xfe, 0x9c, 0xf0, - 0xb3, 0x8d, 0x52, 0xc0, 0x81, 0x9e, 0x3f, 0xa1, 0x3c, 0x05, 0xcc, 0x97, 0x22, 0x95, 0x02, 0xe6, - 0x0b, 0x41, 0x7c, 0xf2, 0xa6, 0x13, 0x93, 0xd7, 0xb8, 0x86, 0xda, 0xed, 0xbd, 0x14, 0x67, 0x1a, - 0x50, 0x5c, 0xac, 0x61, 0xb1, 0x9d, 0x86, 0xe3, 0x50, 0x3c, 0xb7, 0xa9, 0xb7, 0xe7, 0xd6, 0xf8, - 0xa3, 0x06, 0x7b, 0xc7, 0x4b, 0xc7, 0x9d, 0x24, 0x0a, 0x37, 0xee, 0x9d, 0x96, 0xbc, 0x17, 0x6c, - 0x1b, 0xfa, 0xa9, 0xad, 0x43, 0xff, 0x93, 0x2d, 0x83, 0x35, 0x2d, 0x06, 0x6b, 0x6a, 0xcb, 0x58, - 0x7d, 0x1f, 0x8a, 0xeb, 0x29, 0x19, 0xd6, 0x32, 0x8d, 0x74, 0xb3, 0x84, 0x61, 0x16, 0x8d, 0xc8, - 0xd0, 0xf8, 0x1c, 0x50, 0xdc, 0x51, 0x75, 0x20, 0xab, 0xfe, 0xa1, 0xdd, 0xdd, 0x3f, 0x1e, 0x40, - 0x7d, 0xb8, 0xbc, 0x0c, 0xc7, 0x81, 0x73, 0x49, 0x4f, 0x99, 0x3b, 0x36, 0x5f, 0x51, 0x8f, 0x85, - 0x51, 0x95, 0xfe, 0x2b, 0x03, 0x85, 0x15, 0xca, 0xdb, 0xb3, 0xe3, 0x8d, 0xfd, 0x79, 0xe4, 0xb4, - 0x47, 0x5d, 0xee, 0xb7, 0x1c, 0x0a, 0x7b, 0x91, 0xa8, 0x2d, 0x25, 0xd6, 0x84, 0xeb, 0x27, 0x82, - 0x54, 0xfa, 0x29, 0xa9, 0x1f, 0x8f, 0x51, 0xea, 0x37, 0x41, 0x5f, 0xd9, 0x9f, 0x31, 0x77, 0xbc, - 0x3a, 0x14, 0x5c, 0x89, 0x70, 0xee, 0x8c, 0xd4, 0x5c, 0x59, 0x8e, 0x34, 0x33, 0x52, 0x33, 0xc2, - 0x95, 0xe6, 0x07, 0x50, 0xe2, 0xf5, 0x10, 0x32, 0x7b, 0xbe, 0x20, 0x5e, 0x28, 0xea, 0x22, 0x83, - 0x8b, 0x2b, 0xac, 0x17, 0xa2, 0xaf, 0x00, 0x28, 0x8f, 0x8f, 0xb0, 0x9b, 0x05, 0x15, 0x25, 0x51, - 0x39, 0x7a, 0x2f, 0x46, 0x8c, 0xd5, 0x01, 0x1c, 0x8a, 0x7f, 0x47, 0x37, 0x0b, 0x8a, 0x0b, 0x34, - 0xfa, 0x13, 0x7d, 0x0d, 0xe5, 0xa9, 0x1f, 0xbc, 0xb6, 0x83, 0x09, 0x11, 0xa0, 0x6a, 0x1b, 0xf7, - 0x63, 0x16, 0x4e, 0xa4, 0x5c, 0x2c, 0x3f, 0x7d, 0x07, 0x97, 0xa6, 0xb1, 0x6f, 0xf4, 0x12, 0x50, - 0xb4, 0x5e, 0x54, 0xb9, 0x34, 0x92, 0x17, 0x46, 0x0e, 0x6e, 0x1b, 0xe1, 0x4d, 0x3a, 0x32, 0xa4, - 0x4f, 0x37, 0x30, 0xf4, 0x05, 0x94, 0x42, 0xca, 0x98, 0x4b, 0x95, 0x99, 0x82, 0x30, 0x73, 0x2f, - 0x71, 0xa7, 0xe1, 0xe2, 0xc8, 0x42, 0x31, 0x5c, 0x7f, 0xa2, 0x63, 0xd8, 0x75, 0x1d, 0xef, 0x3a, - 0xee, 0x06, 0x88, 0xf5, 0xb5, 0xd8, 0xfa, 0xae, 0xe3, 0x5d, 0xc7, 0x7d, 0x28, 0xbb, 0x71, 0xc0, - 0xf8, 0x12, 0x0a, 0xab, 0x53, 0x42, 0x45, 0xd8, 0x39, 0xef, 0xbd, 0xec, 0xf5, 0xbf, 0xed, 0xe9, - 0xef, 0xa0, 0x3c, 0x64, 0x86, 0x66, 0xaf, 0xa3, 0x6b, 0x1c, 0xc6, 0x66, 0xdb, 0xb4, 0x2e, 0x4c, - 0x3d, 0xc5, 0x3f, 0x4e, 0xfa, 0xf8, 0xdb, 0x16, 0xee, 0xe8, 0xe9, 0xe3, 0x1d, 0xc8, 0x8a, 0x7d, - 0x8d, 0x3f, 0x6b, 0x90, 0x17, 0x19, 0xf4, 0xa6, 0x3e, 0xfa, 0x7f, 0x58, 0x91, 0x4b, 0x34, 0x37, - 0x3e, 0x70, 0x05, 0xeb, 0xca, 0x78, 0x45, 0x98, 0x91, 0xc2, 0xb9, 0xf2, 0x8a, 0x1a, 0x2b, 0xe5, - 0x94, 0x54, 0x8e, 0x04, 0x2b, 0xe5, 0x27, 0x31, 0xcb, 0x89, 0x96, 0x93, 0xc1, 0xbb, 0x91, 0x20, - 0xea, 0xb0, 0xf1, 0xbb, 0x6d, 0xa2, 0x13, 0xc7, 0xee, 0xb6, 0x4a, 0xd7, 0xf8, 0x39, 0x94, 0xe2, - 0x39, 0x47, 0x8f, 0x21, 0xe3, 0x78, 0x53, 0x5f, 0x15, 0x62, 0x75, 0x83, 0x5c, 0x3c, 0x48, 0x2c, - 0x14, 0x0c, 0x04, 0xfa, 0x66, 0x9e, 0x8d, 0x32, 0x14, 0x63, 0x49, 0x33, 0xfe, 0xa6, 0x41, 0x39, - 0x91, 0x84, 0xff, 0xd8, 0x3a, 0xfa, 0x0a, 0x4a, 0xaf, 0x9d, 0x80, 0x92, 0xf8, 0xf8, 0xaf, 0x1c, - 0xd5, 0x93, 0xe3, 0x3f, 0xfa, 0xbf, 0xed, 0x4f, 0x28, 0x2e, 0x72, 0x7d, 0x05, 0xa0, 0x5f, 0x42, - 0x45, 0xad, 0x24, 0x13, 0xca, 0x6c, 0xc7, 0x15, 0x47, 0x55, 0x49, 0xd0, 0x43, 0xe9, 0x76, 0x84, - 0x1c, 0x97, 0xa7, 0xf1, 0x4f, 0xf4, 0xf1, 0xda, 0x40, 0xc8, 0x02, 0xc7, 0xbb, 0x12, 0xe7, 0x57, - 0x58, 0xa9, 0x0d, 0x05, 0xc8, 0x07, 0x79, 0x59, 0x5d, 0x1e, 0x87, 0xcc, 0x66, 0xcb, 0x10, 0x7d, - 0x0a, 0xd9, 0x90, 0xd9, 0xaa, 0x93, 0x55, 0x12, 0xb5, 0x15, 0x53, 0xa4, 0x58, 0x6a, 0x25, 0x6e, - 0x3f, 0xa9, 0x5b, 0xb7, 0x9f, 0x2c, 0xef, 0x18, 0xb2, 0x8b, 0x16, 0x8f, 0x90, 0x0a, 0xfe, 0x74, - 0xd4, 0x6d, 0xb7, 0x18, 0xa3, 0xf3, 0x05, 0xc3, 0x52, 0x41, 0x4d, 0xb7, 0xaf, 0x01, 0xda, 0x4e, - 0x30, 0x5e, 0x3a, 0xec, 0x25, 0xbd, 0xe1, 0x33, 0x2b, 0x6a, 0xd7, 0xb2, 0xed, 0xe5, 0xc6, 0xb2, - 0x45, 0xdf, 0x87, 0x9d, 0xa8, 0x11, 0xc9, 0xfe, 0x96, 0x9b, 0x89, 0x06, 0x64, 0xfc, 0x5d, 0x83, - 0x03, 0x95, 0x52, 0x99, 0x0d, 0x46, 0x83, 0x31, 0x5d, 0xac, 0xae, 0xc5, 0xcf, 0x61, 0x7f, 0xdd, - 0x54, 0xe5, 0x46, 0x24, 0xba, 0x6a, 0x17, 0x8f, 0xde, 0x8d, 0x45, 0xba, 0x76, 0x03, 0xa3, 0x55, - 0xb3, 0x5d, 0xbb, 0xb6, 0x79, 0xa1, 0x4c, 0xdd, 0xbe, 0x50, 0x3e, 0x83, 0xfd, 0x18, 0x85, 0xfd, - 0xa5, 0x97, 0x60, 0x3c, 0x5a, 0xb3, 0x98, 0x8b, 0x04, 0xe9, 0x1f, 0xc3, 0x8a, 0xdb, 0x84, 0xfe, - 0xb8, 0x70, 0x82, 0x1b, 0x91, 0xb2, 0xf2, 0xba, 0xcf, 0x9a, 0x02, 0x35, 0xfe, 0xa2, 0xc1, 0x83, - 0xed, 0x61, 0xaa, 0x61, 0xf4, 0x3f, 0x8b, 0xf3, 0x0b, 0xc8, 0xd9, 0x63, 0xe6, 0xf8, 0x9e, 0xa2, - 0xef, 0x87, 0xb1, 0xa5, 0x98, 0x86, 0xbe, 0xfb, 0x8a, 0x9e, 0xfa, 0xee, 0x44, 0x39, 0xd3, 0x12, - 0xaa, 0x58, 0x2d, 0x49, 0x30, 0x23, 0x9d, 0x64, 0xc6, 0x93, 0xdf, 0x65, 0xa0, 0x9c, 0xa0, 0x6f, - 0xb2, 0x7f, 0x95, 0xa1, 0xd0, 0xeb, 0x93, 0x8e, 0x39, 0x6a, 0x59, 0x5d, 0x5d, 0x43, 0x3a, 0x94, - 0xfa, 0x3d, 0xab, 0xdf, 0x23, 0x1d, 0xb3, 0xdd, 0xef, 0xf0, 0x4e, 0xf6, 0x2e, 0xec, 0x75, 0xad, - 0xde, 0x4b, 0xd2, 0xeb, 0x8f, 0x88, 0xd9, 0xb5, 0x9e, 0x5b, 0xc7, 0x5d, 0x53, 0x4f, 0xa3, 0x7d, - 0xd0, 0xfb, 0x3d, 0xd2, 0x3e, 0x6d, 0x59, 0x3d, 0x32, 0xb2, 0xce, 0xcc, 0xfe, 0xf9, 0x48, 0xcf, - 0x70, 0x94, 0x53, 0x8e, 0x98, 0xdf, 0xb5, 0x4d, 0xb3, 0x33, 0x24, 0x67, 0xad, 0xef, 0xf4, 0x2c, - 0xaa, 0xc1, 0xbe, 0xd5, 0x1b, 0x9e, 0x9f, 0x9c, 0x58, 0x6d, 0xcb, 0xec, 0x8d, 0xc8, 0x71, 0xab, - 0xdb, 0xea, 0xb5, 0x4d, 0x3d, 0x87, 0xee, 0x01, 0xb2, 0x7a, 0xed, 0xfe, 0xd9, 0xa0, 0x6b, 0x8e, - 0x4c, 0x12, 0x75, 0xcc, 0x1d, 0x54, 0x85, 0x5d, 0x61, 0xa7, 0xd5, 0xe9, 0x90, 0x93, 0x96, 0xd5, - 0x35, 0x3b, 0x7a, 0x9e, 0x7b, 0xa2, 0x34, 0x86, 0xa4, 0x63, 0x0d, 0x5b, 0xc7, 0x1c, 0x2e, 0xf0, - 0x3d, 0xad, 0xde, 0x45, 0xdf, 0x6a, 0x9b, 0xa4, 0xcd, 0xcd, 0x72, 0x14, 0xb8, 0x72, 0x84, 0x9e, - 0xf7, 0x3a, 0x26, 0x1e, 0xb4, 0xac, 0x8e, 0x5e, 0x44, 0x07, 0x70, 0x3f, 0x82, 0xcd, 0xef, 0x06, - 0x16, 0xfe, 0x9e, 0x8c, 0xfa, 0x7d, 0x32, 0xec, 0xf7, 0x7b, 0x7a, 0x29, 0x6e, 0x89, 0x47, 0xdb, - 0x1f, 0x98, 0x3d, 0xbd, 0x8c, 0xee, 0x43, 0xf5, 0x6c, 0x30, 0x20, 0x91, 0x24, 0x0a, 0xb6, 0xc2, - 0xd5, 0x5b, 0x9d, 0x0e, 0x36, 0x87, 0x43, 0x72, 0x66, 0x0d, 0xcf, 0x5a, 0xa3, 0xf6, 0xa9, 0xbe, - 0xcb, 0x43, 0x1a, 0x9a, 0x23, 0x32, 0xea, 0x8f, 0x5a, 0xdd, 0x35, 0xae, 0x73, 0x87, 0xd6, 0x38, - 0xdf, 0xb4, 0xdb, 0xff, 0x56, 0xdf, 0xe3, 0x07, 0xce, 0xe1, 0xfe, 0x85, 0x72, 0x11, 0xf1, 0xd8, - 0x55, 0x7a, 0xa2, 0x3d, 0xf5, 0x2a, 0x07, 0xad, 0xde, 0x45, 0xab, 0x6b, 0x75, 0xc8, 0x4b, 0xf3, - 0x7b, 0x31, 0x71, 0xf6, 0x39, 0x28, 0x3d, 0x23, 0x03, 0xdc, 0x7f, 0xce, 0x1d, 0xd1, 0xdf, 0x45, - 0x08, 0x2a, 0x6d, 0x0b, 0xb7, 0xcf, 0xbb, 0x2d, 0x4c, 0x70, 0xff, 0x7c, 0x64, 0xea, 0xf7, 0x9e, - 0xfc, 0x49, 0x83, 0x52, 0xbc, 0xa3, 0xf0, 0xac, 0x5b, 0x3d, 0x72, 0xd2, 0xb5, 0x9e, 0x9f, 0x8e, - 0x24, 0x09, 0x86, 0xe7, 0x6d, 0x9e, 0x32, 0x93, 0x4f, 0x32, 0x04, 0x15, 0x79, 0xe8, 0xab, 0x60, - 0x53, 0x7c, 0x2f, 0x85, 0xf5, 0xfa, 0xca, 0x6e, 0x9a, 0x3b, 0xaf, 0x40, 0x13, 0xe3, 0x3e, 0xd6, - 0x33, 0xe8, 0x23, 0x68, 0x28, 0x84, 0xe7, 0x15, 0x63, 0xb3, 0x3d, 0x22, 0x83, 0xd6, 0xf7, 0x67, - 0x3c, 0xed, 0x92, 0x64, 0x43, 0x3d, 0x8b, 0xde, 0x87, 0x83, 0x95, 0xd6, 0x36, 0x5e, 0x3c, 0xf9, - 0x12, 0x6a, 0x77, 0x91, 0x1e, 0x01, 0xe4, 0x86, 0xe6, 0x68, 0xd4, 0x35, 0xe5, 0xf4, 0x3d, 0x91, - 0xc4, 0x05, 0xc8, 0x61, 0x73, 0x78, 0x7e, 0x66, 0xea, 0xa9, 0xa3, 0xbf, 0xe6, 0x21, 0x27, 0xae, - 0x83, 0x01, 0xfa, 0x15, 0x94, 0x63, 0x3f, 0x77, 0x5c, 0x1c, 0xa1, 0x87, 0x6f, 0xfc, 0x21, 0xa4, - 0x1e, 0x3d, 0x1a, 0x15, 0xfc, 0x4c, 0x43, 0xc7, 0x50, 0x89, 0xbf, 0xfb, 0x2f, 0x8e, 0x50, 0xfc, - 0x16, 0xb5, 0xe5, 0x27, 0x81, 0x2d, 0x36, 0x5e, 0x82, 0x6e, 0x86, 0xcc, 0x99, 0xf3, 0x66, 0xae, - 0x5e, 0xe6, 0xa8, 0x1e, 0x2f, 0xf0, 0xe4, 0x73, 0xbf, 0x7e, 0xb0, 0x55, 0xa6, 0x5a, 0xce, 0x37, - 0x7c, 0x70, 0xae, 0xde, 0xc6, 0xb7, 0x02, 0x4a, 0x3e, 0xc8, 0xeb, 0xef, 0xdd, 0x25, 0x56, 0xef, - 0xd9, 0xf4, 0xef, 0x53, 0x3c, 0xc6, 0x72, 0x4c, 0xb6, 0xe5, 0x94, 0x36, 0x8c, 0x6e, 0x19, 0x2f, - 0x68, 0x02, 0xd5, 0x2d, 0xef, 0x66, 0xf4, 0x71, 0xb2, 0x8f, 0xdd, 0xf1, 0xea, 0xae, 0x3f, 0x7a, - 0x9b, 0x9a, 0x0a, 0x7e, 0x02, 0xd5, 0x2d, 0x0f, 0xec, 0xc4, 0x2e, 0x77, 0x3f, 0xcf, 0x13, 0xbb, - 0xbc, 0xe9, 0x9d, 0xfe, 0x03, 0xe8, 0x9b, 0xef, 0x31, 0x64, 0x6c, 0xae, 0xbd, 0xfd, 0x30, 0xac, - 0x7f, 0xf8, 0x46, 0x1d, 0x65, 0xdc, 0x02, 0x58, 0xbf, 0x6a, 0xd0, 0x83, 0xd8, 0x92, 0x5b, 0xaf, - 0xb2, 0xfa, 0xc3, 0x3b, 0xa4, 0xca, 0xd4, 0x08, 0xaa, 0x5b, 0x9e, 0x39, 0x89, 0xd3, 0xb8, 0xfb, - 0x19, 0x54, 0xdf, 0xdf, 0xf6, 0x1a, 0x78, 0xa6, 0xa1, 0x33, 0x49, 0xb0, 0xe8, 0x37, 0xbc, 0xb7, - 0x54, 0x4c, 0x6d, 0xfb, 0xad, 0x65, 0x19, 0x0a, 0x6a, 0x3d, 0xd3, 0x50, 0x1f, 0x4a, 0xf1, 0x2a, - 0x79, 0x6b, 0xf9, 0xbc, 0xd5, 0xe0, 0x14, 0x76, 0x13, 0xc3, 0xd8, 0x0f, 0xd0, 0xe3, 0xdb, 0x2f, - 0x8a, 0xad, 0xf3, 0x3a, 0xc1, 0x80, 0x37, 0xdc, 0x5f, 0x9a, 0xda, 0x33, 0xed, 0xf8, 0xb3, 0x5f, - 0x3f, 0xbd, 0x72, 0xd8, 0x6c, 0x79, 0x79, 0x38, 0xf6, 0xe7, 0x4f, 0xc5, 0x4f, 0x74, 0x9e, 0xe3, - 0x5d, 0x79, 0x94, 0xbd, 0xf6, 0x83, 0xeb, 0xa7, 0xae, 0x37, 0x79, 0x2a, 0xca, 0xe0, 0xe9, 0xca, - 0xe4, 0x65, 0x4e, 0xfc, 0x42, 0xff, 0x93, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x10, 0xfc, 0xd9, - 0xb9, 0xd1, 0x17, 0x00, 0x00, + // 2551 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0xcb, 0x72, 0x1b, 0xc7, + 0xd5, 0xf6, 0xe0, 0x46, 0xe0, 0xe0, 0xc2, 0x61, 0x83, 0x16, 0xf1, 0x83, 0x92, 0x0d, 0xc3, 0xb6, + 0x84, 0xd2, 0x6f, 0x53, 0x34, 0x93, 0x4a, 0x5c, 0xf1, 0x25, 0x01, 0x81, 0xa1, 0x38, 0x12, 0x08, + 0xc0, 0x0d, 0x90, 0xb6, 0xe3, 0x45, 0xd7, 0x10, 0x68, 0x10, 0x13, 0x0e, 0x66, 0x90, 0x99, 0x86, + 0x64, 0x2e, 0xb3, 0x4b, 0xe5, 0x45, 0xb2, 0xcb, 0x13, 0x64, 0x91, 0x45, 0xde, 0x23, 0xdb, 0xec, + 0x53, 0x95, 0x55, 0x16, 0xa9, 0xbe, 0xcc, 0x60, 0x86, 0x04, 0xa5, 0xa4, 0x2a, 0x1b, 0x09, 0xf3, + 0x9d, 0xaf, 0x4f, 0x9f, 0xee, 0x73, 0xeb, 0x6e, 0xc2, 0x03, 0xdf, 0x5b, 0x31, 0xea, 0xfb, 0xcb, + 0xc9, 0x33, 0xf9, 0xeb, 0x60, 0xe9, 0x7b, 0xcc, 0x43, 0x85, 0x08, 0xaf, 0x17, 0xfc, 0xe5, 0x44, + 0xa2, 0xcd, 0x7f, 0xe4, 0x00, 0x8d, 0xa8, 0x3b, 0x1d, 0x5a, 0x37, 0x0b, 0xea, 0x32, 0x4c, 0x7f, + 0xbb, 0xa2, 0x01, 0x43, 0x08, 0x32, 0x53, 0x1a, 0xb0, 0x9a, 0xd6, 0xd0, 0x5a, 0x25, 0x2c, 0x7e, + 0x23, 0x1d, 0xd2, 0xd6, 0x82, 0xd5, 0x52, 0x0d, 0xad, 0x95, 0xc6, 0xfc, 0x27, 0xfa, 0x3f, 0xc8, + 0x5b, 0x0b, 0x46, 0x16, 0x81, 0xc5, 0x6a, 0x25, 0x01, 0x6f, 0x59, 0x0b, 0x76, 0x16, 0x58, 0x0c, + 0x7d, 0x00, 0xa5, 0xa5, 0x54, 0x49, 0xe6, 0x56, 0x30, 0xaf, 0xa5, 0x85, 0xa2, 0xa2, 0xc2, 0x4e, + 0xad, 0x60, 0x8e, 0x5a, 0xa0, 0xcf, 0x6c, 0xd7, 0x72, 0xc8, 0xc4, 0x61, 0xaf, 0xc8, 0x94, 0x3a, + 0xcc, 0xaa, 0x65, 0x1a, 0x5a, 0x2b, 0x8b, 0x2b, 0x02, 0xef, 0x38, 0xec, 0x55, 0x97, 0xa3, 0xe8, + 0x09, 0x6c, 0x87, 0xca, 0x7c, 0x69, 0x60, 0x2d, 0xdb, 0xd0, 0x5a, 0x05, 0x5c, 0x59, 0x26, 0xcd, + 0x7e, 0x02, 0xdb, 0xcc, 0x5e, 0x50, 0x6f, 0xc5, 0x48, 0x40, 0x27, 0x9e, 0x3b, 0x0d, 0x6a, 0x39, + 0xa9, 0x51, 0xc1, 0x23, 0x89, 0xa2, 0x26, 0x94, 0x67, 0x94, 0x12, 0xc7, 0x5e, 0xd8, 0x8c, 0x70, + 0xf3, 0xb7, 0x84, 0xf9, 0xc5, 0x19, 0xa5, 0x3d, 0x8e, 0x8d, 0x2c, 0x86, 0x3e, 0x82, 0xca, 0x9a, + 0x23, 0xd6, 0x58, 0x16, 0xa4, 0x52, 0x48, 0x12, 0x0b, 0x3d, 0x00, 0xdd, 0x5b, 0xb1, 0x2b, 0xcf, + 0x76, 0xaf, 0xc8, 0x64, 0x6e, 0xb9, 0xc4, 0x9e, 0xd6, 0xf2, 0x0d, 0xad, 0x95, 0x39, 0xce, 0xd4, + 0xb4, 0x43, 0x0d, 0x57, 0x42, 0x69, 0x67, 0x6e, 0xb9, 0xe6, 0x14, 0x3d, 0x85, 0x9d, 0xdb, 0xfc, + 0xa0, 0x56, 0x6d, 0xa4, 0x5b, 0x19, 0xbc, 0x9d, 0xa4, 0x06, 0xe8, 0x31, 0x6c, 0x3b, 0x56, 0xc0, + 0xc8, 0xdc, 0x5b, 0x92, 0xe5, 0xea, 0xf2, 0x9a, 0xde, 0xd4, 0x2a, 0x62, 0x1f, 0xcb, 0x1c, 0x3e, + 0xf5, 0x96, 0x43, 0x01, 0xa2, 0x47, 0x00, 0x62, 0x0f, 0x85, 0xa9, 0xb5, 0x82, 0x58, 0x71, 0x81, + 0x23, 0xc2, 0x4c, 0xf4, 0x19, 0x14, 0x85, 0xef, 0xc9, 0xdc, 0x76, 0x59, 0x50, 0x83, 0x46, 0xba, + 0x55, 0x3c, 0xd2, 0x0f, 0x1c, 0x97, 0x87, 0x01, 0xe6, 0x92, 0x53, 0xdb, 0x65, 0x18, 0xfc, 0xf0, + 0x67, 0x80, 0xa6, 0x50, 0xe5, 0x3e, 0x27, 0x93, 0x55, 0xc0, 0xbc, 0x05, 0xf1, 0xe9, 0xc4, 0xf3, + 0xa7, 0x41, 0xad, 0x28, 0x86, 0xfe, 0xf4, 0x20, 0x0a, 0xa5, 0x83, 0xbb, 0xb1, 0x73, 0xd0, 0xa5, + 0x01, 0xeb, 0x88, 0x71, 0x58, 0x0e, 0x33, 0x5c, 0xe6, 0xdf, 0xe0, 0x9d, 0xe9, 0x6d, 0x1c, 0x7d, + 0x02, 0xc8, 0x72, 0x1c, 0xef, 0x35, 0x09, 0xa8, 0x33, 0x23, 0xca, 0x97, 0xb5, 0xed, 0x86, 0xd6, + 0xca, 0x63, 0x5d, 0x48, 0x46, 0xd4, 0x99, 0x29, 0xf5, 0xe8, 0x67, 0x50, 0x16, 0x36, 0xcd, 0xa8, + 0xc5, 0x56, 0x3e, 0x0d, 0x6a, 0x7a, 0x23, 0xdd, 0xaa, 0x1c, 0xed, 0xa8, 0x85, 0x9c, 0x48, 0xf8, + 0xd8, 0x66, 0xb8, 0xc4, 0x79, 0xea, 0x3b, 0x40, 0xfb, 0x50, 0x58, 0x58, 0x3f, 0x92, 0xa5, 0xe5, + 0xb3, 0xa0, 0xb6, 0xd3, 0xd0, 0x5a, 0x65, 0x9c, 0x5f, 0x58, 0x3f, 0x0e, 0xf9, 0x37, 0x3a, 0x80, + 0xaa, 0xeb, 0x11, 0xdb, 0x9d, 0x39, 0xf6, 0xd5, 0x9c, 0x91, 0xd5, 0x72, 0x6a, 0x31, 0x1a, 0xd4, + 0x90, 0xb0, 0x61, 0xc7, 0xf5, 0x4c, 0x25, 0x39, 0x97, 0x82, 0x7a, 0x17, 0x1e, 0x6c, 0x5e, 0x1f, + 0x4f, 0x0f, 0xee, 0x20, 0x9e, 0x31, 0x19, 0xcc, 0x7f, 0xa2, 0x5d, 0xc8, 0xbe, 0xb2, 0x9c, 0x15, + 0x15, 0x29, 0x53, 0xc2, 0xf2, 0xe3, 0x17, 0xa9, 0xcf, 0xb5, 0xe6, 0x1c, 0xaa, 0x63, 0xdf, 0x9a, + 0x5c, 0xdf, 0xca, 0xba, 0xdb, 0x49, 0xa3, 0xdd, 0x4d, 0x9a, 0x7b, 0xec, 0x4d, 0xdd, 0x63, 0x6f, + 0xf3, 0x6b, 0xd8, 0x16, 0x1e, 0x3e, 0xa1, 0xf4, 0x4d, 0xb9, 0xbd, 0x07, 0x3c, 0x73, 0x45, 0x26, + 0xc8, 0xfc, 0xce, 0x59, 0x0b, 0x9e, 0x04, 0xcd, 0x29, 0xe8, 0xeb, 0xf1, 0xc1, 0xd2, 0x73, 0x03, + 0xca, 0x13, 0x97, 0x07, 0x00, 0x8f, 0x60, 0x9e, 0x20, 0x22, 0x35, 0x34, 0x31, 0xaa, 0xa2, 0xf0, + 0x13, 0x4a, 0x45, 0x72, 0x3c, 0x96, 0xf9, 0x48, 0x1c, 0x6f, 0x72, 0xcd, 0x33, 0xdc, 0xba, 0x51, + 0xea, 0xcb, 0x1c, 0xee, 0x79, 0x93, 0xeb, 0x2e, 0x07, 0x9b, 0x3f, 0xc8, 0x22, 0x34, 0xf6, 0xc4, + 0x5c, 0xff, 0xc5, 0x76, 0x34, 0x21, 0x2b, 0x62, 0x51, 0xa8, 0x2d, 0x1e, 0x95, 0xe2, 0x41, 0x8d, + 0xa5, 0xa8, 0xf9, 0x03, 0x54, 0x13, 0xca, 0xd5, 0x2a, 0xea, 0x90, 0x5f, 0xfa, 0xd4, 0x5e, 0x58, + 0x57, 0x54, 0x69, 0x8e, 0xbe, 0x51, 0x0b, 0xb6, 0x66, 0x96, 0xed, 0xac, 0xfc, 0x50, 0x71, 0x25, + 0x0c, 0x32, 0x89, 0xe2, 0x50, 0xdc, 0x7c, 0x08, 0x75, 0x4c, 0x03, 0xca, 0xce, 0xec, 0x20, 0xb0, + 0x3d, 0xb7, 0xe3, 0xb9, 0xcc, 0xf7, 0x1c, 0xb5, 0x82, 0xe6, 0x23, 0xd8, 0xdf, 0x28, 0x95, 0x26, + 0xf0, 0xc1, 0xdf, 0xac, 0xa8, 0x7f, 0xb3, 0x79, 0xf0, 0x37, 0xb0, 0xbf, 0x51, 0xaa, 0xec, 0xff, + 0x04, 0xb2, 0x4b, 0xcb, 0xf6, 0xb9, 0xef, 0x79, 0x52, 0x3e, 0x88, 0x25, 0xe5, 0xd0, 0xb2, 0xfd, + 0x53, 0x3b, 0x60, 0x9e, 0x7f, 0x83, 0x25, 0xe9, 0x45, 0x26, 0xaf, 0xe9, 0xa9, 0xe6, 0x1f, 0x34, + 0x28, 0xc6, 0x84, 0x3c, 0x35, 0x5c, 0x6f, 0x4a, 0xc9, 0xcc, 0xf7, 0x16, 0xe1, 0x26, 0x70, 0xe0, + 0xc4, 0xf7, 0x16, 0x3c, 0x26, 0x84, 0x90, 0x79, 0x2a, 0x80, 0x73, 0xfc, 0x73, 0xec, 0xa1, 0x4f, + 0x61, 0x6b, 0x2e, 0x15, 0x88, 0xb2, 0x59, 0x3c, 0xaa, 0xde, 0x9a, 0xbb, 0x6b, 0x31, 0x0b, 0x87, + 0x9c, 0x17, 0x99, 0x7c, 0x5a, 0xcf, 0xbc, 0xc8, 0xe4, 0x33, 0x7a, 0xf6, 0x45, 0x26, 0x9f, 0xd5, + 0x73, 0x2f, 0x32, 0xf9, 0x9c, 0xbe, 0xd5, 0xfc, 0xbb, 0x06, 0xf9, 0x90, 0xcd, 0x2d, 0xe1, 0x5b, + 0x4a, 0x78, 0x5c, 0xa8, 0x60, 0xca, 0x73, 0x60, 0x6c, 0x2f, 0x28, 0x6a, 0x40, 0x49, 0x08, 0x93, + 0x21, 0x0a, 0x1c, 0x6b, 0x8b, 0x30, 0x15, 0xf5, 0x3c, 0x64, 0x88, 0x78, 0xcc, 0xa8, 0x7a, 0x2e, + 0x29, 0x61, 0x4b, 0x0a, 0x56, 0x93, 0x09, 0x0d, 0x02, 0x39, 0x4b, 0x56, 0x52, 0x14, 0x26, 0x26, + 0x7a, 0x0c, 0xdb, 0x21, 0x25, 0x9c, 0x2b, 0x27, 0xe3, 0x55, 0xc1, 0x6a, 0xba, 0x16, 0xe8, 0x71, + 0xde, 0x62, 0xdd, 0x41, 0x2a, 0x6b, 0x22, 0x9f, 0x54, 0x2e, 0xbe, 0xf9, 0x1b, 0xd8, 0x13, 0xae, + 0x1c, 0xfa, 0xde, 0xa5, 0x75, 0x69, 0x3b, 0x36, 0xbb, 0x09, 0x83, 0x9c, 0x2f, 0xdc, 0xf7, 0x16, + 0x84, 0xef, 0x6d, 0xe8, 0x02, 0x0e, 0xf4, 0xbd, 0x29, 0xe5, 0x2e, 0x60, 0x9e, 0x14, 0x29, 0x17, + 0x30, 0x4f, 0x08, 0xe2, 0x9d, 0x37, 0x9d, 0xe8, 0xbc, 0xcd, 0x6b, 0xa8, 0xdd, 0x9d, 0x4b, 0xc5, + 0x4c, 0x03, 0x8a, 0xcb, 0x35, 0x2c, 0xa6, 0xd3, 0x70, 0x1c, 0x8a, 0xfb, 0x36, 0xf5, 0x76, 0xdf, + 0x36, 0xff, 0xa8, 0xc1, 0xce, 0xf1, 0xca, 0x76, 0xa6, 0x89, 0xc4, 0x8d, 0x5b, 0xa7, 0x25, 0xcf, + 0x05, 0x9b, 0x9a, 0x7e, 0x6a, 0x63, 0xd3, 0xff, 0x64, 0x43, 0x63, 0x4d, 0x8b, 0xc6, 0x9a, 0xda, + 0xd0, 0x56, 0xdf, 0x87, 0xe2, 0xba, 0x4b, 0x06, 0xb5, 0x4c, 0x23, 0xdd, 0x2a, 0x61, 0x98, 0x87, + 0x2d, 0x32, 0x68, 0x7e, 0x0e, 0x28, 0x6e, 0xa8, 0xda, 0x90, 0xa8, 0x7e, 0x68, 0xf7, 0xd7, 0x8f, + 0x87, 0x50, 0x1f, 0xad, 0x2e, 0x83, 0x89, 0x6f, 0x5f, 0xd2, 0x53, 0xe6, 0x4c, 0x8c, 0x57, 0xd4, + 0x65, 0x41, 0x98, 0xa5, 0xff, 0xcc, 0x40, 0x21, 0x42, 0x79, 0x79, 0xb6, 0xdd, 0x89, 0xb7, 0x08, + 0x8d, 0x76, 0xa9, 0xc3, 0xed, 0x96, 0x4d, 0x61, 0x27, 0x14, 0x75, 0xa4, 0xc4, 0x9c, 0x72, 0x7e, + 0x62, 0x91, 0x8a, 0x9f, 0x92, 0xfc, 0xf8, 0x1a, 0x25, 0xbf, 0x05, 0x7a, 0xa4, 0x7f, 0xce, 0x9c, + 0x49, 0xb4, 0x29, 0xb8, 0x12, 0xe2, 0xdc, 0x18, 0xc9, 0x8c, 0x34, 0x87, 0xcc, 0x8c, 0x64, 0x86, + 0xb8, 0x62, 0x7e, 0x00, 0x25, 0x9e, 0x0f, 0x01, 0xb3, 0x16, 0x4b, 0xe2, 0x06, 0x22, 0x2f, 0x32, + 0xb8, 0x18, 0x61, 0xfd, 0x00, 0x7d, 0x05, 0x40, 0xf9, 0xfa, 0x08, 0xbb, 0x59, 0x52, 0x91, 0x12, + 0x95, 0xa3, 0xf7, 0x62, 0x81, 0x11, 0x6d, 0xc0, 0x81, 0xf8, 0x77, 0x7c, 0xb3, 0xa4, 0xb8, 0x40, + 0xc3, 0x9f, 0xe8, 0x6b, 0x28, 0xcf, 0x3c, 0xff, 0xb5, 0xe5, 0x4f, 0x89, 0x00, 0x55, 0xd9, 0xd8, + 0x8b, 0x69, 0x38, 0x91, 0x72, 0x31, 0xfc, 0xf4, 0x1d, 0x5c, 0x9a, 0xc5, 0xbe, 0xd1, 0x4b, 0x40, + 0xe1, 0x78, 0x91, 0xe5, 0x52, 0x49, 0x5e, 0x28, 0xd9, 0xbf, 0xab, 0x84, 0x17, 0xe9, 0x50, 0x91, + 0x3e, 0xbb, 0x85, 0xa1, 0x2f, 0xa0, 0x14, 0x50, 0xc6, 0x1c, 0xaa, 0xd4, 0x14, 0x84, 0x9a, 0x07, + 0x89, 0x33, 0x0d, 0x17, 0x87, 0x1a, 0x8a, 0xc1, 0xfa, 0x13, 0x1d, 0xc3, 0xb6, 0x63, 0xbb, 0xd7, + 0x71, 0x33, 0x40, 0x8c, 0xaf, 0xc5, 0xc6, 0xf7, 0x6c, 0xf7, 0x3a, 0x6e, 0x43, 0xd9, 0x89, 0x03, + 0xcd, 0x2f, 0xa1, 0x10, 0xed, 0x12, 0x2a, 0xc2, 0xd6, 0x79, 0xff, 0x65, 0x7f, 0xf0, 0x6d, 0x5f, + 0x7f, 0x07, 0xe5, 0x21, 0x33, 0x32, 0xfa, 0x5d, 0x5d, 0xe3, 0x30, 0x36, 0x3a, 0x86, 0x79, 0x61, + 0xe8, 0x29, 0xfe, 0x71, 0x32, 0xc0, 0xdf, 0xb6, 0x71, 0x57, 0x4f, 0x1f, 0x6f, 0x41, 0x56, 0xcc, + 0xdb, 0xfc, 0xb3, 0x06, 0x79, 0xe1, 0x41, 0x77, 0xe6, 0xa1, 0xff, 0x87, 0x28, 0xb8, 0x44, 0x71, + 0xe3, 0x0d, 0x57, 0x44, 0x5d, 0x19, 0x47, 0x01, 0x33, 0x56, 0x38, 0x27, 0x47, 0xa1, 0x11, 0x91, + 0x53, 0x92, 0x1c, 0x0a, 0x22, 0xf2, 0xd3, 0x98, 0xe6, 0x44, 0xc9, 0xc9, 0xe0, 0xed, 0x50, 0x10, + 0x56, 0xd8, 0xf8, 0xd9, 0x36, 0x51, 0x89, 0x63, 0x67, 0x5b, 0xc5, 0x6d, 0xfe, 0x1c, 0x4a, 0x71, + 0x9f, 0xa3, 0x27, 0x90, 0xb1, 0xdd, 0x99, 0xa7, 0x12, 0xb1, 0x7a, 0x2b, 0xb8, 0xf8, 0x22, 0xb1, + 0x20, 0x34, 0x11, 0xe8, 0xb7, 0xfd, 0xdc, 0x2c, 0x43, 0x31, 0xe6, 0xb4, 0xe6, 0xdf, 0x34, 0x28, + 0x27, 0x9c, 0xf0, 0x1f, 0x6b, 0x47, 0x5f, 0x41, 0xe9, 0xb5, 0xed, 0x53, 0x12, 0x6f, 0xff, 0x95, + 0xa3, 0x7a, 0xb2, 0xfd, 0x87, 0xff, 0x77, 0xbc, 0x29, 0xc5, 0x45, 0xce, 0x57, 0x00, 0xfa, 0x25, + 0x54, 0xd4, 0x48, 0x32, 0xa5, 0xcc, 0xb2, 0x1d, 0xb1, 0x55, 0x95, 0x44, 0x78, 0x28, 0x6e, 0x57, + 0xc8, 0x71, 0x79, 0x16, 0xff, 0x44, 0x1f, 0xaf, 0x15, 0x04, 0xcc, 0xb7, 0xdd, 0x2b, 0xb1, 0x7f, + 0x85, 0x88, 0x36, 0x12, 0x20, 0x6f, 0xe4, 0x65, 0x75, 0x78, 0x1c, 0x31, 0x8b, 0xad, 0x02, 0xf4, + 0x29, 0x64, 0x03, 0x66, 0xa9, 0x4a, 0x56, 0x49, 0xe4, 0x56, 0x8c, 0x48, 0xb1, 0x64, 0x25, 0x4e, + 0x3f, 0xa9, 0x3b, 0xa7, 0x9f, 0x2c, 0xaf, 0x18, 0xb2, 0x8a, 0x16, 0x8f, 0x90, 0x5a, 0xfc, 0xe9, + 0xb8, 0xd7, 0x69, 0x33, 0x46, 0x17, 0x4b, 0x86, 0x25, 0x41, 0x75, 0xb7, 0xaf, 0x01, 0x3a, 0xb6, + 0x3f, 0x59, 0xd9, 0xec, 0x25, 0xbd, 0xe1, 0x3d, 0x2b, 0x2c, 0xd7, 0xb2, 0xec, 0xe5, 0x26, 0xb2, + 0x44, 0xef, 0xc1, 0x56, 0x58, 0x88, 0x64, 0x7d, 0xcb, 0xcd, 0x45, 0x01, 0x6a, 0xfe, 0x2b, 0x05, + 0xfb, 0xca, 0xa5, 0xd2, 0x1b, 0x8c, 0xfa, 0x13, 0xba, 0x8c, 0x8e, 0xc5, 0xcf, 0x61, 0x77, 0x5d, + 0x54, 0xe5, 0x44, 0x24, 0x3c, 0x6a, 0x17, 0x8f, 0xde, 0x8d, 0xad, 0x74, 0x6d, 0x06, 0x46, 0x51, + 0xb1, 0x5d, 0x9b, 0x76, 0x18, 0x53, 0x64, 0x2d, 0xbc, 0x95, 0xab, 0x42, 0x54, 0x56, 0x3c, 0xb4, + 0x0e, 0x67, 0x2e, 0x12, 0x11, 0xfd, 0x04, 0xa2, 0x20, 0x27, 0xf4, 0xc7, 0xa5, 0xed, 0xdf, 0x88, + 0xea, 0x57, 0x5e, 0x97, 0x5b, 0x43, 0xa0, 0x77, 0xce, 0xaa, 0xa9, 0xbb, 0x67, 0xd5, 0x2f, 0xa0, + 0x1e, 0x65, 0x87, 0xba, 0xc6, 0xd2, 0x69, 0xd4, 0xda, 0xb6, 0x84, 0x0d, 0x7b, 0x21, 0x03, 0x87, + 0x04, 0xd5, 0xdf, 0x0e, 0x61, 0x37, 0x96, 0x5a, 0x6b, 0xd3, 0x65, 0x26, 0xa2, 0x75, 0x76, 0xc5, + 0x4d, 0x8f, 0x46, 0x28, 0xd3, 0x33, 0xd2, 0xf4, 0x10, 0x96, 0xa6, 0x37, 0xff, 0xa2, 0xc1, 0xc3, + 0xcd, 0xdb, 0xaf, 0x9a, 0xe4, 0xff, 0x6c, 0xff, 0xbf, 0x80, 0x9c, 0x35, 0x61, 0xb6, 0xe7, 0xaa, + 0xb4, 0xfa, 0x30, 0x36, 0x14, 0xd3, 0xc0, 0x73, 0x5e, 0xd1, 0x53, 0xcf, 0x99, 0x2a, 0x63, 0xda, + 0x82, 0x8a, 0xd5, 0x90, 0x44, 0xc4, 0xa6, 0x93, 0x11, 0xfb, 0xf4, 0x77, 0x19, 0x28, 0x27, 0xd2, + 0x2a, 0x59, 0x57, 0xcb, 0x50, 0xe8, 0x0f, 0x48, 0xd7, 0x18, 0xb7, 0xcd, 0x9e, 0xae, 0x21, 0x1d, + 0x4a, 0x83, 0xbe, 0x39, 0xe8, 0x93, 0xae, 0xd1, 0x19, 0x74, 0x79, 0x85, 0x7d, 0x17, 0x76, 0x7a, + 0x66, 0xff, 0x25, 0xe9, 0x0f, 0xc6, 0xc4, 0xe8, 0x99, 0xcf, 0xcd, 0xe3, 0x9e, 0xa1, 0xa7, 0xd1, + 0x2e, 0xe8, 0x83, 0x3e, 0xe9, 0x9c, 0xb6, 0xcd, 0x3e, 0x19, 0x9b, 0x67, 0xc6, 0xe0, 0x7c, 0xac, + 0x67, 0x38, 0xca, 0x53, 0x81, 0x18, 0xdf, 0x75, 0x0c, 0xa3, 0x3b, 0x22, 0x67, 0xed, 0xef, 0xf4, + 0x2c, 0xaa, 0xc1, 0xae, 0xd9, 0x1f, 0x9d, 0x9f, 0x9c, 0x98, 0x1d, 0xd3, 0xe8, 0x8f, 0xc9, 0x71, + 0xbb, 0xd7, 0xee, 0x77, 0x0c, 0x3d, 0x87, 0x1e, 0x00, 0x32, 0xfb, 0x9d, 0xc1, 0xd9, 0xb0, 0x67, + 0x8c, 0x0d, 0x12, 0x56, 0xf2, 0x2d, 0x54, 0x85, 0x6d, 0xa1, 0xa7, 0xdd, 0xed, 0x92, 0x93, 0xb6, + 0xd9, 0x33, 0xba, 0x7a, 0x9e, 0x5b, 0xa2, 0x18, 0x23, 0xd2, 0x35, 0x47, 0xed, 0x63, 0x0e, 0x17, + 0xf8, 0x9c, 0x66, 0xff, 0x62, 0x60, 0x76, 0x0c, 0xd2, 0xe1, 0x6a, 0x39, 0x0a, 0x9c, 0x1c, 0xa2, + 0xe7, 0xfd, 0xae, 0x81, 0x87, 0x6d, 0xb3, 0xab, 0x17, 0xd1, 0x3e, 0xec, 0x85, 0xb0, 0xf1, 0xdd, + 0xd0, 0xc4, 0xdf, 0x93, 0xf1, 0x60, 0x40, 0x46, 0x83, 0x41, 0x5f, 0x2f, 0xc5, 0x35, 0xf1, 0xd5, + 0x0e, 0x86, 0x46, 0x5f, 0x2f, 0xa3, 0x3d, 0xa8, 0x9e, 0x0d, 0x87, 0x24, 0x94, 0x84, 0x8b, 0xad, + 0x70, 0x7a, 0xbb, 0xdb, 0xc5, 0xc6, 0x68, 0x44, 0xce, 0xcc, 0xd1, 0x59, 0x7b, 0xdc, 0x39, 0xd5, + 0xb7, 0xf9, 0x92, 0x46, 0xc6, 0x98, 0x8c, 0x07, 0xe3, 0x76, 0x6f, 0x8d, 0xeb, 0xdc, 0xa0, 0x35, + 0xce, 0x27, 0xed, 0x0d, 0xbe, 0xd5, 0x77, 0xf8, 0x86, 0x73, 0x78, 0x70, 0xa1, 0x4c, 0x44, 0x7c, + 0xed, 0xca, 0x3d, 0xe1, 0x9c, 0x7a, 0x95, 0x83, 0x66, 0xff, 0xa2, 0xdd, 0x33, 0xbb, 0xe4, 0xa5, + 0xf1, 0xbd, 0xe8, 0x84, 0xbb, 0x1c, 0x94, 0x96, 0x91, 0x21, 0x1e, 0x3c, 0xe7, 0x86, 0xe8, 0xef, + 0x22, 0x04, 0x95, 0x8e, 0x89, 0x3b, 0xe7, 0xbd, 0x36, 0x26, 0x78, 0x70, 0x3e, 0x36, 0xf4, 0x07, + 0x4f, 0xff, 0xa4, 0x41, 0x29, 0x5e, 0xe9, 0xb8, 0xd7, 0xcd, 0x3e, 0x39, 0xe9, 0x99, 0xcf, 0x4f, + 0xc7, 0x32, 0x08, 0x46, 0xe7, 0x1d, 0xee, 0x32, 0x83, 0x77, 0x58, 0x04, 0x15, 0xb9, 0xe9, 0xd1, + 0x62, 0x53, 0x7c, 0x2e, 0x85, 0xf5, 0x07, 0x4a, 0x6f, 0x9a, 0x1b, 0xaf, 0x40, 0x03, 0xe3, 0x01, + 0xd6, 0x33, 0xe8, 0x23, 0x68, 0x28, 0x84, 0xfb, 0x15, 0x63, 0xa3, 0x33, 0x26, 0xc3, 0xf6, 0xf7, + 0x67, 0xdc, 0xed, 0x32, 0xc8, 0x46, 0x7a, 0x16, 0xbd, 0x0f, 0xfb, 0x11, 0x6b, 0x53, 0x5c, 0x3c, + 0xfd, 0x12, 0x6a, 0xf7, 0x05, 0x3d, 0x02, 0xc8, 0x8d, 0x8c, 0xf1, 0xb8, 0x67, 0xc8, 0x53, 0xc1, + 0x89, 0x0c, 0x5c, 0x80, 0x1c, 0x36, 0x46, 0xe7, 0x67, 0x86, 0x9e, 0x3a, 0xfa, 0x6b, 0x1e, 0x72, + 0xe2, 0x98, 0xea, 0xa3, 0x5f, 0x41, 0x39, 0xf6, 0x0c, 0x73, 0x71, 0x84, 0x1e, 0xbd, 0xf1, 0x81, + 0xa6, 0x1e, 0x5e, 0x66, 0x15, 0x7c, 0xa8, 0xa1, 0x63, 0xa8, 0xc4, 0xdf, 0x23, 0x2e, 0x8e, 0x50, + 0xfc, 0x74, 0xb7, 0xe1, 0xa9, 0x62, 0x83, 0x8e, 0x97, 0xa0, 0x1b, 0x01, 0xb3, 0x17, 0xbc, 0xc9, + 0xa8, 0x17, 0x03, 0x54, 0x8f, 0x27, 0x78, 0xf2, 0x19, 0xa2, 0xbe, 0xbf, 0x51, 0xa6, 0x4a, 0xce, + 0x37, 0xbc, 0xa1, 0x47, 0x77, 0xf6, 0x3b, 0x0b, 0x4a, 0x3e, 0x14, 0xd4, 0xdf, 0xbb, 0x4f, 0xac, + 0xee, 0xd9, 0xe9, 0xdf, 0xa7, 0xf8, 0x1a, 0xcb, 0x31, 0xd9, 0x86, 0x5d, 0xba, 0xa5, 0x74, 0x43, + 0xdb, 0x43, 0x53, 0xa8, 0x6e, 0xb8, 0xcf, 0xa3, 0x8f, 0x93, 0x75, 0xec, 0x9e, 0xd7, 0x80, 0xfa, + 0xe3, 0xb7, 0xd1, 0xd4, 0xe2, 0xa7, 0x50, 0xdd, 0x70, 0xf1, 0x4f, 0xcc, 0x72, 0xff, 0xb3, 0x41, + 0x62, 0x96, 0x37, 0xbd, 0x1f, 0xfc, 0x00, 0xfa, 0xed, 0x7b, 0x22, 0x6a, 0xde, 0x1e, 0x7b, 0xf7, + 0xc2, 0x5a, 0xff, 0xf0, 0x8d, 0x1c, 0xa5, 0xdc, 0x04, 0x58, 0xdf, 0xb6, 0xd0, 0xc3, 0xd8, 0x90, + 0x3b, 0xb7, 0xc5, 0xfa, 0xa3, 0x7b, 0xa4, 0x4a, 0xd5, 0x18, 0xaa, 0x1b, 0xae, 0x5f, 0x89, 0xdd, + 0xb8, 0xff, 0x7a, 0x56, 0xdf, 0xdd, 0x74, 0x4b, 0x39, 0xd4, 0xd0, 0x99, 0x0c, 0xb0, 0xf0, 0x6d, + 0xf1, 0x2d, 0x19, 0x53, 0xdb, 0x7c, 0x9a, 0x5a, 0x05, 0x22, 0xb4, 0x0e, 0x35, 0x34, 0x80, 0x52, + 0x3c, 0x4b, 0xde, 0x9a, 0x3e, 0x6f, 0x55, 0x38, 0x83, 0xed, 0x44, 0x33, 0xf6, 0x7c, 0xf4, 0xe4, + 0xee, 0x4d, 0x67, 0x63, 0xbf, 0x4e, 0x44, 0xc0, 0x1b, 0xce, 0x55, 0x2d, 0xed, 0x50, 0x3b, 0xfe, + 0xec, 0xd7, 0xcf, 0xae, 0x6c, 0x36, 0x5f, 0x5d, 0x1e, 0x4c, 0xbc, 0xc5, 0x33, 0xf1, 0x74, 0xe8, + 0xda, 0xee, 0x95, 0x4b, 0xd9, 0x6b, 0xcf, 0xbf, 0x7e, 0xe6, 0xb8, 0xd3, 0x67, 0x22, 0x0d, 0x9e, + 0x45, 0x2a, 0x2f, 0x73, 0xe2, 0x2f, 0x07, 0x3f, 0xf9, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x35, + 0x38, 0x14, 0x00, 0x69, 0x18, 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 96349125..ef03b0fa 100644 --- a/lnrpc/routerrpc/router.proto +++ b/lnrpc/routerrpc/router.proto @@ -605,12 +605,24 @@ message ForwardHtlcInterceptRequest { */ CircuitKey incoming_circuit_key = 1; + // The incoming htlc amount. + uint64 incoming_amount_msat = 5; + + // The incoming htlc expiry. + uint32 incoming_expiry = 6; + /* The htlc payment hash. This value is not guaranteed to be unique per request. */ bytes payment_hash = 2; + // The requested outgoing channel id for this forwarded htlc. Because of + // non-strict forwarding, this isn't necessarily the channel over which the + // packet will be forwarded eventually. A different channel to the same peer + // may be selected as well. + uint64 outgoing_requested_chan_id = 7; + // The outgoing htlc amount. uint64 outgoing_amount_msat = 3; diff --git a/lnrpc/routerrpc/router.swagger.json b/lnrpc/routerrpc/router.swagger.json index ecdda083..16a0a0af 100644 --- a/lnrpc/routerrpc/router.swagger.json +++ b/lnrpc/routerrpc/router.swagger.json @@ -907,11 +907,26 @@ "$ref": "#/definitions/routerrpcCircuitKey", "description": "The key of this forwarded htlc. It defines the incoming channel id and\nthe index in this channel." }, + "incoming_amount_msat": { + "type": "string", + "format": "uint64", + "description": "The incoming htlc amount." + }, + "incoming_expiry": { + "type": "integer", + "format": "int64", + "description": "The incoming htlc expiry." + }, "payment_hash": { "type": "string", "format": "byte", "description": "The htlc payment hash. This value is not guaranteed to be unique per\nrequest." }, + "outgoing_requested_chan_id": { + "type": "string", + "format": "uint64", + "description": "The requested outgoing channel id for this forwarded htlc. Because of\nnon-strict forwarding, this isn't necessarily the channel over which the\npacket will be forwarded eventually. A different channel to the same peer\nmay be selected as well." + }, "outgoing_amount_msat": { "type": "string", "format": "uint64", diff --git a/lntest/itest/lnd_forward_interceptor_test.go b/lntest/itest/lnd_forward_interceptor_test.go index e36bda65..e85c18ac 100644 --- a/lntest/itest/lnd_forward_interceptor_test.go +++ b/lntest/itest/lnd_forward_interceptor_test.go @@ -16,6 +16,7 @@ import ( "github.com/lightningnetwork/lnd/lnrpc/routerrpc" "github.com/lightningnetwork/lnd/lntest" "github.com/lightningnetwork/lnd/routing/route" + "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -133,6 +134,21 @@ func testForwardInterceptor(net *lntest.NetworkHarness, t *harnessTest) { for i := 0; i < len(testCases); i++ { select { case request := <-interceptedChan: + // Assert sanity of informational packet data. + require.NotZero(t.t, request.OutgoingRequestedChanId) + require.NotZero(t.t, request.IncomingExpiry) + require.NotZero(t.t, request.IncomingAmountMsat) + + require.Less( + t.t, + request.OutgoingExpiry, request.IncomingExpiry, + ) + require.Less( + t.t, + request.OutgoingAmountMsat, + request.IncomingAmountMsat, + ) + testCase := testCases[i] // For held packets we ignore, keeping them in hold status.