From f6f8e3221bb95ffcf41e179143a5a1dcb1aede48 Mon Sep 17 00:00:00 2001
From: Joost Jager <joost.jager@gmail.com>
Date: Wed, 24 Jun 2020 11:23:51 +0200
Subject: [PATCH 1/5] routerrpc: clarify proto fields to be outgoing

---
 lnrpc/routerrpc/forward_interceptor.go |   6 +-
 lnrpc/routerrpc/router.pb.go           | 326 ++++++++++++-------------
 lnrpc/routerrpc/router.proto           |   8 +-
 lnrpc/routerrpc/router.swagger.json    |   8 +-
 4 files changed, 174 insertions(+), 174 deletions(-)

diff --git a/lnrpc/routerrpc/forward_interceptor.go b/lnrpc/routerrpc/forward_interceptor.go
index a3816263..6653ac5b 100644
--- a/lnrpc/routerrpc/forward_interceptor.go
+++ b/lnrpc/routerrpc/forward_interceptor.go
@@ -157,9 +157,9 @@ func (r *forwardInterceptor) holdAndForwardToClient(
 			ChanId: inKey.ChanID.ToUint64(),
 			HtlcId: inKey.HtlcID,
 		},
-		HtlcPaymentHash: htlc.PaymentHash[:],
-		AmountMsat:      uint64(htlc.Amount),
-		Expiry:          htlc.Expiry,
+		HtlcPaymentHash:    htlc.PaymentHash[:],
+		OutgoingAmountMsat: uint64(htlc.Amount),
+		OutgoingExpiry:     htlc.Expiry,
 	}
 
 	return r.stream.Send(interceptionRequest)
diff --git a/lnrpc/routerrpc/router.pb.go b/lnrpc/routerrpc/router.pb.go
index f1510fc3..de602e44 100644
--- a/lnrpc/routerrpc/router.pb.go
+++ b/lnrpc/routerrpc/router.pb.go
@@ -1813,10 +1813,10 @@ type ForwardHtlcInterceptRequest struct {
 	//The htlc payment hash. This value is not guaranteed to be unique per
 	//request.
 	HtlcPaymentHash []byte `protobuf:"bytes,2,opt,name=htlc_payment_hash,json=htlcPaymentHash,proto3" json:"htlc_payment_hash,omitempty"`
-	/// The htlc amount.
-	AmountMsat uint64 `protobuf:"varint,3,opt,name=amount_msat,json=amountMsat,proto3" json:"amount_msat,omitempty"`
-	/// The htlc expiry.
-	Expiry               uint32   `protobuf:"varint,4,opt,name=expiry,proto3" json:"expiry,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.
+	OutgoingExpiry       uint32   `protobuf:"varint,4,opt,name=outgoing_expiry,json=outgoingExpiry,proto3" json:"outgoing_expiry,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1861,16 +1861,16 @@ func (m *ForwardHtlcInterceptRequest) GetHtlcPaymentHash() []byte {
 	return nil
 }
 
-func (m *ForwardHtlcInterceptRequest) GetAmountMsat() uint64 {
+func (m *ForwardHtlcInterceptRequest) GetOutgoingAmountMsat() uint64 {
 	if m != nil {
-		return m.AmountMsat
+		return m.OutgoingAmountMsat
 	}
 	return 0
 }
 
-func (m *ForwardHtlcInterceptRequest) GetExpiry() uint32 {
+func (m *ForwardHtlcInterceptRequest) GetOutgoingExpiry() uint32 {
 	if m != nil {
-		return m.Expiry
+		return m.OutgoingExpiry
 	}
 	return 0
 }
@@ -1979,164 +1979,164 @@ func init() {
 func init() { proto.RegisterFile("routerrpc/router.proto", fileDescriptor_7a0613f69d37b0a5) }
 
 var fileDescriptor_7a0613f69d37b0a5 = []byte{
-	// 2499 bytes of a gzipped FileDescriptorProto
+	// 2509 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, 0x5a, 0x0e, 0x64, 0x0a, 0x7f, 0x50, 0xb2, 0xe1, 0xb5, 0x2d,
+	0xf1, 0xf7, 0xe2, 0x45, 0xa0, 0xf1, 0x5a, 0x0e, 0x68, 0x09, 0x7f, 0x50, 0xb2, 0xe1, 0xb5, 0x2d,
 	0xa1, 0xf4, 0xb7, 0x29, 0x99, 0x49, 0x25, 0xae, 0xf8, 0x91, 0x80, 0xc0, 0x52, 0x5c, 0x09, 0x04,
 	0xe0, 0x01, 0x48, 0xdb, 0xf1, 0x61, 0x6a, 0x09, 0x0c, 0x88, 0x0d, 0x17, 0xbb, 0xc8, 0xee, 0x40,
-	0x32, 0x8f, 0xb9, 0xa5, 0xf2, 0x45, 0x72, 0xcb, 0x27, 0xc8, 0x21, 0x87, 0xdc, 0xf2, 0x21, 0x72,
-	0xcd, 0x3d, 0x55, 0x39, 0xa7, 0xe6, 0xb1, 0xc0, 0x2e, 0x09, 0x4a, 0x49, 0x55, 0x2e, 0xe4, 0xce,
-	0xaf, 0x7b, 0x7a, 0xba, 0xa7, 0x5f, 0xd3, 0x80, 0xbd, 0xc0, 0x5f, 0x31, 0x1a, 0x04, 0xcb, 0xc9,
-	0x53, 0xf9, 0x75, 0xb0, 0x0c, 0x7c, 0xe6, 0xa3, 0xc2, 0x1a, 0x6f, 0x14, 0x82, 0xe5, 0x44, 0xa2,
-	0xc6, 0x3f, 0x73, 0x80, 0x46, 0xd4, 0x9b, 0x0e, 0xed, 0xeb, 0x05, 0xf5, 0x18, 0xa6, 0xbf, 0x5d,
-	0xd1, 0x90, 0x21, 0x04, 0x99, 0x29, 0x0d, 0x59, 0x5d, 0x6b, 0x6a, 0xad, 0x12, 0x16, 0xdf, 0x48,
-	0x87, 0xb4, 0xbd, 0x60, 0xf5, 0x54, 0x53, 0x6b, 0xa5, 0x31, 0xff, 0x44, 0xff, 0x07, 0x79, 0x7b,
-	0xc1, 0xc8, 0x22, 0xb4, 0x59, 0xbd, 0x24, 0xe0, 0x1d, 0x7b, 0xc1, 0x4e, 0x43, 0x9b, 0xa1, 0x0f,
-	0xa0, 0xb4, 0x94, 0x22, 0xc9, 0xdc, 0x0e, 0xe7, 0xf5, 0xb4, 0x10, 0x54, 0x54, 0xd8, 0x89, 0x1d,
-	0xce, 0x51, 0x0b, 0xf4, 0x99, 0xe3, 0xd9, 0x2e, 0x99, 0xb8, 0xec, 0x15, 0x99, 0x52, 0x97, 0xd9,
-	0xf5, 0x4c, 0x53, 0x6b, 0x65, 0x71, 0x45, 0xe0, 0x1d, 0x97, 0xbd, 0xea, 0x72, 0x14, 0x3d, 0x86,
-	0x6a, 0x24, 0x2c, 0x90, 0x0a, 0xd6, 0xb3, 0x4d, 0xad, 0x55, 0xc0, 0x95, 0x65, 0x52, 0xed, 0xc7,
-	0x50, 0x65, 0xce, 0x82, 0xfa, 0x2b, 0x46, 0x42, 0x3a, 0xf1, 0xbd, 0x69, 0x58, 0xcf, 0x49, 0x89,
-	0x0a, 0x1e, 0x49, 0x14, 0x19, 0x50, 0x9e, 0x51, 0x4a, 0x5c, 0x67, 0xe1, 0x30, 0xc2, 0xd5, 0xdf,
-	0x11, 0xea, 0x17, 0x67, 0x94, 0xf6, 0x38, 0x36, 0xb2, 0x19, 0xfa, 0x08, 0x2a, 0x1b, 0x1e, 0x61,
-	0x63, 0x59, 0x30, 0x95, 0x22, 0x26, 0x61, 0xe8, 0x01, 0xe8, 0xfe, 0x8a, 0x5d, 0xfa, 0x8e, 0x77,
-	0x49, 0x26, 0x73, 0xdb, 0x23, 0xce, 0xb4, 0x9e, 0x6f, 0x6a, 0xad, 0xcc, 0x51, 0xa6, 0xae, 0x3d,
-	0xd3, 0x70, 0x25, 0xa2, 0x76, 0xe6, 0xb6, 0x67, 0x4d, 0xd1, 0x13, 0xd8, 0xbd, 0xc9, 0x1f, 0xd6,
-	0x6b, 0xcd, 0x74, 0x2b, 0x83, 0xab, 0x49, 0xd6, 0x10, 0x3d, 0x82, 0xaa, 0x6b, 0x87, 0x8c, 0xcc,
-	0xfd, 0x25, 0x59, 0xae, 0x2e, 0xae, 0xe8, 0x75, 0xbd, 0x22, 0xee, 0xb1, 0xcc, 0xe1, 0x13, 0x7f,
-	0x39, 0x14, 0x20, 0x7a, 0x08, 0x20, 0xee, 0x50, 0xa8, 0x5a, 0x2f, 0x08, 0x8b, 0x0b, 0x1c, 0x11,
-	0x6a, 0xa2, 0xcf, 0xa0, 0x28, 0x7c, 0x4f, 0xe6, 0x8e, 0xc7, 0xc2, 0x3a, 0x34, 0xd3, 0xad, 0xe2,
-	0xa1, 0x7e, 0xe0, 0x7a, 0x3c, 0x0c, 0x30, 0xa7, 0x9c, 0x38, 0x1e, 0xc3, 0x10, 0x44, 0x9f, 0x21,
-	0x9a, 0x42, 0x8d, 0xfb, 0x9c, 0x4c, 0x56, 0x21, 0xf3, 0x17, 0x24, 0xa0, 0x13, 0x3f, 0x98, 0x86,
-	0xf5, 0xa2, 0xd8, 0xfa, 0xd3, 0x83, 0x75, 0x28, 0x1d, 0xdc, 0x8e, 0x9d, 0x83, 0x2e, 0x0d, 0x59,
-	0x47, 0xec, 0xc3, 0x72, 0x9b, 0xe9, 0xb1, 0xe0, 0x1a, 0xef, 0x4e, 0x6f, 0xe2, 0xe8, 0x13, 0x40,
-	0xb6, 0xeb, 0xfa, 0xaf, 0x49, 0x48, 0xdd, 0x19, 0x51, 0xbe, 0xac, 0x57, 0x9b, 0x5a, 0x2b, 0x8f,
-	0x75, 0x41, 0x19, 0x51, 0x77, 0xa6, 0xc4, 0xa3, 0x9f, 0x41, 0x59, 0xe8, 0x34, 0xa3, 0x36, 0x5b,
-	0x05, 0x34, 0xac, 0xeb, 0xcd, 0x74, 0xab, 0x72, 0xb8, 0xab, 0x0c, 0x39, 0x96, 0xf0, 0x91, 0xc3,
-	0x70, 0x89, 0xf3, 0xa9, 0x75, 0x88, 0xf6, 0xa1, 0xb0, 0xb0, 0x7f, 0x24, 0x4b, 0x3b, 0x60, 0x61,
-	0x7d, 0xb7, 0xa9, 0xb5, 0xca, 0x38, 0xbf, 0xb0, 0x7f, 0x1c, 0xf2, 0x35, 0x3a, 0x80, 0x9a, 0xe7,
-	0x13, 0xc7, 0x9b, 0xb9, 0xce, 0xe5, 0x9c, 0x91, 0xd5, 0x72, 0x6a, 0x33, 0x1a, 0xd6, 0x91, 0xd0,
-	0x61, 0xd7, 0xf3, 0x2d, 0x45, 0x39, 0x93, 0x84, 0x46, 0x17, 0xf6, 0xb6, 0xdb, 0xc7, 0xd3, 0x83,
-	0x3b, 0x88, 0x67, 0x4c, 0x06, 0xf3, 0x4f, 0x74, 0x0f, 0xb2, 0xaf, 0x6c, 0x77, 0x45, 0x45, 0xca,
-	0x94, 0xb0, 0x5c, 0xfc, 0x22, 0xf5, 0xb9, 0x66, 0xcc, 0xa1, 0x36, 0x0e, 0xec, 0xc9, 0xd5, 0x8d,
-	0xac, 0xbb, 0x99, 0x34, 0xda, 0xed, 0xa4, 0xb9, 0x43, 0xdf, 0xd4, 0x1d, 0xfa, 0x1a, 0x5f, 0x43,
-	0x55, 0x78, 0xf8, 0x98, 0xd2, 0x37, 0xe5, 0xf6, 0x7d, 0xe0, 0x99, 0x2b, 0x32, 0x41, 0xe6, 0x77,
-	0xce, 0x5e, 0xf0, 0x24, 0x30, 0xa6, 0xa0, 0x6f, 0xf6, 0x87, 0x4b, 0xdf, 0x0b, 0x29, 0x4f, 0x5c,
-	0x1e, 0x00, 0x3c, 0x82, 0x79, 0x82, 0x88, 0xd4, 0xd0, 0xc4, 0xae, 0x8a, 0xc2, 0x8f, 0x29, 0x15,
-	0xc9, 0xf1, 0x48, 0xe6, 0x23, 0x71, 0xfd, 0xc9, 0x15, 0xcf, 0x70, 0xfb, 0x5a, 0x89, 0x2f, 0x73,
-	0xb8, 0xe7, 0x4f, 0xae, 0xba, 0x1c, 0x34, 0x7e, 0x90, 0x45, 0x68, 0xec, 0x8b, 0xb3, 0xfe, 0x8b,
-	0xeb, 0x30, 0x20, 0x2b, 0x62, 0x51, 0x88, 0x2d, 0x1e, 0x96, 0xe2, 0x41, 0x8d, 0x25, 0xc9, 0xf8,
-	0x01, 0x6a, 0x09, 0xe1, 0xca, 0x8a, 0x06, 0xe4, 0x97, 0x01, 0x75, 0x16, 0xf6, 0x25, 0x55, 0x92,
-	0xd7, 0x6b, 0xd4, 0x82, 0x9d, 0x99, 0xed, 0xb8, 0xab, 0x20, 0x12, 0x5c, 0x89, 0x82, 0x4c, 0xa2,
-	0x38, 0x22, 0x1b, 0x0f, 0xa0, 0x81, 0x69, 0x48, 0xd9, 0xa9, 0x13, 0x86, 0x8e, 0xef, 0x75, 0x7c,
-	0x8f, 0x05, 0xbe, 0xab, 0x2c, 0x30, 0x1e, 0xc2, 0xfe, 0x56, 0xaa, 0x54, 0x81, 0x6f, 0xfe, 0x66,
-	0x45, 0x83, 0xeb, 0xed, 0x9b, 0xbf, 0x81, 0xfd, 0xad, 0x54, 0xa5, 0xff, 0x27, 0x90, 0x5d, 0xda,
-	0x4e, 0xc0, 0x7d, 0xcf, 0x93, 0x72, 0x2f, 0x96, 0x94, 0x43, 0xdb, 0x09, 0x4e, 0x9c, 0x90, 0xf9,
-	0xc1, 0x35, 0x96, 0x4c, 0x2f, 0x32, 0x79, 0x4d, 0x4f, 0x19, 0x7f, 0xd0, 0xa0, 0x18, 0x23, 0xf2,
-	0xd4, 0xf0, 0xfc, 0x29, 0x25, 0xb3, 0xc0, 0x5f, 0x44, 0x97, 0xc0, 0x81, 0xe3, 0xc0, 0x5f, 0xf0,
-	0x98, 0x10, 0x44, 0xe6, 0xab, 0x00, 0xce, 0xf1, 0xe5, 0xd8, 0x47, 0x9f, 0xc2, 0xce, 0x5c, 0x0a,
-	0x10, 0x65, 0xb3, 0x78, 0x58, 0xbb, 0x71, 0x76, 0xd7, 0x66, 0x36, 0x8e, 0x78, 0x5e, 0x64, 0xf2,
-	0x69, 0x3d, 0xf3, 0x22, 0x93, 0xcf, 0xe8, 0xd9, 0x17, 0x99, 0x7c, 0x56, 0xcf, 0xbd, 0xc8, 0xe4,
-	0x73, 0xfa, 0x8e, 0xf1, 0x0f, 0x0d, 0xf2, 0x11, 0x37, 0xd7, 0x84, 0x5f, 0x29, 0xe1, 0x71, 0xa1,
-	0x82, 0x29, 0xcf, 0x81, 0xb1, 0xb3, 0xa0, 0xa8, 0x09, 0x25, 0x41, 0x4c, 0x86, 0x28, 0x70, 0xac,
-	0x2d, 0xc2, 0x54, 0xd4, 0xf3, 0x88, 0x43, 0xc4, 0x63, 0x46, 0xd5, 0x73, 0xc9, 0x12, 0xb5, 0xa4,
-	0x70, 0x35, 0x99, 0xd0, 0x30, 0x94, 0xa7, 0x64, 0x25, 0x8b, 0xc2, 0xc4, 0x41, 0x8f, 0xa0, 0x1a,
-	0xb1, 0x44, 0x67, 0xe5, 0x64, 0xbc, 0x2a, 0x58, 0x1d, 0xd7, 0x02, 0x3d, 0xce, 0xb7, 0xd8, 0x74,
-	0x90, 0xca, 0x86, 0x91, 0x1f, 0x2a, 0x8d, 0x37, 0x7e, 0x03, 0xf7, 0x85, 0x2b, 0x87, 0x81, 0x7f,
-	0x61, 0x5f, 0x38, 0xae, 0xc3, 0xae, 0xa3, 0x20, 0xe7, 0x86, 0x07, 0xfe, 0x82, 0xf0, 0xbb, 0x8d,
-	0x5c, 0xc0, 0x81, 0xbe, 0x3f, 0xa5, 0xdc, 0x05, 0xcc, 0x97, 0x24, 0xe5, 0x02, 0xe6, 0x0b, 0x42,
-	0xbc, 0xf3, 0xa6, 0x13, 0x9d, 0xd7, 0xb8, 0x82, 0xfa, 0xed, 0xb3, 0x54, 0xcc, 0x34, 0xa1, 0xb8,
-	0xdc, 0xc0, 0xe2, 0x38, 0x0d, 0xc7, 0xa1, 0xb8, 0x6f, 0x53, 0x6f, 0xf7, 0xad, 0xf1, 0x47, 0x0d,
-	0x76, 0x8f, 0x56, 0x8e, 0x3b, 0x4d, 0x24, 0x6e, 0x5c, 0x3b, 0x2d, 0xf9, 0x2e, 0xd8, 0xd6, 0xf4,
-	0x53, 0x5b, 0x9b, 0xfe, 0x27, 0x5b, 0x1a, 0x6b, 0x5a, 0x34, 0xd6, 0xd4, 0x96, 0xb6, 0xfa, 0x3e,
-	0x14, 0x37, 0x5d, 0x32, 0xac, 0x67, 0x9a, 0xe9, 0x56, 0x09, 0xc3, 0x3c, 0x6a, 0x91, 0xa1, 0xf1,
-	0x39, 0xa0, 0xb8, 0xa2, 0xea, 0x42, 0xd6, 0xf5, 0x43, 0xbb, 0xbb, 0x7e, 0x3c, 0x80, 0xc6, 0x68,
-	0x75, 0x11, 0x4e, 0x02, 0xe7, 0x82, 0x9e, 0x30, 0x77, 0x62, 0xbe, 0xa2, 0x1e, 0x0b, 0xa3, 0x2c,
-	0xfd, 0x57, 0x06, 0x0a, 0x6b, 0x94, 0x97, 0x67, 0xc7, 0x9b, 0xf8, 0x8b, 0x48, 0x69, 0x8f, 0xba,
-	0x5c, 0x6f, 0xd9, 0x14, 0x76, 0x23, 0x52, 0x47, 0x52, 0xac, 0x29, 0xe7, 0x4f, 0x18, 0xa9, 0xf8,
-	0x53, 0x92, 0x3f, 0x6e, 0xa3, 0xe4, 0x6f, 0x81, 0xbe, 0x96, 0x3f, 0x67, 0xee, 0x64, 0x7d, 0x29,
-	0xb8, 0x12, 0xe1, 0x5c, 0x19, 0xc9, 0xb9, 0x96, 0x1c, 0x71, 0x66, 0x24, 0x67, 0x84, 0x2b, 0xce,
-	0x0f, 0xa0, 0xc4, 0xf3, 0x21, 0x64, 0xf6, 0x62, 0x49, 0xbc, 0x50, 0xe4, 0x45, 0x06, 0x17, 0xd7,
-	0x58, 0x3f, 0x44, 0x5f, 0x01, 0x50, 0x6e, 0x1f, 0x61, 0xd7, 0x4b, 0x2a, 0x52, 0xa2, 0x72, 0xf8,
-	0x5e, 0x2c, 0x30, 0xd6, 0x17, 0x70, 0x20, 0xfe, 0x8e, 0xaf, 0x97, 0x14, 0x17, 0x68, 0xf4, 0x89,
-	0xbe, 0x86, 0xf2, 0xcc, 0x0f, 0x5e, 0xdb, 0xc1, 0x94, 0x08, 0x50, 0x95, 0x8d, 0xfb, 0x31, 0x09,
-	0xc7, 0x92, 0x2e, 0xb6, 0x9f, 0xbc, 0x83, 0x4b, 0xb3, 0xd8, 0x1a, 0xbd, 0x04, 0x14, 0xed, 0x17,
-	0x59, 0x2e, 0x85, 0xe4, 0x85, 0x90, 0xfd, 0xdb, 0x42, 0x78, 0x91, 0x8e, 0x04, 0xe9, 0xb3, 0x1b,
-	0x18, 0xfa, 0x02, 0x4a, 0x21, 0x65, 0xcc, 0xa5, 0x4a, 0x4c, 0x41, 0x88, 0xd9, 0x4b, 0xbc, 0x69,
-	0x38, 0x39, 0x92, 0x50, 0x0c, 0x37, 0x4b, 0x74, 0x04, 0x55, 0xd7, 0xf1, 0xae, 0xe2, 0x6a, 0x80,
-	0xd8, 0x5f, 0x8f, 0xed, 0xef, 0x39, 0xde, 0x55, 0x5c, 0x87, 0xb2, 0x1b, 0x07, 0x8c, 0x2f, 0xa1,
-	0xb0, 0xbe, 0x25, 0x54, 0x84, 0x9d, 0xb3, 0xfe, 0xcb, 0xfe, 0xe0, 0xdb, 0xbe, 0xfe, 0x0e, 0xca,
-	0x43, 0x66, 0x64, 0xf6, 0xbb, 0xba, 0xc6, 0x61, 0x6c, 0x76, 0x4c, 0xeb, 0xdc, 0xd4, 0x53, 0x7c,
-	0x71, 0x3c, 0xc0, 0xdf, 0xb6, 0x71, 0x57, 0x4f, 0x1f, 0xed, 0x40, 0x56, 0x9c, 0x6b, 0xfc, 0x59,
-	0x83, 0xbc, 0xf0, 0xa0, 0x37, 0xf3, 0xd1, 0xff, 0xc3, 0x3a, 0xb8, 0x44, 0x71, 0xe3, 0x0d, 0x57,
-	0x44, 0x5d, 0x19, 0xaf, 0x03, 0x66, 0xac, 0x70, 0xce, 0xbc, 0x0e, 0x8d, 0x35, 0x73, 0x4a, 0x32,
-	0x47, 0x84, 0x35, 0xf3, 0x93, 0x98, 0xe4, 0x44, 0xc9, 0xc9, 0xe0, 0x6a, 0x44, 0x88, 0x2a, 0x6c,
-	0xfc, 0x6d, 0x9b, 0xa8, 0xc4, 0xb1, 0xb7, 0xad, 0xe2, 0x35, 0x7e, 0x0e, 0xa5, 0xb8, 0xcf, 0xd1,
-	0x63, 0xc8, 0x38, 0xde, 0xcc, 0x57, 0x89, 0x58, 0xbb, 0x11, 0x5c, 0xdc, 0x48, 0x2c, 0x18, 0x0c,
-	0x04, 0xfa, 0x4d, 0x3f, 0x1b, 0x65, 0x28, 0xc6, 0x9c, 0x66, 0xfc, 0x5d, 0x83, 0x72, 0xc2, 0x09,
-	0xff, 0xb1, 0x74, 0xf4, 0x15, 0x94, 0x5e, 0x3b, 0x01, 0x25, 0xf1, 0xf6, 0x5f, 0x39, 0x6c, 0x24,
-	0xdb, 0x7f, 0xf4, 0xbf, 0xe3, 0x4f, 0x29, 0x2e, 0x72, 0x7e, 0x05, 0xa0, 0x5f, 0x42, 0x45, 0xed,
-	0x24, 0x53, 0xca, 0x6c, 0xc7, 0x15, 0x57, 0x55, 0x49, 0x84, 0x87, 0xe2, 0xed, 0x0a, 0x3a, 0x2e,
-	0xcf, 0xe2, 0x4b, 0xf4, 0xf1, 0x46, 0x40, 0xc8, 0x02, 0xc7, 0xbb, 0x14, 0xf7, 0x57, 0x58, 0xb3,
-	0x8d, 0x04, 0xc8, 0x1b, 0x79, 0x59, 0x3d, 0x1e, 0x47, 0xcc, 0x66, 0xab, 0x10, 0x7d, 0x0a, 0xd9,
-	0x90, 0xd9, 0xaa, 0x92, 0x55, 0x12, 0xb9, 0x15, 0x63, 0xa4, 0x58, 0x72, 0x25, 0x5e, 0x3f, 0xa9,
-	0x5b, 0xaf, 0x9f, 0x2c, 0xaf, 0x18, 0xb2, 0x8a, 0x16, 0x0f, 0x91, 0x32, 0xfe, 0x64, 0xdc, 0xeb,
-	0xb4, 0x19, 0xa3, 0x8b, 0x25, 0xc3, 0x92, 0x41, 0x75, 0xb7, 0xaf, 0x01, 0x3a, 0x4e, 0x30, 0x59,
-	0x39, 0xec, 0x25, 0xbd, 0xe6, 0x3d, 0x2b, 0x2a, 0xd7, 0xb2, 0xec, 0xe5, 0x26, 0xb2, 0x44, 0xdf,
-	0x87, 0x9d, 0xa8, 0x10, 0xc9, 0xfa, 0x96, 0x9b, 0x8b, 0x02, 0x64, 0xfc, 0x4d, 0x83, 0x7d, 0xe5,
-	0x52, 0xe9, 0x0d, 0x46, 0x83, 0x09, 0x5d, 0xae, 0x9f, 0xc5, 0xcf, 0xe1, 0xde, 0xa6, 0xa8, 0xca,
-	0x83, 0x48, 0xf4, 0xd4, 0x2e, 0x1e, 0xbe, 0x1b, 0xb3, 0x74, 0xa3, 0x06, 0x46, 0xeb, 0x62, 0xbb,
-	0x51, 0xed, 0x09, 0xec, 0x0a, 0x0d, 0x12, 0xaf, 0x4a, 0x69, 0x7d, 0x95, 0x13, 0x86, 0xb1, 0x97,
-	0xe5, 0xfb, 0x50, 0xb4, 0x17, 0xfe, 0xca, 0x4b, 0x44, 0x3c, 0x48, 0x48, 0x04, 0xfb, 0x1e, 0xe4,
-	0xe8, 0x8f, 0x4b, 0x27, 0xb8, 0x16, 0x1e, 0x2a, 0x63, 0xb5, 0x32, 0xfe, 0xa2, 0xc1, 0x83, 0xed,
-	0xd6, 0xa8, 0x9e, 0xf3, 0x3f, 0x33, 0xe7, 0x0b, 0xc8, 0xd9, 0x13, 0xe6, 0xf8, 0x9e, 0x8a, 0xd2,
-	0x0f, 0x63, 0x5b, 0x31, 0x0d, 0x7d, 0xf7, 0x15, 0x3d, 0xf1, 0xdd, 0xa9, 0x52, 0xa6, 0x2d, 0x58,
-	0xb1, 0xda, 0x92, 0x08, 0x80, 0x74, 0x32, 0x00, 0x9e, 0xfc, 0x2e, 0x03, 0xe5, 0x44, 0x94, 0x26,
-	0xcb, 0x54, 0x19, 0x0a, 0xfd, 0x01, 0xe9, 0x9a, 0xe3, 0xb6, 0xd5, 0xd3, 0x35, 0xa4, 0x43, 0x69,
-	0xd0, 0xb7, 0x06, 0x7d, 0xd2, 0x35, 0x3b, 0x83, 0x2e, 0x2f, 0x58, 0xef, 0xc2, 0x6e, 0xcf, 0xea,
-	0xbf, 0x24, 0xfd, 0xc1, 0x98, 0x98, 0x3d, 0xeb, 0xb9, 0x75, 0xd4, 0x33, 0xf5, 0x34, 0xba, 0x07,
-	0xfa, 0xa0, 0x4f, 0x3a, 0x27, 0x6d, 0xab, 0x4f, 0xc6, 0xd6, 0xa9, 0x39, 0x38, 0x1b, 0xeb, 0x19,
-	0x8e, 0xf2, 0xc8, 0x22, 0xe6, 0x77, 0x1d, 0xd3, 0xec, 0x8e, 0xc8, 0x69, 0xfb, 0x3b, 0x3d, 0x8b,
-	0xea, 0x70, 0xcf, 0xea, 0x8f, 0xce, 0x8e, 0x8f, 0xad, 0x8e, 0x65, 0xf6, 0xc7, 0xe4, 0xa8, 0xdd,
-	0x6b, 0xf7, 0x3b, 0xa6, 0x9e, 0x43, 0x7b, 0x80, 0xac, 0x7e, 0x67, 0x70, 0x3a, 0xec, 0x99, 0x63,
-	0x93, 0x44, 0x85, 0x71, 0x07, 0xd5, 0xa0, 0x2a, 0xe4, 0xb4, 0xbb, 0x5d, 0x72, 0xdc, 0xb6, 0x7a,
-	0x66, 0x57, 0xcf, 0x73, 0x4d, 0x14, 0xc7, 0x88, 0x74, 0xad, 0x51, 0xfb, 0x88, 0xc3, 0x05, 0x7e,
-	0xa6, 0xd5, 0x3f, 0x1f, 0x58, 0x1d, 0x93, 0x74, 0xb8, 0x58, 0x8e, 0x02, 0x67, 0x8e, 0xd0, 0xb3,
-	0x7e, 0xd7, 0xc4, 0xc3, 0xb6, 0xd5, 0xd5, 0x8b, 0x68, 0x1f, 0xee, 0x47, 0xb0, 0xf9, 0xdd, 0xd0,
-	0xc2, 0xdf, 0x93, 0xf1, 0x60, 0x40, 0x46, 0x83, 0x41, 0x5f, 0x2f, 0xc5, 0x25, 0x71, 0x6b, 0x07,
-	0x43, 0xb3, 0xaf, 0x97, 0xd1, 0x7d, 0xa8, 0x9d, 0x0e, 0x87, 0x24, 0xa2, 0x44, 0xc6, 0x56, 0x38,
-	0x7b, 0xbb, 0xdb, 0xc5, 0xe6, 0x68, 0x44, 0x4e, 0xad, 0xd1, 0x69, 0x7b, 0xdc, 0x39, 0xd1, 0xab,
-	0xdc, 0xa4, 0x91, 0x39, 0x26, 0xe3, 0xc1, 0xb8, 0xdd, 0xdb, 0xe0, 0x3a, 0x57, 0x68, 0x83, 0xf3,
-	0x43, 0x7b, 0x83, 0x6f, 0xf5, 0x5d, 0x7e, 0xe1, 0x1c, 0x1e, 0x9c, 0x2b, 0x15, 0x11, 0xb7, 0x5d,
-	0xb9, 0x27, 0x3a, 0x53, 0xaf, 0x71, 0xd0, 0xea, 0x9f, 0xb7, 0x7b, 0x56, 0x97, 0xbc, 0x34, 0xbf,
-	0x17, 0x8d, 0xe5, 0x1e, 0x07, 0xa5, 0x66, 0x64, 0x88, 0x07, 0xcf, 0xb9, 0x22, 0xfa, 0xbb, 0x08,
-	0x41, 0xa5, 0x63, 0xe1, 0xce, 0x59, 0xaf, 0x8d, 0x09, 0x1e, 0x9c, 0x8d, 0x4d, 0x7d, 0xef, 0xc9,
-	0x9f, 0x34, 0x28, 0xc5, 0x0b, 0x07, 0xf7, 0xba, 0xd5, 0x27, 0xc7, 0x3d, 0xeb, 0xf9, 0xc9, 0x58,
-	0x06, 0xc1, 0xe8, 0xac, 0xc3, 0x5d, 0x66, 0xf2, 0x86, 0x85, 0xa0, 0x22, 0x2f, 0x7d, 0x6d, 0x6c,
-	0x8a, 0x9f, 0xa5, 0xb0, 0xfe, 0x40, 0xc9, 0x4d, 0x73, 0xe5, 0x15, 0x68, 0x62, 0x3c, 0xc0, 0x7a,
-	0x06, 0x7d, 0x04, 0x4d, 0x85, 0x70, 0xbf, 0x62, 0x6c, 0x76, 0xc6, 0x64, 0xd8, 0xfe, 0xfe, 0x94,
-	0xbb, 0x5d, 0x06, 0xd9, 0x48, 0xcf, 0xa2, 0xf7, 0x61, 0x7f, 0xcd, 0xb5, 0x2d, 0x2e, 0x9e, 0x7c,
-	0x09, 0xf5, 0xbb, 0x82, 0x1e, 0x01, 0xe4, 0x46, 0xe6, 0x78, 0xdc, 0x33, 0x65, 0x93, 0x3d, 0x96,
-	0x81, 0x0b, 0x90, 0xc3, 0xe6, 0xe8, 0xec, 0xd4, 0xd4, 0x53, 0x87, 0x7f, 0xcd, 0x43, 0x4e, 0xbc,
-	0xfa, 0x02, 0xf4, 0x2b, 0x28, 0xc7, 0x7e, 0xd5, 0x38, 0x3f, 0x44, 0x0f, 0xdf, 0xf8, 0x7b, 0x47,
-	0x23, 0x9a, 0x0d, 0x15, 0xfc, 0x4c, 0x43, 0x47, 0x50, 0x89, 0x8f, 0xf7, 0xe7, 0x87, 0x28, 0xfe,
-	0x58, 0xda, 0x32, 0xf9, 0x6f, 0x91, 0xf1, 0x12, 0x74, 0x33, 0x64, 0xce, 0x82, 0xd7, 0x6c, 0x35,
-	0x80, 0xa3, 0x46, 0x3c, 0xc1, 0x93, 0x53, 0x7d, 0x63, 0x7f, 0x2b, 0x4d, 0x95, 0x9c, 0x6f, 0x78,
-	0x7f, 0x5c, 0x8f, 0xc0, 0xb7, 0x0c, 0x4a, 0xce, 0xdd, 0x8d, 0xf7, 0xee, 0x22, 0xab, 0xb1, 0x35,
-	0xfd, 0xfb, 0x14, 0xb7, 0xb1, 0x1c, 0xa3, 0x6d, 0xb9, 0xa5, 0x1b, 0x42, 0xb7, 0x74, 0x11, 0x34,
-	0x85, 0xda, 0x96, 0xf1, 0x18, 0x7d, 0x9c, 0xac, 0x63, 0x77, 0x0c, 0xd7, 0x8d, 0x47, 0x6f, 0x63,
-	0x53, 0xc6, 0x4f, 0xa1, 0xb6, 0x65, 0x8e, 0x4e, 0x9c, 0x72, 0xf7, 0x14, 0x9e, 0x38, 0xe5, 0x4d,
-	0xe3, 0xf8, 0x0f, 0xa0, 0xdf, 0x1c, 0xbb, 0x90, 0x71, 0x73, 0xef, 0xed, 0xf9, 0xaf, 0xf1, 0xe1,
-	0x1b, 0x79, 0x94, 0x70, 0x0b, 0x60, 0x33, 0xbc, 0xa0, 0x07, 0xb1, 0x2d, 0xb7, 0x86, 0xaf, 0xc6,
-	0xc3, 0x3b, 0xa8, 0x4a, 0xd4, 0x18, 0x6a, 0x5b, 0xa6, 0x99, 0xc4, 0x6d, 0xdc, 0x3d, 0xed, 0x34,
-	0xee, 0x6d, 0x7b, 0xf4, 0x3f, 0xd3, 0xd0, 0xa9, 0x0c, 0xb0, 0xe8, 0xa7, 0xba, 0xb7, 0x64, 0x4c,
-	0x7d, 0xfb, 0xe3, 0x64, 0x15, 0x8a, 0xd0, 0x7a, 0xa6, 0xa1, 0x01, 0x94, 0xe2, 0x59, 0xf2, 0xd6,
-	0xf4, 0x79, 0xab, 0xc0, 0x19, 0x54, 0x13, 0xcd, 0xd8, 0x0f, 0xd0, 0xe3, 0xdb, 0x83, 0xc3, 0xd6,
-	0x7e, 0x9d, 0x88, 0x80, 0x37, 0x3c, 0x53, 0x5a, 0xda, 0x33, 0xed, 0xe8, 0xb3, 0x5f, 0x3f, 0xbd,
-	0x74, 0xd8, 0x7c, 0x75, 0x71, 0x30, 0xf1, 0x17, 0x4f, 0xc5, 0x2f, 0x71, 0x9e, 0xe3, 0x5d, 0x7a,
-	0x94, 0xbd, 0xf6, 0x83, 0xab, 0xa7, 0xae, 0x37, 0x7d, 0x2a, 0xd2, 0xe0, 0xe9, 0x5a, 0xe4, 0x45,
-	0x4e, 0xfc, 0x10, 0xff, 0x93, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x33, 0x56, 0x83, 0xe8, 0xb8,
-	0x17, 0x00, 0x00,
+	0x32, 0x8f, 0xb9, 0xa5, 0xf2, 0x45, 0x72, 0xcb, 0x27, 0xc8, 0x21, 0x87, 0x7c, 0x8f, 0x5c, 0x73,
+	0xc9, 0x29, 0x55, 0x39, 0xa7, 0xe6, 0xb1, 0xc0, 0x2e, 0x09, 0x4a, 0x49, 0x55, 0x2e, 0x12, 0xf7,
+	0xd7, 0x3d, 0x3d, 0xdd, 0xd3, 0xbf, 0xee, 0x9e, 0x01, 0xdc, 0x0b, 0xfc, 0x15, 0xa3, 0x41, 0xb0,
+	0x9c, 0x3c, 0x95, 0x7f, 0x1d, 0x2c, 0x03, 0x9f, 0xf9, 0xa8, 0xb0, 0xc6, 0x1b, 0x85, 0x60, 0x39,
+	0x91, 0xa8, 0xf1, 0xcf, 0x1c, 0xa0, 0x11, 0xf5, 0xa6, 0x43, 0xfb, 0x7a, 0x41, 0x3d, 0x86, 0xe9,
+	0x6f, 0x57, 0x34, 0x64, 0x08, 0x41, 0x66, 0x4a, 0x43, 0x56, 0xd7, 0x9a, 0x5a, 0xab, 0x84, 0xc5,
+	0xdf, 0x48, 0x87, 0xb4, 0xbd, 0x60, 0xf5, 0x54, 0x53, 0x6b, 0xa5, 0x31, 0xff, 0x13, 0xfd, 0x1f,
+	0xe4, 0xed, 0x05, 0x23, 0x8b, 0xd0, 0x66, 0xf5, 0x92, 0x80, 0x77, 0xec, 0x05, 0x3b, 0x0d, 0x6d,
+	0x86, 0x3e, 0x80, 0xd2, 0x52, 0x9a, 0x24, 0x73, 0x3b, 0x9c, 0xd7, 0xd3, 0xc2, 0x50, 0x51, 0x61,
+	0x27, 0x76, 0x38, 0x47, 0x2d, 0xd0, 0x67, 0x8e, 0x67, 0xbb, 0x64, 0xe2, 0xb2, 0x57, 0x64, 0x4a,
+	0x5d, 0x66, 0xd7, 0x33, 0x4d, 0xad, 0x95, 0xc5, 0x15, 0x81, 0x77, 0x5c, 0xf6, 0xaa, 0xcb, 0x51,
+	0xf4, 0x18, 0xaa, 0x91, 0xb1, 0x40, 0x3a, 0x58, 0xcf, 0x36, 0xb5, 0x56, 0x01, 0x57, 0x96, 0x49,
+	0xb7, 0x1f, 0x43, 0x95, 0x39, 0x0b, 0xea, 0xaf, 0x18, 0x09, 0xe9, 0xc4, 0xf7, 0xa6, 0x61, 0x3d,
+	0x27, 0x2d, 0x2a, 0x78, 0x24, 0x51, 0x64, 0x40, 0x79, 0x46, 0x29, 0x71, 0x9d, 0x85, 0xc3, 0x08,
+	0x77, 0x7f, 0x47, 0xb8, 0x5f, 0x9c, 0x51, 0xda, 0xe3, 0xd8, 0xc8, 0x66, 0xe8, 0x23, 0xa8, 0x6c,
+	0x74, 0x44, 0x8c, 0x65, 0xa1, 0x54, 0x8a, 0x94, 0x44, 0xa0, 0x07, 0xa0, 0xfb, 0x2b, 0x76, 0xe9,
+	0x3b, 0xde, 0x25, 0x99, 0xcc, 0x6d, 0x8f, 0x38, 0xd3, 0x7a, 0xbe, 0xa9, 0xb5, 0x32, 0x47, 0x99,
+	0xba, 0xf6, 0x4c, 0xc3, 0x95, 0x48, 0xda, 0x99, 0xdb, 0x9e, 0x35, 0x45, 0x4f, 0x60, 0xf7, 0xa6,
+	0x7e, 0x58, 0xaf, 0x35, 0xd3, 0xad, 0x0c, 0xae, 0x26, 0x55, 0x43, 0xf4, 0x08, 0xaa, 0xae, 0x1d,
+	0x32, 0x32, 0xf7, 0x97, 0x64, 0xb9, 0xba, 0xb8, 0xa2, 0xd7, 0xf5, 0x8a, 0x38, 0xc7, 0x32, 0x87,
+	0x4f, 0xfc, 0xe5, 0x50, 0x80, 0xe8, 0x21, 0x80, 0x38, 0x43, 0xe1, 0x6a, 0xbd, 0x20, 0x22, 0x2e,
+	0x70, 0x44, 0xb8, 0x89, 0x3e, 0x83, 0xa2, 0xc8, 0x3d, 0x99, 0x3b, 0x1e, 0x0b, 0xeb, 0xd0, 0x4c,
+	0xb7, 0x8a, 0x87, 0xfa, 0x81, 0xeb, 0x71, 0x1a, 0x60, 0x2e, 0x39, 0x71, 0x3c, 0x86, 0x21, 0x88,
+	0xfe, 0x0c, 0xd1, 0x14, 0x6a, 0x3c, 0xe7, 0x64, 0xb2, 0x0a, 0x99, 0xbf, 0x20, 0x01, 0x9d, 0xf8,
+	0xc1, 0x34, 0xac, 0x17, 0xc5, 0xd2, 0x9f, 0x1e, 0xac, 0xa9, 0x74, 0x70, 0x9b, 0x3b, 0x07, 0x5d,
+	0x1a, 0xb2, 0x8e, 0x58, 0x87, 0xe5, 0x32, 0xd3, 0x63, 0xc1, 0x35, 0xde, 0x9d, 0xde, 0xc4, 0xd1,
+	0x27, 0x80, 0x6c, 0xd7, 0xf5, 0x5f, 0x93, 0x90, 0xba, 0x33, 0xa2, 0x72, 0x59, 0xaf, 0x36, 0xb5,
+	0x56, 0x1e, 0xeb, 0x42, 0x32, 0xa2, 0xee, 0x4c, 0x99, 0x47, 0x3f, 0x83, 0xb2, 0xf0, 0x69, 0x46,
+	0x6d, 0xb6, 0x0a, 0x68, 0x58, 0xd7, 0x9b, 0xe9, 0x56, 0xe5, 0x70, 0x57, 0x05, 0x72, 0x2c, 0xe1,
+	0x23, 0x87, 0xe1, 0x12, 0xd7, 0x53, 0xdf, 0x21, 0xda, 0x87, 0xc2, 0xc2, 0xfe, 0x91, 0x2c, 0xed,
+	0x80, 0x85, 0xf5, 0xdd, 0xa6, 0xd6, 0x2a, 0xe3, 0xfc, 0xc2, 0xfe, 0x71, 0xc8, 0xbf, 0xd1, 0x01,
+	0xd4, 0x3c, 0x9f, 0x38, 0xde, 0xcc, 0x75, 0x2e, 0xe7, 0x8c, 0xac, 0x96, 0x53, 0x9b, 0xd1, 0xb0,
+	0x8e, 0x84, 0x0f, 0xbb, 0x9e, 0x6f, 0x29, 0xc9, 0x99, 0x14, 0x34, 0xba, 0x70, 0x6f, 0x7b, 0x7c,
+	0xbc, 0x3c, 0x78, 0x82, 0x78, 0xc5, 0x64, 0x30, 0xff, 0x13, 0xed, 0x41, 0xf6, 0x95, 0xed, 0xae,
+	0xa8, 0x28, 0x99, 0x12, 0x96, 0x1f, 0xbf, 0x48, 0x7d, 0xae, 0x19, 0x73, 0xa8, 0x8d, 0x03, 0x7b,
+	0x72, 0x75, 0xa3, 0xea, 0x6e, 0x16, 0x8d, 0x76, 0xbb, 0x68, 0xee, 0xf0, 0x37, 0x75, 0x87, 0xbf,
+	0xc6, 0xd7, 0x50, 0x15, 0x19, 0x3e, 0xa6, 0xf4, 0x4d, 0xb5, 0x7d, 0x1f, 0x78, 0xe5, 0x8a, 0x4a,
+	0x90, 0xf5, 0x9d, 0xb3, 0x17, 0xbc, 0x08, 0x8c, 0x29, 0xe8, 0x9b, 0xf5, 0xe1, 0xd2, 0xf7, 0x42,
+	0xca, 0x0b, 0x97, 0x13, 0x80, 0x33, 0x98, 0x17, 0x88, 0x28, 0x0d, 0x4d, 0xac, 0xaa, 0x28, 0xfc,
+	0x98, 0x52, 0x51, 0x1c, 0x8f, 0x64, 0x3d, 0x12, 0xd7, 0x9f, 0x5c, 0xf1, 0x0a, 0xb7, 0xaf, 0x95,
+	0xf9, 0x32, 0x87, 0x7b, 0xfe, 0xe4, 0xaa, 0xcb, 0x41, 0xe3, 0x07, 0xd9, 0x84, 0xc6, 0xbe, 0xd8,
+	0xeb, 0xbf, 0x38, 0x0e, 0x03, 0xb2, 0x82, 0x8b, 0xc2, 0x6c, 0xf1, 0xb0, 0x14, 0x27, 0x35, 0x96,
+	0x22, 0xe3, 0x07, 0xa8, 0x25, 0x8c, 0xab, 0x28, 0x1a, 0x90, 0x5f, 0x06, 0xd4, 0x59, 0xd8, 0x97,
+	0x54, 0x59, 0x5e, 0x7f, 0xa3, 0x16, 0xec, 0xcc, 0x6c, 0xc7, 0x5d, 0x05, 0x91, 0xe1, 0x4a, 0x44,
+	0x32, 0x89, 0xe2, 0x48, 0x6c, 0x3c, 0x80, 0x06, 0xa6, 0x21, 0x65, 0xa7, 0x4e, 0x18, 0x3a, 0xbe,
+	0xd7, 0xf1, 0x3d, 0x16, 0xf8, 0xae, 0x8a, 0xc0, 0x78, 0x08, 0xfb, 0x5b, 0xa5, 0xd2, 0x05, 0xbe,
+	0xf8, 0x9b, 0x15, 0x0d, 0xae, 0xb7, 0x2f, 0xfe, 0x06, 0xf6, 0xb7, 0x4a, 0x95, 0xff, 0x9f, 0x40,
+	0x76, 0x69, 0x3b, 0x01, 0xcf, 0x3d, 0x2f, 0xca, 0x7b, 0xb1, 0xa2, 0x1c, 0xda, 0x4e, 0x70, 0xe2,
+	0x84, 0xcc, 0x0f, 0xae, 0xb1, 0x54, 0x7a, 0x91, 0xc9, 0x6b, 0x7a, 0xca, 0xf8, 0x83, 0x06, 0xc5,
+	0x98, 0x90, 0x97, 0x86, 0xe7, 0x4f, 0x29, 0x99, 0x05, 0xfe, 0x22, 0x3a, 0x04, 0x0e, 0x1c, 0x07,
+	0xfe, 0x82, 0x73, 0x42, 0x08, 0x99, 0xaf, 0x08, 0x9c, 0xe3, 0x9f, 0x63, 0x1f, 0x7d, 0x0a, 0x3b,
+	0x73, 0x69, 0x40, 0xb4, 0xcd, 0xe2, 0x61, 0xed, 0xc6, 0xde, 0x5d, 0x9b, 0xd9, 0x38, 0xd2, 0x79,
+	0x91, 0xc9, 0xa7, 0xf5, 0xcc, 0x8b, 0x4c, 0x3e, 0xa3, 0x67, 0x5f, 0x64, 0xf2, 0x59, 0x3d, 0xf7,
+	0x22, 0x93, 0xcf, 0xe9, 0x3b, 0xc6, 0xdf, 0x35, 0xc8, 0x47, 0xda, 0xdc, 0x13, 0x7e, 0xa4, 0x84,
+	0xf3, 0x42, 0x91, 0x29, 0xcf, 0x81, 0xb1, 0xb3, 0xa0, 0xa8, 0x09, 0x25, 0x21, 0x4c, 0x52, 0x14,
+	0x38, 0xd6, 0x16, 0x34, 0x15, 0xfd, 0x3c, 0xd2, 0x10, 0x7c, 0xcc, 0xa8, 0x7e, 0x2e, 0x55, 0xa2,
+	0x91, 0x14, 0xae, 0x26, 0x13, 0x1a, 0x86, 0x72, 0x97, 0xac, 0x54, 0x51, 0x98, 0xd8, 0xe8, 0x11,
+	0x54, 0x23, 0x95, 0x68, 0xaf, 0x9c, 0xe4, 0xab, 0x82, 0xd5, 0x76, 0x2d, 0xd0, 0xe3, 0x7a, 0x8b,
+	0xcd, 0x04, 0xa9, 0x6c, 0x14, 0xf9, 0xa6, 0x32, 0x78, 0xe3, 0x37, 0x70, 0x5f, 0xa4, 0x72, 0x18,
+	0xf8, 0x17, 0xf6, 0x85, 0xe3, 0x3a, 0xec, 0x3a, 0x22, 0x39, 0x0f, 0x3c, 0xf0, 0x17, 0x84, 0x9f,
+	0x6d, 0x94, 0x02, 0x0e, 0xf4, 0xfd, 0x29, 0xe5, 0x29, 0x60, 0xbe, 0x14, 0xa9, 0x14, 0x30, 0x5f,
+	0x08, 0xe2, 0x93, 0x37, 0x9d, 0x98, 0xbc, 0xc6, 0x15, 0xd4, 0x6f, 0xef, 0xa5, 0x38, 0xd3, 0x84,
+	0xe2, 0x72, 0x03, 0x8b, 0xed, 0x34, 0x1c, 0x87, 0xe2, 0xb9, 0x4d, 0xbd, 0x3d, 0xb7, 0xc6, 0x1f,
+	0x35, 0xd8, 0x3d, 0x5a, 0x39, 0xee, 0x34, 0x51, 0xb8, 0x71, 0xef, 0xb4, 0xe4, 0xbd, 0x60, 0xdb,
+	0xd0, 0x4f, 0x6d, 0x1d, 0xfa, 0x9f, 0x6c, 0x19, 0xac, 0x69, 0x31, 0x58, 0x53, 0x5b, 0xc6, 0xea,
+	0xfb, 0x50, 0xdc, 0x4c, 0xc9, 0xb0, 0x9e, 0x69, 0xa6, 0x5b, 0x25, 0x0c, 0xf3, 0x68, 0x44, 0x86,
+	0xc6, 0xe7, 0x80, 0xe2, 0x8e, 0xaa, 0x03, 0x59, 0xf7, 0x0f, 0xed, 0xee, 0xfe, 0xf1, 0x00, 0x1a,
+	0xa3, 0xd5, 0x45, 0x38, 0x09, 0x9c, 0x0b, 0x7a, 0xc2, 0xdc, 0x89, 0xf9, 0x8a, 0x7a, 0x2c, 0x8c,
+	0xaa, 0xf4, 0x5f, 0x19, 0x28, 0xac, 0x51, 0xde, 0x9e, 0x1d, 0x6f, 0xe2, 0x2f, 0x22, 0xa7, 0x3d,
+	0xea, 0x72, 0xbf, 0xe5, 0x50, 0xd8, 0x8d, 0x44, 0x1d, 0x29, 0xb1, 0xa6, 0x5c, 0x3f, 0x11, 0xa4,
+	0xd2, 0x4f, 0x49, 0xfd, 0x78, 0x8c, 0x52, 0xbf, 0x05, 0xfa, 0xda, 0xfe, 0x9c, 0xb9, 0x93, 0xf5,
+	0xa1, 0xe0, 0x4a, 0x84, 0x73, 0x67, 0xa4, 0xe6, 0xda, 0x72, 0xa4, 0x99, 0x91, 0x9a, 0x11, 0xae,
+	0x34, 0x3f, 0x80, 0x12, 0xaf, 0x87, 0x90, 0xd9, 0x8b, 0x25, 0xf1, 0x42, 0x51, 0x17, 0x19, 0x5c,
+	0x5c, 0x63, 0xfd, 0x10, 0x7d, 0x05, 0x40, 0x79, 0x7c, 0x84, 0x5d, 0x2f, 0xa9, 0x28, 0x89, 0xca,
+	0xe1, 0x7b, 0x31, 0x62, 0xac, 0x0f, 0xe0, 0x40, 0xfc, 0x3b, 0xbe, 0x5e, 0x52, 0x5c, 0xa0, 0xd1,
+	0x9f, 0xe8, 0x6b, 0x28, 0xcf, 0xfc, 0xe0, 0xb5, 0x1d, 0x4c, 0x89, 0x00, 0x55, 0xdb, 0xb8, 0x1f,
+	0xb3, 0x70, 0x2c, 0xe5, 0x62, 0xf9, 0xc9, 0x3b, 0xb8, 0x34, 0x8b, 0x7d, 0xa3, 0x97, 0x80, 0xa2,
+	0xf5, 0xa2, 0xca, 0xa5, 0x91, 0xbc, 0x30, 0xb2, 0x7f, 0xdb, 0x08, 0x6f, 0xd2, 0x91, 0x21, 0x7d,
+	0x76, 0x03, 0x43, 0x5f, 0x40, 0x29, 0xa4, 0x8c, 0xb9, 0x54, 0x99, 0x29, 0x08, 0x33, 0xf7, 0x12,
+	0x77, 0x1a, 0x2e, 0x8e, 0x2c, 0x14, 0xc3, 0xcd, 0x27, 0x3a, 0x82, 0xaa, 0xeb, 0x78, 0x57, 0x71,
+	0x37, 0x40, 0xac, 0xaf, 0xc7, 0xd6, 0xf7, 0x1c, 0xef, 0x2a, 0xee, 0x43, 0xd9, 0x8d, 0x03, 0xc6,
+	0x97, 0x50, 0x58, 0x9f, 0x12, 0x2a, 0xc2, 0xce, 0x59, 0xff, 0x65, 0x7f, 0xf0, 0x6d, 0x5f, 0x7f,
+	0x07, 0xe5, 0x21, 0x33, 0x32, 0xfb, 0x5d, 0x5d, 0xe3, 0x30, 0x36, 0x3b, 0xa6, 0x75, 0x6e, 0xea,
+	0x29, 0xfe, 0x71, 0x3c, 0xc0, 0xdf, 0xb6, 0x71, 0x57, 0x4f, 0x1f, 0xed, 0x40, 0x56, 0xec, 0x6b,
+	0xfc, 0x59, 0x83, 0xbc, 0xc8, 0xa0, 0x37, 0xf3, 0xd1, 0xff, 0xc3, 0x9a, 0x5c, 0xa2, 0xb9, 0xf1,
+	0x81, 0x2b, 0x58, 0x57, 0xc6, 0x6b, 0xc2, 0x8c, 0x15, 0xce, 0x95, 0xd7, 0xd4, 0x58, 0x2b, 0xa7,
+	0xa4, 0x72, 0x24, 0x58, 0x2b, 0x3f, 0x89, 0x59, 0x4e, 0xb4, 0x9c, 0x0c, 0xae, 0x46, 0x82, 0xa8,
+	0xc3, 0xc6, 0xef, 0xb6, 0x89, 0x4e, 0x1c, 0xbb, 0xdb, 0x2a, 0x5d, 0xe3, 0xe7, 0x50, 0x8a, 0xe7,
+	0x1c, 0x3d, 0x86, 0x8c, 0xe3, 0xcd, 0x7c, 0x55, 0x88, 0xb5, 0x1b, 0xe4, 0xe2, 0x41, 0x62, 0xa1,
+	0x60, 0x20, 0xd0, 0x6f, 0xe6, 0xd9, 0x28, 0x43, 0x31, 0x96, 0x34, 0xe3, 0x6f, 0x1a, 0x94, 0x13,
+	0x49, 0xf8, 0x8f, 0xad, 0xa3, 0xaf, 0xa0, 0xf4, 0xda, 0x09, 0x28, 0x89, 0x8f, 0xff, 0xca, 0x61,
+	0x23, 0x39, 0xfe, 0xa3, 0xff, 0x3b, 0xfe, 0x94, 0xe2, 0x22, 0xd7, 0x57, 0x00, 0xfa, 0x25, 0x54,
+	0xd4, 0x4a, 0x32, 0xa5, 0xcc, 0x76, 0x5c, 0x71, 0x54, 0x95, 0x04, 0x3d, 0x94, 0x6e, 0x57, 0xc8,
+	0x71, 0x79, 0x16, 0xff, 0x44, 0x1f, 0x6f, 0x0c, 0x84, 0x2c, 0x70, 0xbc, 0x4b, 0x71, 0x7e, 0x85,
+	0xb5, 0xda, 0x48, 0x80, 0x7c, 0x90, 0x97, 0xd5, 0xe5, 0x71, 0xc4, 0x6c, 0xb6, 0x0a, 0xd1, 0xa7,
+	0x90, 0x0d, 0x99, 0xad, 0x3a, 0x59, 0x25, 0x51, 0x5b, 0x31, 0x45, 0x8a, 0xa5, 0x56, 0xe2, 0xf6,
+	0x93, 0xba, 0x75, 0xfb, 0xc9, 0xf2, 0x8e, 0x21, 0xbb, 0x68, 0xf1, 0x10, 0xa9, 0xe0, 0x4f, 0xc6,
+	0xbd, 0x4e, 0x9b, 0x31, 0xba, 0x58, 0x32, 0x2c, 0x15, 0xd4, 0x74, 0xfb, 0x1a, 0xa0, 0xe3, 0x04,
+	0x93, 0x95, 0xc3, 0x5e, 0xd2, 0x6b, 0x3e, 0xb3, 0xa2, 0x76, 0x2d, 0xdb, 0x5e, 0x6e, 0x22, 0x5b,
+	0xf4, 0x7d, 0xd8, 0x89, 0x1a, 0x91, 0xec, 0x6f, 0xb9, 0xb9, 0x68, 0x40, 0xc6, 0x3f, 0x34, 0xd8,
+	0x57, 0x29, 0x95, 0xd9, 0x60, 0x34, 0x98, 0xd0, 0xe5, 0xfa, 0x5a, 0xfc, 0x1c, 0xf6, 0x36, 0x4d,
+	0x55, 0x6e, 0x44, 0xa2, 0xab, 0x76, 0xf1, 0xf0, 0xdd, 0x58, 0xa4, 0x1b, 0x37, 0x30, 0x5a, 0x37,
+	0xdb, 0x8d, 0x6b, 0x4f, 0x60, 0x57, 0x78, 0x90, 0xb8, 0x55, 0xca, 0xe8, 0xab, 0x5c, 0x30, 0x8c,
+	0xdd, 0x2c, 0x9f, 0xc1, 0x5e, 0x8c, 0xcb, 0xfe, 0xca, 0x4b, 0x50, 0x1f, 0x6d, 0xe8, 0xcc, 0x45,
+	0x82, 0xfd, 0x8f, 0x61, 0x4d, 0x72, 0x42, 0x7f, 0x5c, 0x3a, 0xc1, 0xb5, 0xc8, 0x5d, 0x79, 0xd3,
+	0x70, 0x4d, 0x81, 0x1a, 0x7f, 0xd1, 0xe0, 0xc1, 0xf6, 0x78, 0xd5, 0x54, 0xfa, 0x9f, 0x05, 0xfc,
+	0x05, 0xe4, 0xec, 0x09, 0x73, 0x7c, 0x4f, 0xf1, 0xf8, 0xc3, 0xd8, 0x52, 0x4c, 0x43, 0xdf, 0x7d,
+	0x45, 0x4f, 0x7c, 0x77, 0xaa, 0x9c, 0x69, 0x0b, 0x55, 0xac, 0x96, 0x24, 0x28, 0x92, 0x4e, 0x52,
+	0xe4, 0xc9, 0xef, 0x32, 0x50, 0x4e, 0xf0, 0x38, 0xd9, 0xc8, 0xca, 0x50, 0xe8, 0x0f, 0x48, 0xd7,
+	0x1c, 0xb7, 0xad, 0x9e, 0xae, 0x21, 0x1d, 0x4a, 0x83, 0xbe, 0x35, 0xe8, 0x93, 0xae, 0xd9, 0x19,
+	0x74, 0x79, 0x4b, 0x7b, 0x17, 0x76, 0x7b, 0x56, 0xff, 0x25, 0xe9, 0x0f, 0xc6, 0xc4, 0xec, 0x59,
+	0xcf, 0xad, 0xa3, 0x9e, 0xa9, 0xa7, 0xd1, 0x1e, 0xe8, 0x83, 0x3e, 0xe9, 0x9c, 0xb4, 0xad, 0x3e,
+	0x19, 0x5b, 0xa7, 0xe6, 0xe0, 0x6c, 0xac, 0x67, 0x38, 0xca, 0xb9, 0x47, 0xcc, 0xef, 0x3a, 0xa6,
+	0xd9, 0x1d, 0x91, 0xd3, 0xf6, 0x77, 0x7a, 0x16, 0xd5, 0x61, 0xcf, 0xea, 0x8f, 0xce, 0x8e, 0x8f,
+	0xad, 0x8e, 0x65, 0xf6, 0xc7, 0xe4, 0xa8, 0xdd, 0x6b, 0xf7, 0x3b, 0xa6, 0x9e, 0x43, 0xf7, 0x00,
+	0x59, 0xfd, 0xce, 0xe0, 0x74, 0xd8, 0x33, 0xc7, 0x26, 0x89, 0x5a, 0xe7, 0x0e, 0xaa, 0x41, 0x55,
+	0xd8, 0x69, 0x77, 0xbb, 0xe4, 0xb8, 0x6d, 0xf5, 0xcc, 0xae, 0x9e, 0xe7, 0x9e, 0x28, 0x8d, 0x11,
+	0xe9, 0x5a, 0xa3, 0xf6, 0x11, 0x87, 0x0b, 0x7c, 0x4f, 0xab, 0x7f, 0x3e, 0xb0, 0x3a, 0x26, 0xe9,
+	0x70, 0xb3, 0x1c, 0x05, 0xae, 0x1c, 0xa1, 0x67, 0xfd, 0xae, 0x89, 0x87, 0x6d, 0xab, 0xab, 0x17,
+	0xd1, 0x3e, 0xdc, 0x8f, 0x60, 0xf3, 0xbb, 0xa1, 0x85, 0xbf, 0x27, 0xe3, 0xc1, 0x80, 0x8c, 0x06,
+	0x83, 0xbe, 0x5e, 0x8a, 0x5b, 0xe2, 0xd1, 0x0e, 0x86, 0x66, 0x5f, 0x2f, 0xa3, 0xfb, 0x50, 0x3b,
+	0x1d, 0x0e, 0x49, 0x24, 0x89, 0x82, 0xad, 0x70, 0xf5, 0x76, 0xb7, 0x8b, 0xcd, 0xd1, 0x88, 0x9c,
+	0x5a, 0xa3, 0xd3, 0xf6, 0xb8, 0x73, 0xa2, 0x57, 0x79, 0x48, 0x23, 0x73, 0x4c, 0xc6, 0x83, 0x71,
+	0xbb, 0xb7, 0xc1, 0x75, 0xee, 0xd0, 0x06, 0xe7, 0x9b, 0xf6, 0x06, 0xdf, 0xea, 0xbb, 0xfc, 0xc0,
+	0x39, 0x3c, 0x38, 0x57, 0x2e, 0x22, 0x1e, 0xbb, 0x4a, 0x4f, 0xb4, 0xa7, 0x5e, 0xe3, 0xa0, 0xd5,
+	0x3f, 0x6f, 0xf7, 0xac, 0x2e, 0x79, 0x69, 0x7e, 0x2f, 0x46, 0xcf, 0x1e, 0x07, 0xa5, 0x67, 0x64,
+	0x88, 0x07, 0xcf, 0xb9, 0x23, 0xfa, 0xbb, 0x08, 0x41, 0xa5, 0x63, 0xe1, 0xce, 0x59, 0xaf, 0x8d,
+	0x09, 0x1e, 0x9c, 0x8d, 0x4d, 0xfd, 0xde, 0x93, 0x3f, 0x69, 0x50, 0x8a, 0xb7, 0x16, 0x9e, 0x75,
+	0xab, 0x4f, 0x8e, 0x7b, 0xd6, 0xf3, 0x93, 0xb1, 0x24, 0xc1, 0xe8, 0xac, 0xc3, 0x53, 0x66, 0xf2,
+	0x91, 0x86, 0xa0, 0x22, 0x0f, 0x7d, 0x1d, 0x6c, 0x8a, 0xef, 0xa5, 0xb0, 0xfe, 0x40, 0xd9, 0x4d,
+	0x73, 0xe7, 0x15, 0x68, 0x62, 0x3c, 0xc0, 0x7a, 0x06, 0x7d, 0x04, 0x4d, 0x85, 0xf0, 0xbc, 0x62,
+	0x6c, 0x76, 0xc6, 0x64, 0xd8, 0xfe, 0xfe, 0x94, 0xa7, 0x5d, 0x92, 0x6c, 0xa4, 0x67, 0xd1, 0xfb,
+	0xb0, 0xbf, 0xd6, 0xda, 0xc6, 0x8b, 0x27, 0x5f, 0x42, 0xfd, 0x2e, 0xd2, 0x23, 0x80, 0xdc, 0xc8,
+	0x1c, 0x8f, 0x7b, 0xa6, 0x1c, 0xc3, 0xc7, 0x92, 0xb8, 0x00, 0x39, 0x6c, 0x8e, 0xce, 0x4e, 0x4d,
+	0x3d, 0x75, 0xf8, 0xd7, 0x3c, 0xe4, 0xc4, 0xbd, 0x30, 0x40, 0xbf, 0x82, 0x72, 0xec, 0x77, 0x8f,
+	0xf3, 0x43, 0xf4, 0xf0, 0x8d, 0xbf, 0x88, 0x34, 0xa2, 0xd7, 0xa3, 0x82, 0x9f, 0x69, 0xe8, 0x08,
+	0x2a, 0xf1, 0x1f, 0x00, 0xce, 0x0f, 0x51, 0xfc, 0x3a, 0xb5, 0xe5, 0xb7, 0x81, 0x2d, 0x36, 0x5e,
+	0x82, 0x6e, 0x86, 0xcc, 0x59, 0xf0, 0xae, 0xae, 0x9e, 0xe8, 0xa8, 0x11, 0x2f, 0xf0, 0xe4, 0xbb,
+	0xbf, 0xb1, 0xbf, 0x55, 0xa6, 0x5a, 0xce, 0x37, 0x7c, 0x82, 0xae, 0x1f, 0xc9, 0xb7, 0x02, 0x4a,
+	0xbe, 0xcc, 0x1b, 0xef, 0xdd, 0x25, 0x56, 0x0f, 0xdb, 0xf4, 0xef, 0x53, 0x3c, 0xc6, 0x72, 0x4c,
+	0xb6, 0xe5, 0x94, 0x6e, 0x18, 0xdd, 0x32, 0x67, 0xd0, 0x14, 0x6a, 0x5b, 0x1e, 0xd0, 0xe8, 0xe3,
+	0x64, 0x1f, 0xbb, 0xe3, 0xf9, 0xdd, 0x78, 0xf4, 0x36, 0x35, 0x15, 0xfc, 0x14, 0x6a, 0x5b, 0x5e,
+	0xda, 0x89, 0x5d, 0xee, 0x7e, 0xa7, 0x27, 0x76, 0x79, 0xd3, 0x83, 0xfd, 0x07, 0xd0, 0x6f, 0x3e,
+	0xcc, 0x90, 0x71, 0x73, 0xed, 0xed, 0x17, 0x62, 0xe3, 0xc3, 0x37, 0xea, 0x28, 0xe3, 0x16, 0xc0,
+	0xe6, 0x79, 0x83, 0x1e, 0xc4, 0x96, 0xdc, 0x7a, 0x9e, 0x35, 0x1e, 0xde, 0x21, 0x55, 0xa6, 0xc6,
+	0x50, 0xdb, 0xf2, 0xde, 0x49, 0x9c, 0xc6, 0xdd, 0xef, 0xa1, 0xc6, 0xde, 0xb6, 0x67, 0xc1, 0x33,
+	0x0d, 0x9d, 0x4a, 0x82, 0x45, 0x3f, 0xe6, 0xbd, 0xa5, 0x62, 0xea, 0xdb, 0xaf, 0x2f, 0xab, 0x50,
+	0x50, 0xeb, 0x99, 0x86, 0x06, 0x50, 0x8a, 0x57, 0xc9, 0x5b, 0xcb, 0xe7, 0xad, 0x06, 0x67, 0x50,
+	0x4d, 0x0c, 0x63, 0x3f, 0x40, 0x8f, 0x6f, 0x3f, 0x2d, 0xb6, 0xce, 0xeb, 0x04, 0x03, 0xde, 0x70,
+	0x91, 0x69, 0x69, 0xcf, 0xb4, 0xa3, 0xcf, 0x7e, 0xfd, 0xf4, 0xd2, 0x61, 0xf3, 0xd5, 0xc5, 0xc1,
+	0xc4, 0x5f, 0x3c, 0x15, 0xbf, 0xd5, 0x79, 0x8e, 0x77, 0xe9, 0x51, 0xf6, 0xda, 0x0f, 0xae, 0x9e,
+	0xba, 0xde, 0xf4, 0xa9, 0x28, 0x83, 0xa7, 0x6b, 0x93, 0x17, 0x39, 0xf1, 0x53, 0xfd, 0x4f, 0xfe,
+	0x1d, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x89, 0xaa, 0x2b, 0xda, 0x17, 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 fd61b887..3ee4b495 100644
--- a/lnrpc/routerrpc/router.proto
+++ b/lnrpc/routerrpc/router.proto
@@ -611,11 +611,11 @@ message ForwardHtlcInterceptRequest {
     */
     bytes htlc_payment_hash = 2;
 
-    /// The htlc amount.
-    uint64 amount_msat = 3;
+    // The outgoing htlc amount.
+    uint64 outgoing_amount_msat = 3;
 
-    /// The htlc expiry.
-    uint32 expiry = 4;
+    // The outgoing htlc expiry.
+    uint32 outgoing_expiry = 4;
 }
 
 /**
diff --git a/lnrpc/routerrpc/router.swagger.json b/lnrpc/routerrpc/router.swagger.json
index d4c9be16..701cc932 100644
--- a/lnrpc/routerrpc/router.swagger.json
+++ b/lnrpc/routerrpc/router.swagger.json
@@ -912,15 +912,15 @@
           "format": "byte",
           "description": "The htlc payment hash. This value is not guaranteed to be unique per\nrequest."
         },
-        "amount_msat": {
+        "outgoing_amount_msat": {
           "type": "string",
           "format": "uint64",
-          "description": "/ The htlc amount."
+          "description": "The outgoing htlc amount."
         },
-        "expiry": {
+        "outgoing_expiry": {
           "type": "integer",
           "format": "int64",
-          "description": "/ The htlc expiry."
+          "description": "The outgoing htlc expiry."
         }
       }
     },

From 607927634d4ddb61f2eca24ef4bbbfbb40fa1479 Mon Sep 17 00:00:00 2001
From: Joost Jager <joost.jager@gmail.com>
Date: Wed, 24 Jun 2020 11:24:26 +0200
Subject: [PATCH 2/5] routerrpc: remove redundant htlc prefix from proto field

The message name already sets the context to an htlc.
---
 lnrpc/routerrpc/forward_interceptor.go |   2 +-
 lnrpc/routerrpc/router.pb.go           | 320 ++++++++++++-------------
 lnrpc/routerrpc/router.proto           |   2 +-
 lnrpc/routerrpc/router.swagger.json    |   2 +-
 4 files changed, 163 insertions(+), 163 deletions(-)

diff --git a/lnrpc/routerrpc/forward_interceptor.go b/lnrpc/routerrpc/forward_interceptor.go
index 6653ac5b..9844c572 100644
--- a/lnrpc/routerrpc/forward_interceptor.go
+++ b/lnrpc/routerrpc/forward_interceptor.go
@@ -157,7 +157,7 @@ func (r *forwardInterceptor) holdAndForwardToClient(
 			ChanId: inKey.ChanID.ToUint64(),
 			HtlcId: inKey.HtlcID,
 		},
-		HtlcPaymentHash:    htlc.PaymentHash[:],
+		PaymentHash:        htlc.PaymentHash[:],
 		OutgoingAmountMsat: uint64(htlc.Amount),
 		OutgoingExpiry:     htlc.Expiry,
 	}
diff --git a/lnrpc/routerrpc/router.pb.go b/lnrpc/routerrpc/router.pb.go
index de602e44..ac2deeb0 100644
--- a/lnrpc/routerrpc/router.pb.go
+++ b/lnrpc/routerrpc/router.pb.go
@@ -1812,7 +1812,7 @@ type ForwardHtlcInterceptRequest struct {
 	//
 	//The htlc payment hash. This value is not guaranteed to be unique per
 	//request.
-	HtlcPaymentHash []byte `protobuf:"bytes,2,opt,name=htlc_payment_hash,json=htlcPaymentHash,proto3" json:"htlc_payment_hash,omitempty"`
+	PaymentHash []byte `protobuf:"bytes,2,opt,name=payment_hash,json=paymentHash,proto3" json:"payment_hash,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,9 +1854,9 @@ func (m *ForwardHtlcInterceptRequest) GetIncomingCircuitKey() *CircuitKey {
 	return nil
 }
 
-func (m *ForwardHtlcInterceptRequest) GetHtlcPaymentHash() []byte {
+func (m *ForwardHtlcInterceptRequest) GetPaymentHash() []byte {
 	if m != nil {
-		return m.HtlcPaymentHash
+		return m.PaymentHash
 	}
 	return nil
 }
@@ -1979,164 +1979,164 @@ func init() {
 func init() { proto.RegisterFile("routerrpc/router.proto", fileDescriptor_7a0613f69d37b0a5) }
 
 var fileDescriptor_7a0613f69d37b0a5 = []byte{
-	// 2509 bytes of a gzipped FileDescriptorProto
+	// 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, 0x5a, 0x0e, 0x68, 0x09, 0x7f, 0x50, 0xb2, 0xe1, 0xb5, 0x2d,
-	0xa1, 0xf4, 0xb7, 0x29, 0x99, 0x49, 0x25, 0xae, 0xf8, 0x91, 0x80, 0xc0, 0x52, 0x5c, 0x09, 0x04,
-	0xe0, 0x01, 0x48, 0xdb, 0xf1, 0x61, 0x6a, 0x09, 0x0c, 0x88, 0x0d, 0x17, 0xbb, 0xc8, 0xee, 0x40,
-	0x32, 0x8f, 0xb9, 0xa5, 0xf2, 0x45, 0x72, 0xcb, 0x27, 0xc8, 0x21, 0x87, 0x7c, 0x8f, 0x5c, 0x73,
-	0xc9, 0x29, 0x55, 0x39, 0xa7, 0xe6, 0xb1, 0xc0, 0x2e, 0x09, 0x4a, 0x49, 0x55, 0x2e, 0x12, 0xf7,
-	0xd7, 0x3d, 0x3d, 0xdd, 0xd3, 0xbf, 0xee, 0x9e, 0x01, 0xdc, 0x0b, 0xfc, 0x15, 0xa3, 0x41, 0xb0,
-	0x9c, 0x3c, 0x95, 0x7f, 0x1d, 0x2c, 0x03, 0x9f, 0xf9, 0xa8, 0xb0, 0xc6, 0x1b, 0x85, 0x60, 0x39,
-	0x91, 0xa8, 0xf1, 0xcf, 0x1c, 0xa0, 0x11, 0xf5, 0xa6, 0x43, 0xfb, 0x7a, 0x41, 0x3d, 0x86, 0xe9,
-	0x6f, 0x57, 0x34, 0x64, 0x08, 0x41, 0x66, 0x4a, 0x43, 0x56, 0xd7, 0x9a, 0x5a, 0xab, 0x84, 0xc5,
-	0xdf, 0x48, 0x87, 0xb4, 0xbd, 0x60, 0xf5, 0x54, 0x53, 0x6b, 0xa5, 0x31, 0xff, 0x13, 0xfd, 0x1f,
-	0xe4, 0xed, 0x05, 0x23, 0x8b, 0xd0, 0x66, 0xf5, 0x92, 0x80, 0x77, 0xec, 0x05, 0x3b, 0x0d, 0x6d,
-	0x86, 0x3e, 0x80, 0xd2, 0x52, 0x9a, 0x24, 0x73, 0x3b, 0x9c, 0xd7, 0xd3, 0xc2, 0x50, 0x51, 0x61,
-	0x27, 0x76, 0x38, 0x47, 0x2d, 0xd0, 0x67, 0x8e, 0x67, 0xbb, 0x64, 0xe2, 0xb2, 0x57, 0x64, 0x4a,
-	0x5d, 0x66, 0xd7, 0x33, 0x4d, 0xad, 0x95, 0xc5, 0x15, 0x81, 0x77, 0x5c, 0xf6, 0xaa, 0xcb, 0x51,
-	0xf4, 0x18, 0xaa, 0x91, 0xb1, 0x40, 0x3a, 0x58, 0xcf, 0x36, 0xb5, 0x56, 0x01, 0x57, 0x96, 0x49,
-	0xb7, 0x1f, 0x43, 0x95, 0x39, 0x0b, 0xea, 0xaf, 0x18, 0x09, 0xe9, 0xc4, 0xf7, 0xa6, 0x61, 0x3d,
-	0x27, 0x2d, 0x2a, 0x78, 0x24, 0x51, 0x64, 0x40, 0x79, 0x46, 0x29, 0x71, 0x9d, 0x85, 0xc3, 0x08,
-	0x77, 0x7f, 0x47, 0xb8, 0x5f, 0x9c, 0x51, 0xda, 0xe3, 0xd8, 0xc8, 0x66, 0xe8, 0x23, 0xa8, 0x6c,
-	0x74, 0x44, 0x8c, 0x65, 0xa1, 0x54, 0x8a, 0x94, 0x44, 0xa0, 0x07, 0xa0, 0xfb, 0x2b, 0x76, 0xe9,
-	0x3b, 0xde, 0x25, 0x99, 0xcc, 0x6d, 0x8f, 0x38, 0xd3, 0x7a, 0xbe, 0xa9, 0xb5, 0x32, 0x47, 0x99,
-	0xba, 0xf6, 0x4c, 0xc3, 0x95, 0x48, 0xda, 0x99, 0xdb, 0x9e, 0x35, 0x45, 0x4f, 0x60, 0xf7, 0xa6,
-	0x7e, 0x58, 0xaf, 0x35, 0xd3, 0xad, 0x0c, 0xae, 0x26, 0x55, 0x43, 0xf4, 0x08, 0xaa, 0xae, 0x1d,
-	0x32, 0x32, 0xf7, 0x97, 0x64, 0xb9, 0xba, 0xb8, 0xa2, 0xd7, 0xf5, 0x8a, 0x38, 0xc7, 0x32, 0x87,
-	0x4f, 0xfc, 0xe5, 0x50, 0x80, 0xe8, 0x21, 0x80, 0x38, 0x43, 0xe1, 0x6a, 0xbd, 0x20, 0x22, 0x2e,
-	0x70, 0x44, 0xb8, 0x89, 0x3e, 0x83, 0xa2, 0xc8, 0x3d, 0x99, 0x3b, 0x1e, 0x0b, 0xeb, 0xd0, 0x4c,
-	0xb7, 0x8a, 0x87, 0xfa, 0x81, 0xeb, 0x71, 0x1a, 0x60, 0x2e, 0x39, 0x71, 0x3c, 0x86, 0x21, 0x88,
-	0xfe, 0x0c, 0xd1, 0x14, 0x6a, 0x3c, 0xe7, 0x64, 0xb2, 0x0a, 0x99, 0xbf, 0x20, 0x01, 0x9d, 0xf8,
-	0xc1, 0x34, 0xac, 0x17, 0xc5, 0xd2, 0x9f, 0x1e, 0xac, 0xa9, 0x74, 0x70, 0x9b, 0x3b, 0x07, 0x5d,
-	0x1a, 0xb2, 0x8e, 0x58, 0x87, 0xe5, 0x32, 0xd3, 0x63, 0xc1, 0x35, 0xde, 0x9d, 0xde, 0xc4, 0xd1,
-	0x27, 0x80, 0x6c, 0xd7, 0xf5, 0x5f, 0x93, 0x90, 0xba, 0x33, 0xa2, 0x72, 0x59, 0xaf, 0x36, 0xb5,
-	0x56, 0x1e, 0xeb, 0x42, 0x32, 0xa2, 0xee, 0x4c, 0x99, 0x47, 0x3f, 0x83, 0xb2, 0xf0, 0x69, 0x46,
-	0x6d, 0xb6, 0x0a, 0x68, 0x58, 0xd7, 0x9b, 0xe9, 0x56, 0xe5, 0x70, 0x57, 0x05, 0x72, 0x2c, 0xe1,
-	0x23, 0x87, 0xe1, 0x12, 0xd7, 0x53, 0xdf, 0x21, 0xda, 0x87, 0xc2, 0xc2, 0xfe, 0x91, 0x2c, 0xed,
-	0x80, 0x85, 0xf5, 0xdd, 0xa6, 0xd6, 0x2a, 0xe3, 0xfc, 0xc2, 0xfe, 0x71, 0xc8, 0xbf, 0xd1, 0x01,
-	0xd4, 0x3c, 0x9f, 0x38, 0xde, 0xcc, 0x75, 0x2e, 0xe7, 0x8c, 0xac, 0x96, 0x53, 0x9b, 0xd1, 0xb0,
-	0x8e, 0x84, 0x0f, 0xbb, 0x9e, 0x6f, 0x29, 0xc9, 0x99, 0x14, 0x34, 0xba, 0x70, 0x6f, 0x7b, 0x7c,
-	0xbc, 0x3c, 0x78, 0x82, 0x78, 0xc5, 0x64, 0x30, 0xff, 0x13, 0xed, 0x41, 0xf6, 0x95, 0xed, 0xae,
-	0xa8, 0x28, 0x99, 0x12, 0x96, 0x1f, 0xbf, 0x48, 0x7d, 0xae, 0x19, 0x73, 0xa8, 0x8d, 0x03, 0x7b,
-	0x72, 0x75, 0xa3, 0xea, 0x6e, 0x16, 0x8d, 0x76, 0xbb, 0x68, 0xee, 0xf0, 0x37, 0x75, 0x87, 0xbf,
-	0xc6, 0xd7, 0x50, 0x15, 0x19, 0x3e, 0xa6, 0xf4, 0x4d, 0xb5, 0x7d, 0x1f, 0x78, 0xe5, 0x8a, 0x4a,
-	0x90, 0xf5, 0x9d, 0xb3, 0x17, 0xbc, 0x08, 0x8c, 0x29, 0xe8, 0x9b, 0xf5, 0xe1, 0xd2, 0xf7, 0x42,
-	0xca, 0x0b, 0x97, 0x13, 0x80, 0x33, 0x98, 0x17, 0x88, 0x28, 0x0d, 0x4d, 0xac, 0xaa, 0x28, 0xfc,
-	0x98, 0x52, 0x51, 0x1c, 0x8f, 0x64, 0x3d, 0x12, 0xd7, 0x9f, 0x5c, 0xf1, 0x0a, 0xb7, 0xaf, 0x95,
-	0xf9, 0x32, 0x87, 0x7b, 0xfe, 0xe4, 0xaa, 0xcb, 0x41, 0xe3, 0x07, 0xd9, 0x84, 0xc6, 0xbe, 0xd8,
-	0xeb, 0xbf, 0x38, 0x0e, 0x03, 0xb2, 0x82, 0x8b, 0xc2, 0x6c, 0xf1, 0xb0, 0x14, 0x27, 0x35, 0x96,
-	0x22, 0xe3, 0x07, 0xa8, 0x25, 0x8c, 0xab, 0x28, 0x1a, 0x90, 0x5f, 0x06, 0xd4, 0x59, 0xd8, 0x97,
-	0x54, 0x59, 0x5e, 0x7f, 0xa3, 0x16, 0xec, 0xcc, 0x6c, 0xc7, 0x5d, 0x05, 0x91, 0xe1, 0x4a, 0x44,
-	0x32, 0x89, 0xe2, 0x48, 0x6c, 0x3c, 0x80, 0x06, 0xa6, 0x21, 0x65, 0xa7, 0x4e, 0x18, 0x3a, 0xbe,
-	0xd7, 0xf1, 0x3d, 0x16, 0xf8, 0xae, 0x8a, 0xc0, 0x78, 0x08, 0xfb, 0x5b, 0xa5, 0xd2, 0x05, 0xbe,
-	0xf8, 0x9b, 0x15, 0x0d, 0xae, 0xb7, 0x2f, 0xfe, 0x06, 0xf6, 0xb7, 0x4a, 0x95, 0xff, 0x9f, 0x40,
-	0x76, 0x69, 0x3b, 0x01, 0xcf, 0x3d, 0x2f, 0xca, 0x7b, 0xb1, 0xa2, 0x1c, 0xda, 0x4e, 0x70, 0xe2,
-	0x84, 0xcc, 0x0f, 0xae, 0xb1, 0x54, 0x7a, 0x91, 0xc9, 0x6b, 0x7a, 0xca, 0xf8, 0x83, 0x06, 0xc5,
-	0x98, 0x90, 0x97, 0x86, 0xe7, 0x4f, 0x29, 0x99, 0x05, 0xfe, 0x22, 0x3a, 0x04, 0x0e, 0x1c, 0x07,
-	0xfe, 0x82, 0x73, 0x42, 0x08, 0x99, 0xaf, 0x08, 0x9c, 0xe3, 0x9f, 0x63, 0x1f, 0x7d, 0x0a, 0x3b,
-	0x73, 0x69, 0x40, 0xb4, 0xcd, 0xe2, 0x61, 0xed, 0xc6, 0xde, 0x5d, 0x9b, 0xd9, 0x38, 0xd2, 0x79,
-	0x91, 0xc9, 0xa7, 0xf5, 0xcc, 0x8b, 0x4c, 0x3e, 0xa3, 0x67, 0x5f, 0x64, 0xf2, 0x59, 0x3d, 0xf7,
-	0x22, 0x93, 0xcf, 0xe9, 0x3b, 0xc6, 0xdf, 0x35, 0xc8, 0x47, 0xda, 0xdc, 0x13, 0x7e, 0xa4, 0x84,
-	0xf3, 0x42, 0x91, 0x29, 0xcf, 0x81, 0xb1, 0xb3, 0xa0, 0xa8, 0x09, 0x25, 0x21, 0x4c, 0x52, 0x14,
-	0x38, 0xd6, 0x16, 0x34, 0x15, 0xfd, 0x3c, 0xd2, 0x10, 0x7c, 0xcc, 0xa8, 0x7e, 0x2e, 0x55, 0xa2,
-	0x91, 0x14, 0xae, 0x26, 0x13, 0x1a, 0x86, 0x72, 0x97, 0xac, 0x54, 0x51, 0x98, 0xd8, 0xe8, 0x11,
-	0x54, 0x23, 0x95, 0x68, 0xaf, 0x9c, 0xe4, 0xab, 0x82, 0xd5, 0x76, 0x2d, 0xd0, 0xe3, 0x7a, 0x8b,
-	0xcd, 0x04, 0xa9, 0x6c, 0x14, 0xf9, 0xa6, 0x32, 0x78, 0xe3, 0x37, 0x70, 0x5f, 0xa4, 0x72, 0x18,
-	0xf8, 0x17, 0xf6, 0x85, 0xe3, 0x3a, 0xec, 0x3a, 0x22, 0x39, 0x0f, 0x3c, 0xf0, 0x17, 0x84, 0x9f,
-	0x6d, 0x94, 0x02, 0x0e, 0xf4, 0xfd, 0x29, 0xe5, 0x29, 0x60, 0xbe, 0x14, 0xa9, 0x14, 0x30, 0x5f,
-	0x08, 0xe2, 0x93, 0x37, 0x9d, 0x98, 0xbc, 0xc6, 0x15, 0xd4, 0x6f, 0xef, 0xa5, 0x38, 0xd3, 0x84,
-	0xe2, 0x72, 0x03, 0x8b, 0xed, 0x34, 0x1c, 0x87, 0xe2, 0xb9, 0x4d, 0xbd, 0x3d, 0xb7, 0xc6, 0x1f,
-	0x35, 0xd8, 0x3d, 0x5a, 0x39, 0xee, 0x34, 0x51, 0xb8, 0x71, 0xef, 0xb4, 0xe4, 0xbd, 0x60, 0xdb,
-	0xd0, 0x4f, 0x6d, 0x1d, 0xfa, 0x9f, 0x6c, 0x19, 0xac, 0x69, 0x31, 0x58, 0x53, 0x5b, 0xc6, 0xea,
-	0xfb, 0x50, 0xdc, 0x4c, 0xc9, 0xb0, 0x9e, 0x69, 0xa6, 0x5b, 0x25, 0x0c, 0xf3, 0x68, 0x44, 0x86,
-	0xc6, 0xe7, 0x80, 0xe2, 0x8e, 0xaa, 0x03, 0x59, 0xf7, 0x0f, 0xed, 0xee, 0xfe, 0xf1, 0x00, 0x1a,
-	0xa3, 0xd5, 0x45, 0x38, 0x09, 0x9c, 0x0b, 0x7a, 0xc2, 0xdc, 0x89, 0xf9, 0x8a, 0x7a, 0x2c, 0x8c,
-	0xaa, 0xf4, 0x5f, 0x19, 0x28, 0xac, 0x51, 0xde, 0x9e, 0x1d, 0x6f, 0xe2, 0x2f, 0x22, 0xa7, 0x3d,
-	0xea, 0x72, 0xbf, 0xe5, 0x50, 0xd8, 0x8d, 0x44, 0x1d, 0x29, 0xb1, 0xa6, 0x5c, 0x3f, 0x11, 0xa4,
-	0xd2, 0x4f, 0x49, 0xfd, 0x78, 0x8c, 0x52, 0xbf, 0x05, 0xfa, 0xda, 0xfe, 0x9c, 0xb9, 0x93, 0xf5,
-	0xa1, 0xe0, 0x4a, 0x84, 0x73, 0x67, 0xa4, 0xe6, 0xda, 0x72, 0xa4, 0x99, 0x91, 0x9a, 0x11, 0xae,
-	0x34, 0x3f, 0x80, 0x12, 0xaf, 0x87, 0x90, 0xd9, 0x8b, 0x25, 0xf1, 0x42, 0x51, 0x17, 0x19, 0x5c,
-	0x5c, 0x63, 0xfd, 0x10, 0x7d, 0x05, 0x40, 0x79, 0x7c, 0x84, 0x5d, 0x2f, 0xa9, 0x28, 0x89, 0xca,
-	0xe1, 0x7b, 0x31, 0x62, 0xac, 0x0f, 0xe0, 0x40, 0xfc, 0x3b, 0xbe, 0x5e, 0x52, 0x5c, 0xa0, 0xd1,
-	0x9f, 0xe8, 0x6b, 0x28, 0xcf, 0xfc, 0xe0, 0xb5, 0x1d, 0x4c, 0x89, 0x00, 0x55, 0xdb, 0xb8, 0x1f,
-	0xb3, 0x70, 0x2c, 0xe5, 0x62, 0xf9, 0xc9, 0x3b, 0xb8, 0x34, 0x8b, 0x7d, 0xa3, 0x97, 0x80, 0xa2,
-	0xf5, 0xa2, 0xca, 0xa5, 0x91, 0xbc, 0x30, 0xb2, 0x7f, 0xdb, 0x08, 0x6f, 0xd2, 0x91, 0x21, 0x7d,
-	0x76, 0x03, 0x43, 0x5f, 0x40, 0x29, 0xa4, 0x8c, 0xb9, 0x54, 0x99, 0x29, 0x08, 0x33, 0xf7, 0x12,
-	0x77, 0x1a, 0x2e, 0x8e, 0x2c, 0x14, 0xc3, 0xcd, 0x27, 0x3a, 0x82, 0xaa, 0xeb, 0x78, 0x57, 0x71,
-	0x37, 0x40, 0xac, 0xaf, 0xc7, 0xd6, 0xf7, 0x1c, 0xef, 0x2a, 0xee, 0x43, 0xd9, 0x8d, 0x03, 0xc6,
-	0x97, 0x50, 0x58, 0x9f, 0x12, 0x2a, 0xc2, 0xce, 0x59, 0xff, 0x65, 0x7f, 0xf0, 0x6d, 0x5f, 0x7f,
-	0x07, 0xe5, 0x21, 0x33, 0x32, 0xfb, 0x5d, 0x5d, 0xe3, 0x30, 0x36, 0x3b, 0xa6, 0x75, 0x6e, 0xea,
-	0x29, 0xfe, 0x71, 0x3c, 0xc0, 0xdf, 0xb6, 0x71, 0x57, 0x4f, 0x1f, 0xed, 0x40, 0x56, 0xec, 0x6b,
-	0xfc, 0x59, 0x83, 0xbc, 0xc8, 0xa0, 0x37, 0xf3, 0xd1, 0xff, 0xc3, 0x9a, 0x5c, 0xa2, 0xb9, 0xf1,
-	0x81, 0x2b, 0x58, 0x57, 0xc6, 0x6b, 0xc2, 0x8c, 0x15, 0xce, 0x95, 0xd7, 0xd4, 0x58, 0x2b, 0xa7,
-	0xa4, 0x72, 0x24, 0x58, 0x2b, 0x3f, 0x89, 0x59, 0x4e, 0xb4, 0x9c, 0x0c, 0xae, 0x46, 0x82, 0xa8,
-	0xc3, 0xc6, 0xef, 0xb6, 0x89, 0x4e, 0x1c, 0xbb, 0xdb, 0x2a, 0x5d, 0xe3, 0xe7, 0x50, 0x8a, 0xe7,
-	0x1c, 0x3d, 0x86, 0x8c, 0xe3, 0xcd, 0x7c, 0x55, 0x88, 0xb5, 0x1b, 0xe4, 0xe2, 0x41, 0x62, 0xa1,
-	0x60, 0x20, 0xd0, 0x6f, 0xe6, 0xd9, 0x28, 0x43, 0x31, 0x96, 0x34, 0xe3, 0x6f, 0x1a, 0x94, 0x13,
-	0x49, 0xf8, 0x8f, 0xad, 0xa3, 0xaf, 0xa0, 0xf4, 0xda, 0x09, 0x28, 0x89, 0x8f, 0xff, 0xca, 0x61,
-	0x23, 0x39, 0xfe, 0xa3, 0xff, 0x3b, 0xfe, 0x94, 0xe2, 0x22, 0xd7, 0x57, 0x00, 0xfa, 0x25, 0x54,
-	0xd4, 0x4a, 0x32, 0xa5, 0xcc, 0x76, 0x5c, 0x71, 0x54, 0x95, 0x04, 0x3d, 0x94, 0x6e, 0x57, 0xc8,
-	0x71, 0x79, 0x16, 0xff, 0x44, 0x1f, 0x6f, 0x0c, 0x84, 0x2c, 0x70, 0xbc, 0x4b, 0x71, 0x7e, 0x85,
-	0xb5, 0xda, 0x48, 0x80, 0x7c, 0x90, 0x97, 0xd5, 0xe5, 0x71, 0xc4, 0x6c, 0xb6, 0x0a, 0xd1, 0xa7,
-	0x90, 0x0d, 0x99, 0xad, 0x3a, 0x59, 0x25, 0x51, 0x5b, 0x31, 0x45, 0x8a, 0xa5, 0x56, 0xe2, 0xf6,
-	0x93, 0xba, 0x75, 0xfb, 0xc9, 0xf2, 0x8e, 0x21, 0xbb, 0x68, 0xf1, 0x10, 0xa9, 0xe0, 0x4f, 0xc6,
-	0xbd, 0x4e, 0x9b, 0x31, 0xba, 0x58, 0x32, 0x2c, 0x15, 0xd4, 0x74, 0xfb, 0x1a, 0xa0, 0xe3, 0x04,
-	0x93, 0x95, 0xc3, 0x5e, 0xd2, 0x6b, 0x3e, 0xb3, 0xa2, 0x76, 0x2d, 0xdb, 0x5e, 0x6e, 0x22, 0x5b,
-	0xf4, 0x7d, 0xd8, 0x89, 0x1a, 0x91, 0xec, 0x6f, 0xb9, 0xb9, 0x68, 0x40, 0xc6, 0x3f, 0x34, 0xd8,
-	0x57, 0x29, 0x95, 0xd9, 0x60, 0x34, 0x98, 0xd0, 0xe5, 0xfa, 0x5a, 0xfc, 0x1c, 0xf6, 0x36, 0x4d,
-	0x55, 0x6e, 0x44, 0xa2, 0xab, 0x76, 0xf1, 0xf0, 0xdd, 0x58, 0xa4, 0x1b, 0x37, 0x30, 0x5a, 0x37,
-	0xdb, 0x8d, 0x6b, 0x4f, 0x60, 0x57, 0x78, 0x90, 0xb8, 0x55, 0xca, 0xe8, 0xab, 0x5c, 0x30, 0x8c,
-	0xdd, 0x2c, 0x9f, 0xc1, 0x5e, 0x8c, 0xcb, 0xfe, 0xca, 0x4b, 0x50, 0x1f, 0x6d, 0xe8, 0xcc, 0x45,
-	0x82, 0xfd, 0x8f, 0x61, 0x4d, 0x72, 0x42, 0x7f, 0x5c, 0x3a, 0xc1, 0xb5, 0xc8, 0x5d, 0x79, 0xd3,
-	0x70, 0x4d, 0x81, 0x1a, 0x7f, 0xd1, 0xe0, 0xc1, 0xf6, 0x78, 0xd5, 0x54, 0xfa, 0x9f, 0x05, 0xfc,
-	0x05, 0xe4, 0xec, 0x09, 0x73, 0x7c, 0x4f, 0xf1, 0xf8, 0xc3, 0xd8, 0x52, 0x4c, 0x43, 0xdf, 0x7d,
-	0x45, 0x4f, 0x7c, 0x77, 0xaa, 0x9c, 0x69, 0x0b, 0x55, 0xac, 0x96, 0x24, 0x28, 0x92, 0x4e, 0x52,
-	0xe4, 0xc9, 0xef, 0x32, 0x50, 0x4e, 0xf0, 0x38, 0xd9, 0xc8, 0xca, 0x50, 0xe8, 0x0f, 0x48, 0xd7,
-	0x1c, 0xb7, 0xad, 0x9e, 0xae, 0x21, 0x1d, 0x4a, 0x83, 0xbe, 0x35, 0xe8, 0x93, 0xae, 0xd9, 0x19,
-	0x74, 0x79, 0x4b, 0x7b, 0x17, 0x76, 0x7b, 0x56, 0xff, 0x25, 0xe9, 0x0f, 0xc6, 0xc4, 0xec, 0x59,
-	0xcf, 0xad, 0xa3, 0x9e, 0xa9, 0xa7, 0xd1, 0x1e, 0xe8, 0x83, 0x3e, 0xe9, 0x9c, 0xb4, 0xad, 0x3e,
-	0x19, 0x5b, 0xa7, 0xe6, 0xe0, 0x6c, 0xac, 0x67, 0x38, 0xca, 0xb9, 0x47, 0xcc, 0xef, 0x3a, 0xa6,
-	0xd9, 0x1d, 0x91, 0xd3, 0xf6, 0x77, 0x7a, 0x16, 0xd5, 0x61, 0xcf, 0xea, 0x8f, 0xce, 0x8e, 0x8f,
-	0xad, 0x8e, 0x65, 0xf6, 0xc7, 0xe4, 0xa8, 0xdd, 0x6b, 0xf7, 0x3b, 0xa6, 0x9e, 0x43, 0xf7, 0x00,
-	0x59, 0xfd, 0xce, 0xe0, 0x74, 0xd8, 0x33, 0xc7, 0x26, 0x89, 0x5a, 0xe7, 0x0e, 0xaa, 0x41, 0x55,
-	0xd8, 0x69, 0x77, 0xbb, 0xe4, 0xb8, 0x6d, 0xf5, 0xcc, 0xae, 0x9e, 0xe7, 0x9e, 0x28, 0x8d, 0x11,
-	0xe9, 0x5a, 0xa3, 0xf6, 0x11, 0x87, 0x0b, 0x7c, 0x4f, 0xab, 0x7f, 0x3e, 0xb0, 0x3a, 0x26, 0xe9,
-	0x70, 0xb3, 0x1c, 0x05, 0xae, 0x1c, 0xa1, 0x67, 0xfd, 0xae, 0x89, 0x87, 0x6d, 0xab, 0xab, 0x17,
-	0xd1, 0x3e, 0xdc, 0x8f, 0x60, 0xf3, 0xbb, 0xa1, 0x85, 0xbf, 0x27, 0xe3, 0xc1, 0x80, 0x8c, 0x06,
-	0x83, 0xbe, 0x5e, 0x8a, 0x5b, 0xe2, 0xd1, 0x0e, 0x86, 0x66, 0x5f, 0x2f, 0xa3, 0xfb, 0x50, 0x3b,
-	0x1d, 0x0e, 0x49, 0x24, 0x89, 0x82, 0xad, 0x70, 0xf5, 0x76, 0xb7, 0x8b, 0xcd, 0xd1, 0x88, 0x9c,
-	0x5a, 0xa3, 0xd3, 0xf6, 0xb8, 0x73, 0xa2, 0x57, 0x79, 0x48, 0x23, 0x73, 0x4c, 0xc6, 0x83, 0x71,
-	0xbb, 0xb7, 0xc1, 0x75, 0xee, 0xd0, 0x06, 0xe7, 0x9b, 0xf6, 0x06, 0xdf, 0xea, 0xbb, 0xfc, 0xc0,
-	0x39, 0x3c, 0x38, 0x57, 0x2e, 0x22, 0x1e, 0xbb, 0x4a, 0x4f, 0xb4, 0xa7, 0x5e, 0xe3, 0xa0, 0xd5,
-	0x3f, 0x6f, 0xf7, 0xac, 0x2e, 0x79, 0x69, 0x7e, 0x2f, 0x46, 0xcf, 0x1e, 0x07, 0xa5, 0x67, 0x64,
-	0x88, 0x07, 0xcf, 0xb9, 0x23, 0xfa, 0xbb, 0x08, 0x41, 0xa5, 0x63, 0xe1, 0xce, 0x59, 0xaf, 0x8d,
-	0x09, 0x1e, 0x9c, 0x8d, 0x4d, 0xfd, 0xde, 0x93, 0x3f, 0x69, 0x50, 0x8a, 0xb7, 0x16, 0x9e, 0x75,
-	0xab, 0x4f, 0x8e, 0x7b, 0xd6, 0xf3, 0x93, 0xb1, 0x24, 0xc1, 0xe8, 0xac, 0xc3, 0x53, 0x66, 0xf2,
-	0x91, 0x86, 0xa0, 0x22, 0x0f, 0x7d, 0x1d, 0x6c, 0x8a, 0xef, 0xa5, 0xb0, 0xfe, 0x40, 0xd9, 0x4d,
-	0x73, 0xe7, 0x15, 0x68, 0x62, 0x3c, 0xc0, 0x7a, 0x06, 0x7d, 0x04, 0x4d, 0x85, 0xf0, 0xbc, 0x62,
-	0x6c, 0x76, 0xc6, 0x64, 0xd8, 0xfe, 0xfe, 0x94, 0xa7, 0x5d, 0x92, 0x6c, 0xa4, 0x67, 0xd1, 0xfb,
-	0xb0, 0xbf, 0xd6, 0xda, 0xc6, 0x8b, 0x27, 0x5f, 0x42, 0xfd, 0x2e, 0xd2, 0x23, 0x80, 0xdc, 0xc8,
-	0x1c, 0x8f, 0x7b, 0xa6, 0x1c, 0xc3, 0xc7, 0x92, 0xb8, 0x00, 0x39, 0x6c, 0x8e, 0xce, 0x4e, 0x4d,
-	0x3d, 0x75, 0xf8, 0xd7, 0x3c, 0xe4, 0xc4, 0xbd, 0x30, 0x40, 0xbf, 0x82, 0x72, 0xec, 0x77, 0x8f,
-	0xf3, 0x43, 0xf4, 0xf0, 0x8d, 0xbf, 0x88, 0x34, 0xa2, 0xd7, 0xa3, 0x82, 0x9f, 0x69, 0xe8, 0x08,
-	0x2a, 0xf1, 0x1f, 0x00, 0xce, 0x0f, 0x51, 0xfc, 0x3a, 0xb5, 0xe5, 0xb7, 0x81, 0x2d, 0x36, 0x5e,
-	0x82, 0x6e, 0x86, 0xcc, 0x59, 0xf0, 0xae, 0xae, 0x9e, 0xe8, 0xa8, 0x11, 0x2f, 0xf0, 0xe4, 0xbb,
-	0xbf, 0xb1, 0xbf, 0x55, 0xa6, 0x5a, 0xce, 0x37, 0x7c, 0x82, 0xae, 0x1f, 0xc9, 0xb7, 0x02, 0x4a,
-	0xbe, 0xcc, 0x1b, 0xef, 0xdd, 0x25, 0x56, 0x0f, 0xdb, 0xf4, 0xef, 0x53, 0x3c, 0xc6, 0x72, 0x4c,
-	0xb6, 0xe5, 0x94, 0x6e, 0x18, 0xdd, 0x32, 0x67, 0xd0, 0x14, 0x6a, 0x5b, 0x1e, 0xd0, 0xe8, 0xe3,
-	0x64, 0x1f, 0xbb, 0xe3, 0xf9, 0xdd, 0x78, 0xf4, 0x36, 0x35, 0x15, 0xfc, 0x14, 0x6a, 0x5b, 0x5e,
-	0xda, 0x89, 0x5d, 0xee, 0x7e, 0xa7, 0x27, 0x76, 0x79, 0xd3, 0x83, 0xfd, 0x07, 0xd0, 0x6f, 0x3e,
-	0xcc, 0x90, 0x71, 0x73, 0xed, 0xed, 0x17, 0x62, 0xe3, 0xc3, 0x37, 0xea, 0x28, 0xe3, 0x16, 0xc0,
-	0xe6, 0x79, 0x83, 0x1e, 0xc4, 0x96, 0xdc, 0x7a, 0x9e, 0x35, 0x1e, 0xde, 0x21, 0x55, 0xa6, 0xc6,
-	0x50, 0xdb, 0xf2, 0xde, 0x49, 0x9c, 0xc6, 0xdd, 0xef, 0xa1, 0xc6, 0xde, 0xb6, 0x67, 0xc1, 0x33,
-	0x0d, 0x9d, 0x4a, 0x82, 0x45, 0x3f, 0xe6, 0xbd, 0xa5, 0x62, 0xea, 0xdb, 0xaf, 0x2f, 0xab, 0x50,
-	0x50, 0xeb, 0x99, 0x86, 0x06, 0x50, 0x8a, 0x57, 0xc9, 0x5b, 0xcb, 0xe7, 0xad, 0x06, 0x67, 0x50,
-	0x4d, 0x0c, 0x63, 0x3f, 0x40, 0x8f, 0x6f, 0x3f, 0x2d, 0xb6, 0xce, 0xeb, 0x04, 0x03, 0xde, 0x70,
-	0x91, 0x69, 0x69, 0xcf, 0xb4, 0xa3, 0xcf, 0x7e, 0xfd, 0xf4, 0xd2, 0x61, 0xf3, 0xd5, 0xc5, 0xc1,
-	0xc4, 0x5f, 0x3c, 0x15, 0xbf, 0xd5, 0x79, 0x8e, 0x77, 0xe9, 0x51, 0xf6, 0xda, 0x0f, 0xae, 0x9e,
-	0xba, 0xde, 0xf4, 0xa9, 0x28, 0x83, 0xa7, 0x6b, 0x93, 0x17, 0x39, 0xf1, 0x53, 0xfd, 0x4f, 0xfe,
-	0x1d, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x89, 0xaa, 0x2b, 0xda, 0x17, 0x00, 0x00,
+	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,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/lnrpc/routerrpc/router.proto b/lnrpc/routerrpc/router.proto
index 3ee4b495..96349125 100644
--- a/lnrpc/routerrpc/router.proto
+++ b/lnrpc/routerrpc/router.proto
@@ -609,7 +609,7 @@ message ForwardHtlcInterceptRequest {
     The htlc payment hash. This value is not guaranteed to be unique per
     request.
     */
-    bytes htlc_payment_hash = 2;
+    bytes payment_hash = 2;
 
     // The outgoing htlc amount.
     uint64 outgoing_amount_msat = 3;
diff --git a/lnrpc/routerrpc/router.swagger.json b/lnrpc/routerrpc/router.swagger.json
index 701cc932..ecdda083 100644
--- a/lnrpc/routerrpc/router.swagger.json
+++ b/lnrpc/routerrpc/router.swagger.json
@@ -907,7 +907,7 @@
           "$ref": "#/definitions/routerrpcCircuitKey",
           "description": "The key of this forwarded htlc. It defines the incoming channel id and\nthe index in this channel."
         },
-        "htlc_payment_hash": {
+        "payment_hash": {
           "type": "string",
           "format": "byte",
           "description": "The htlc payment hash. This value is not guaranteed to be unique per\nrequest."

From 74db43282ce532a2f5aa49779dd5ef1a8c7c1347 Mon Sep 17 00:00:00 2001
From: Joost Jager <joost.jager@gmail.com>
Date: Tue, 23 Jun 2020 16:19:41 +0200
Subject: [PATCH 3/5] htlcswitch: encapsulate exposed packet info

---
 htlcswitch/interceptable_switch.go     | 18 +++++++++---------
 htlcswitch/interfaces.go               | 23 +++++++++++++++++++----
 lnrpc/routerrpc/forward_interceptor.go | 10 +++++-----
 3 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/htlcswitch/interceptable_switch.go b/htlcswitch/interceptable_switch.go
index cdf5bae0..2ca54e42 100644
--- a/htlcswitch/interceptable_switch.go
+++ b/htlcswitch/interceptable_switch.go
@@ -115,15 +115,15 @@ type interceptedForward struct {
 }
 
 // Packet returns the intercepted htlc packet.
-func (f *interceptedForward) Packet() lnwire.UpdateAddHTLC {
-	return *f.htlc
-}
-
-// CircuitKey returns the circuit key for the intercepted htlc.
-func (f *interceptedForward) CircuitKey() channeldb.CircuitKey {
-	return channeldb.CircuitKey{
-		ChanID: f.packet.incomingChanID,
-		HtlcID: f.packet.incomingHTLCID,
+func (f *interceptedForward) Packet() InterceptedPacket {
+	return InterceptedPacket{
+		IncomingCircuit: channeldb.CircuitKey{
+			ChanID: f.packet.incomingChanID,
+			HtlcID: f.packet.incomingHTLCID,
+		},
+		Hash:           f.htlc.PaymentHash,
+		OutgoingExpiry: f.htlc.Expiry,
+		OutgoingAmount: f.htlc.Amount,
 	}
 }
 
diff --git a/htlcswitch/interfaces.go b/htlcswitch/interfaces.go
index 67b1a458..74b1a568 100644
--- a/htlcswitch/interfaces.go
+++ b/htlcswitch/interfaces.go
@@ -200,17 +200,32 @@ type InterceptableHtlcForwarder interface {
 // and resolve it later or let the switch execute its default behavior.
 type ForwardInterceptor func(InterceptedForward) bool
 
+// InterceptedPacket contains the relevant information for the interceptor about
+// an htlc.
+type InterceptedPacket struct {
+	// IncomingCircuit contains the incoming channel and htlc id of the
+	// packet.
+	IncomingCircuit channeldb.CircuitKey
+
+	// Hash is the payment hash of the htlc.
+	Hash lntypes.Hash
+
+	// OutgoingExpiry is the absolute block height at which the outgoing
+	// htlc expires.
+	OutgoingExpiry uint32
+
+	// OutgoingAmount is the amount to forward.
+	OutgoingAmount lnwire.MilliSatoshi
+}
+
 // InterceptedForward is passed to the ForwardInterceptor for every forwarded
 // htlc. It contains all the information about the packet which accordingly
 // the interceptor decides if to hold or not.
 // In addition this interface allows a later resolution by calling either
 // Resume, Settle or Fail.
 type InterceptedForward interface {
-	// CircuitKey returns the intercepted packet.
-	CircuitKey() channeldb.CircuitKey
-
 	// Packet returns the intercepted packet.
-	Packet() lnwire.UpdateAddHTLC
+	Packet() InterceptedPacket
 
 	// Resume notifies the intention to resume an existing hold forward. This
 	// basically means the caller wants to resume with the default behavior for
diff --git a/lnrpc/routerrpc/forward_interceptor.go b/lnrpc/routerrpc/forward_interceptor.go
index 9844c572..00db973d 100644
--- a/lnrpc/routerrpc/forward_interceptor.go
+++ b/lnrpc/routerrpc/forward_interceptor.go
@@ -148,18 +148,18 @@ func (r *forwardInterceptor) holdAndForwardToClient(
 	forward htlcswitch.InterceptedForward) error {
 
 	htlc := forward.Packet()
-	inKey := forward.CircuitKey()
+	inKey := htlc.IncomingCircuit
 
 	// First hold the forward, then send to client.
-	r.holdForwards[forward.CircuitKey()] = forward
+	r.holdForwards[inKey] = forward
 	interceptionRequest := &ForwardHtlcInterceptRequest{
 		IncomingCircuitKey: &CircuitKey{
 			ChanId: inKey.ChanID.ToUint64(),
 			HtlcId: inKey.HtlcID,
 		},
-		PaymentHash:        htlc.PaymentHash[:],
-		OutgoingAmountMsat: uint64(htlc.Amount),
-		OutgoingExpiry:     htlc.Expiry,
+		PaymentHash:        htlc.Hash[:],
+		OutgoingAmountMsat: uint64(htlc.OutgoingAmount),
+		OutgoingExpiry:     htlc.OutgoingExpiry,
 	}
 
 	return r.stream.Send(interceptionRequest)

From 363142de3373ba2aa56099e8061d7552a9a608fc Mon Sep 17 00:00:00 2001
From: Joost Jager <joost.jager@gmail.com>
Date: Tue, 23 Jun 2020 16:22:00 +0200
Subject: [PATCH 4/5] 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.

From 290350516436be4f6c10d5bd7cf3a305de1997ed Mon Sep 17 00:00:00 2001
From: Joost Jager <joost.jager@gmail.com>
Date: Wed, 24 Jun 2020 12:03:00 +0200
Subject: [PATCH 5/5] htlcswitch: expose custom records on intercepted packet

---
 htlcswitch/interceptable_switch.go           |   1 +
 htlcswitch/interfaces.go                     |   5 +
 htlcswitch/link.go                           |   2 +
 htlcswitch/packet.go                         |   5 +
 lnrpc/routerrpc/forward_interceptor.go       |   1 +
 lnrpc/routerrpc/router.pb.go                 | 342 ++++++++++---------
 lnrpc/routerrpc/router.proto                 |   3 +
 lnrpc/routerrpc/router.swagger.json          |   8 +
 lntest/itest/lnd_forward_interceptor_test.go |  14 +
 9 files changed, 216 insertions(+), 165 deletions(-)

diff --git a/htlcswitch/interceptable_switch.go b/htlcswitch/interceptable_switch.go
index d510a5fb..c623c289 100644
--- a/htlcswitch/interceptable_switch.go
+++ b/htlcswitch/interceptable_switch.go
@@ -127,6 +127,7 @@ func (f *interceptedForward) Packet() InterceptedPacket {
 		OutgoingAmount: f.htlc.Amount,
 		IncomingAmount: f.packet.incomingAmount,
 		IncomingExpiry: f.packet.incomingTimeout,
+		CustomRecords:  f.packet.customRecords,
 	}
 }
 
diff --git a/htlcswitch/interfaces.go b/htlcswitch/interfaces.go
index f9684c59..1f1a1bad 100644
--- a/htlcswitch/interfaces.go
+++ b/htlcswitch/interfaces.go
@@ -8,6 +8,7 @@ import (
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/lnwallet"
 	"github.com/lightningnetwork/lnd/lnwire"
+	"github.com/lightningnetwork/lnd/record"
 )
 
 // InvoiceDatabase is an interface which represents the persistent subsystem
@@ -226,6 +227,10 @@ type InterceptedPacket struct {
 
 	// IncomingAmount is the amount of the accepted htlc.
 	IncomingAmount lnwire.MilliSatoshi
+
+	// CustomRecords are user-defined records in the custom type range that
+	// were included in the payload.
+	CustomRecords record.CustomSet
 }
 
 // InterceptedForward is passed to the ForwardInterceptor for every forwarded
diff --git a/htlcswitch/link.go b/htlcswitch/link.go
index 9276696c..3931af34 100644
--- a/htlcswitch/link.go
+++ b/htlcswitch/link.go
@@ -2731,6 +2731,7 @@ func (l *channelLink) processRemoteAdds(fwdPkg *channeldb.FwdPkg,
 					obfuscator:      obfuscator,
 					incomingTimeout: pd.Timeout,
 					outgoingTimeout: fwdInfo.OutgoingCTLV,
+					customRecords:   pld.CustomRecords(),
 				}
 				switchPackets = append(
 					switchPackets, updatePacket,
@@ -2794,6 +2795,7 @@ func (l *channelLink) processRemoteAdds(fwdPkg *channeldb.FwdPkg,
 					obfuscator:      obfuscator,
 					incomingTimeout: pd.Timeout,
 					outgoingTimeout: fwdInfo.OutgoingCTLV,
+					customRecords:   pld.CustomRecords(),
 				}
 
 				fwdPkg.FwdFilter.Set(idx)
diff --git a/htlcswitch/packet.go b/htlcswitch/packet.go
index e0aa7527..78c3af8e 100644
--- a/htlcswitch/packet.go
+++ b/htlcswitch/packet.go
@@ -4,6 +4,7 @@ import (
 	"github.com/lightningnetwork/lnd/channeldb"
 	"github.com/lightningnetwork/lnd/htlcswitch/hop"
 	"github.com/lightningnetwork/lnd/lnwire"
+	"github.com/lightningnetwork/lnd/record"
 )
 
 // htlcPacket is a wrapper around htlc lnwire update, which adds additional
@@ -91,6 +92,10 @@ type htlcPacket struct {
 	// will be extraced from the hop payload recevived by the incoming
 	// link.
 	outgoingTimeout uint32
+
+	// customRecords are user-defined records in the custom type range that
+	// were included in the payload.
+	customRecords record.CustomSet
 }
 
 // inKey returns the circuit key used to identify the incoming htlc.
diff --git a/lnrpc/routerrpc/forward_interceptor.go b/lnrpc/routerrpc/forward_interceptor.go
index 61260854..8c4a48eb 100644
--- a/lnrpc/routerrpc/forward_interceptor.go
+++ b/lnrpc/routerrpc/forward_interceptor.go
@@ -163,6 +163,7 @@ func (r *forwardInterceptor) holdAndForwardToClient(
 		OutgoingExpiry:          htlc.OutgoingExpiry,
 		IncomingAmountMsat:      uint64(htlc.IncomingAmount),
 		IncomingExpiry:          htlc.IncomingExpiry,
+		CustomRecords:           htlc.CustomRecords,
 	}
 
 	return r.stream.Send(interceptionRequest)
diff --git a/lnrpc/routerrpc/router.pb.go b/lnrpc/routerrpc/router.pb.go
index a7c88235..2d16ea87 100644
--- a/lnrpc/routerrpc/router.pb.go
+++ b/lnrpc/routerrpc/router.pb.go
@@ -1825,10 +1825,12 @@ type ForwardHtlcInterceptRequest struct {
 	// 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.
-	OutgoingExpiry       uint32   `protobuf:"varint,4,opt,name=outgoing_expiry,json=outgoingExpiry,proto3" json:"outgoing_expiry,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	OutgoingExpiry uint32 `protobuf:"varint,4,opt,name=outgoing_expiry,json=outgoingExpiry,proto3" json:"outgoing_expiry,omitempty"`
+	// Any custom records that were present in the payload.
+	CustomRecords        map[uint64][]byte `protobuf:"bytes,8,rep,name=custom_records,json=customRecords,proto3" json:"custom_records,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
 func (m *ForwardHtlcInterceptRequest) Reset()         { *m = ForwardHtlcInterceptRequest{} }
@@ -1905,6 +1907,13 @@ func (m *ForwardHtlcInterceptRequest) GetOutgoingExpiry() uint32 {
 	return 0
 }
 
+func (m *ForwardHtlcInterceptRequest) GetCustomRecords() map[uint64][]byte {
+	if m != nil {
+		return m.CustomRecords
+	}
+	return nil
+}
+
 //*
 //ForwardHtlcInterceptResponse enables the caller to resolve a previously hold
 //forward. The caller can choose either to:
@@ -2003,173 +2012,176 @@ func init() {
 	proto.RegisterType((*PaymentStatus)(nil), "routerrpc.PaymentStatus")
 	proto.RegisterType((*CircuitKey)(nil), "routerrpc.CircuitKey")
 	proto.RegisterType((*ForwardHtlcInterceptRequest)(nil), "routerrpc.ForwardHtlcInterceptRequest")
+	proto.RegisterMapType((map[uint64][]byte)(nil), "routerrpc.ForwardHtlcInterceptRequest.CustomRecordsEntry")
 	proto.RegisterType((*ForwardHtlcInterceptResponse)(nil), "routerrpc.ForwardHtlcInterceptResponse")
 }
 
 func init() { proto.RegisterFile("routerrpc/router.proto", fileDescriptor_7a0613f69d37b0a5) }
 
 var fileDescriptor_7a0613f69d37b0a5 = []byte{
-	// 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,
+	// 2580 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0x4b, 0x77, 0xdb, 0xc6,
+	0xf5, 0x0f, 0x48, 0x88, 0xa2, 0x2e, 0x1f, 0x82, 0x86, 0x8a, 0xc5, 0x3f, 0x65, 0x27, 0x0c, 0x93,
+	0xd8, 0x3c, 0xfe, 0x27, 0xb2, 0xa2, 0xf6, 0xb4, 0x69, 0xf3, 0x68, 0x28, 0x12, 0xb2, 0x60, 0x53,
+	0x24, 0x33, 0xa4, 0x9c, 0xa4, 0x59, 0x4c, 0x21, 0x72, 0x28, 0xa2, 0x02, 0x01, 0x16, 0x18, 0xda,
+	0xd1, 0xb2, 0xbb, 0x9e, 0x7e, 0x8a, 0xee, 0xba, 0xeb, 0x27, 0xe8, 0xa2, 0x8b, 0x7e, 0x8f, 0x6e,
+	0xbb, 0xef, 0x39, 0x5d, 0xf7, 0xcc, 0x03, 0x20, 0x20, 0x51, 0x76, 0x7b, 0xda, 0x8d, 0x4d, 0xfc,
+	0xee, 0x6f, 0xee, 0xdc, 0x99, 0xfb, 0x9a, 0x19, 0xc1, 0xbd, 0xc0, 0x5f, 0x32, 0x1a, 0x04, 0x8b,
+	0xf1, 0x13, 0xf9, 0xeb, 0x60, 0x11, 0xf8, 0xcc, 0x47, 0x5b, 0x31, 0x5e, 0xdb, 0x0a, 0x16, 0x63,
+	0x89, 0x36, 0xfe, 0x91, 0x03, 0x34, 0xa4, 0xde, 0x64, 0x60, 0x5f, 0xcf, 0xa9, 0xc7, 0x30, 0xfd,
+	0xcd, 0x92, 0x86, 0x0c, 0x21, 0xd0, 0x27, 0x34, 0x64, 0x55, 0xad, 0xae, 0x35, 0x8b, 0x58, 0xfc,
+	0x46, 0x06, 0x64, 0xed, 0x39, 0xab, 0x66, 0xea, 0x5a, 0x33, 0x8b, 0xf9, 0x4f, 0xf4, 0x7f, 0x90,
+	0xb7, 0xe7, 0x8c, 0xcc, 0x43, 0x9b, 0x55, 0x8b, 0x02, 0xde, 0xb4, 0xe7, 0xec, 0x2c, 0xb4, 0x19,
+	0x7a, 0x0f, 0x8a, 0x0b, 0xa9, 0x92, 0xcc, 0xec, 0x70, 0x56, 0xcd, 0x0a, 0x45, 0x05, 0x85, 0x9d,
+	0xda, 0xe1, 0x0c, 0x35, 0xc1, 0x98, 0x3a, 0x9e, 0xed, 0x92, 0xb1, 0xcb, 0x5e, 0x92, 0x09, 0x75,
+	0x99, 0x5d, 0xd5, 0xeb, 0x5a, 0x73, 0x03, 0x97, 0x05, 0xde, 0x76, 0xd9, 0xcb, 0x0e, 0x47, 0xd1,
+	0x23, 0xd8, 0x8e, 0x94, 0x05, 0xd2, 0xc0, 0xea, 0x46, 0x5d, 0x6b, 0x6e, 0xe1, 0xf2, 0x22, 0x6d,
+	0xf6, 0x23, 0xd8, 0x66, 0xce, 0x9c, 0xfa, 0x4b, 0x46, 0x42, 0x3a, 0xf6, 0xbd, 0x49, 0x58, 0xcd,
+	0x49, 0x8d, 0x0a, 0x1e, 0x4a, 0x14, 0x35, 0xa0, 0x34, 0xa5, 0x94, 0xb8, 0xce, 0xdc, 0x61, 0x84,
+	0x9b, 0xbf, 0x29, 0xcc, 0x2f, 0x4c, 0x29, 0xed, 0x72, 0x6c, 0x68, 0x33, 0xf4, 0x01, 0x94, 0x57,
+	0x1c, 0xb1, 0xc6, 0x92, 0x20, 0x15, 0x23, 0x92, 0x58, 0xe8, 0x01, 0x18, 0xfe, 0x92, 0x5d, 0xfa,
+	0x8e, 0x77, 0x49, 0xc6, 0x33, 0xdb, 0x23, 0xce, 0xa4, 0x9a, 0xaf, 0x6b, 0x4d, 0xfd, 0x58, 0xaf,
+	0x6a, 0x87, 0x1a, 0x2e, 0x47, 0xd2, 0xf6, 0xcc, 0xf6, 0xac, 0x09, 0x7a, 0x0c, 0x3b, 0x37, 0xf9,
+	0x61, 0xb5, 0x52, 0xcf, 0x36, 0x75, 0xbc, 0x9d, 0xa6, 0x86, 0xe8, 0x21, 0x6c, 0xbb, 0x76, 0xc8,
+	0xc8, 0xcc, 0x5f, 0x90, 0xc5, 0xf2, 0xe2, 0x8a, 0x5e, 0x57, 0xcb, 0x62, 0x1f, 0x4b, 0x1c, 0x3e,
+	0xf5, 0x17, 0x03, 0x01, 0xa2, 0x07, 0x00, 0x62, 0x0f, 0x85, 0xa9, 0xd5, 0x2d, 0xb1, 0xe2, 0x2d,
+	0x8e, 0x08, 0x33, 0xd1, 0x27, 0x50, 0x10, 0xbe, 0x27, 0x33, 0xc7, 0x63, 0x61, 0x15, 0xea, 0xd9,
+	0x66, 0xe1, 0xc8, 0x38, 0x70, 0x3d, 0x1e, 0x06, 0x98, 0x4b, 0x4e, 0x1d, 0x8f, 0x61, 0x08, 0xa2,
+	0x9f, 0x21, 0x9a, 0x40, 0x85, 0xfb, 0x9c, 0x8c, 0x97, 0x21, 0xf3, 0xe7, 0x24, 0xa0, 0x63, 0x3f,
+	0x98, 0x84, 0xd5, 0x82, 0x18, 0xfa, 0xe3, 0x83, 0x38, 0x94, 0x0e, 0x6e, 0xc7, 0xce, 0x41, 0x87,
+	0x86, 0xac, 0x2d, 0xc6, 0x61, 0x39, 0xcc, 0xf4, 0x58, 0x70, 0x8d, 0x77, 0x26, 0x37, 0x71, 0xf4,
+	0x11, 0x20, 0xdb, 0x75, 0xfd, 0x57, 0x24, 0xa4, 0xee, 0x94, 0x28, 0x5f, 0x56, 0xb7, 0xeb, 0x5a,
+	0x33, 0x8f, 0x0d, 0x21, 0x19, 0x52, 0x77, 0xaa, 0xd4, 0xa3, 0x9f, 0x40, 0x49, 0xd8, 0x34, 0xa5,
+	0x36, 0x5b, 0x06, 0x34, 0xac, 0x1a, 0xf5, 0x6c, 0xb3, 0x7c, 0xb4, 0xa3, 0x16, 0x72, 0x22, 0xe1,
+	0x63, 0x87, 0xe1, 0x22, 0xe7, 0xa9, 0xef, 0x10, 0xed, 0xc3, 0xd6, 0xdc, 0xfe, 0x81, 0x2c, 0xec,
+	0x80, 0x85, 0xd5, 0x9d, 0xba, 0xd6, 0x2c, 0xe1, 0xfc, 0xdc, 0xfe, 0x61, 0xc0, 0xbf, 0xd1, 0x01,
+	0x54, 0x3c, 0x9f, 0x38, 0xde, 0xd4, 0x75, 0x2e, 0x67, 0x8c, 0x2c, 0x17, 0x13, 0x9b, 0xd1, 0xb0,
+	0x8a, 0x84, 0x0d, 0x3b, 0x9e, 0x6f, 0x29, 0xc9, 0xb9, 0x14, 0xd4, 0x3a, 0x70, 0x6f, 0xfd, 0xfa,
+	0x78, 0x7a, 0x70, 0x07, 0xf1, 0x8c, 0xd1, 0x31, 0xff, 0x89, 0x76, 0x61, 0xe3, 0xa5, 0xed, 0x2e,
+	0xa9, 0x48, 0x99, 0x22, 0x96, 0x1f, 0x3f, 0xcf, 0x7c, 0xaa, 0x35, 0x66, 0x50, 0x19, 0x05, 0xf6,
+	0xf8, 0xea, 0x46, 0xd6, 0xdd, 0x4c, 0x1a, 0xed, 0x76, 0xd2, 0xdc, 0x61, 0x6f, 0xe6, 0x0e, 0x7b,
+	0x1b, 0x5f, 0xc2, 0xb6, 0xf0, 0xf0, 0x09, 0xa5, 0xaf, 0xcb, 0xed, 0x3d, 0xe0, 0x99, 0x2b, 0x32,
+	0x41, 0xe6, 0x77, 0xce, 0x9e, 0xf3, 0x24, 0x68, 0x4c, 0xc0, 0x58, 0x8d, 0x0f, 0x17, 0xbe, 0x17,
+	0x52, 0x9e, 0xb8, 0x3c, 0x00, 0x78, 0x04, 0xf3, 0x04, 0x11, 0xa9, 0xa1, 0x89, 0x51, 0x65, 0x85,
+	0x9f, 0x50, 0x2a, 0x92, 0xe3, 0xa1, 0xcc, 0x47, 0xe2, 0xfa, 0xe3, 0x2b, 0x9e, 0xe1, 0xf6, 0xb5,
+	0x52, 0x5f, 0xe2, 0x70, 0xd7, 0x1f, 0x5f, 0x75, 0x38, 0xd8, 0xf8, 0x5e, 0x16, 0xa1, 0x91, 0x2f,
+	0xe6, 0xfa, 0x0f, 0xb6, 0xa3, 0x01, 0x1b, 0x22, 0x16, 0x85, 0xda, 0xc2, 0x51, 0x31, 0x19, 0xd4,
+	0x58, 0x8a, 0x1a, 0xdf, 0x43, 0x25, 0xa5, 0x5c, 0xad, 0xa2, 0x06, 0xf9, 0x45, 0x40, 0x9d, 0xb9,
+	0x7d, 0x49, 0x95, 0xe6, 0xf8, 0x1b, 0x35, 0x61, 0x73, 0x6a, 0x3b, 0xee, 0x32, 0x88, 0x14, 0x97,
+	0xa3, 0x20, 0x93, 0x28, 0x8e, 0xc4, 0x8d, 0xfb, 0x50, 0xc3, 0x34, 0xa4, 0xec, 0xcc, 0x09, 0x43,
+	0xc7, 0xf7, 0xda, 0xbe, 0xc7, 0x02, 0xdf, 0x55, 0x2b, 0x68, 0x3c, 0x80, 0xfd, 0xb5, 0x52, 0x69,
+	0x02, 0x1f, 0xfc, 0xf5, 0x92, 0x06, 0xd7, 0xeb, 0x07, 0x7f, 0x0d, 0xfb, 0x6b, 0xa5, 0xca, 0xfe,
+	0x8f, 0x60, 0x63, 0x61, 0x3b, 0x01, 0xf7, 0x3d, 0x4f, 0xca, 0x7b, 0x89, 0xa4, 0x1c, 0xd8, 0x4e,
+	0x70, 0xea, 0x84, 0xcc, 0x0f, 0xae, 0xb1, 0x24, 0x3d, 0xd3, 0xf3, 0x9a, 0x91, 0x69, 0xfc, 0x5e,
+	0x83, 0x42, 0x42, 0xc8, 0x53, 0xc3, 0xf3, 0x27, 0x94, 0x4c, 0x03, 0x7f, 0x1e, 0x6d, 0x02, 0x07,
+	0x4e, 0x02, 0x7f, 0xce, 0x63, 0x42, 0x08, 0x99, 0xaf, 0x02, 0x38, 0xc7, 0x3f, 0x47, 0x3e, 0xfa,
+	0x18, 0x36, 0x67, 0x52, 0x81, 0x28, 0x9b, 0x85, 0xa3, 0xca, 0x8d, 0xb9, 0x3b, 0x36, 0xb3, 0x71,
+	0xc4, 0x79, 0xa6, 0xe7, 0xb3, 0x86, 0xfe, 0x4c, 0xcf, 0xeb, 0xc6, 0xc6, 0x33, 0x3d, 0xbf, 0x61,
+	0xe4, 0x9e, 0xe9, 0xf9, 0x9c, 0xb1, 0xd9, 0xf8, 0xbb, 0x06, 0xf9, 0x88, 0xcd, 0x2d, 0xe1, 0x5b,
+	0x4a, 0x78, 0x5c, 0xa8, 0x60, 0xca, 0x73, 0x60, 0xe4, 0xcc, 0x29, 0xaa, 0x43, 0x51, 0x08, 0xd3,
+	0x21, 0x0a, 0x1c, 0x6b, 0x89, 0x30, 0x15, 0xf5, 0x3c, 0x62, 0x88, 0x78, 0xd4, 0x55, 0x3d, 0x97,
+	0x94, 0xa8, 0x25, 0x85, 0xcb, 0xf1, 0x98, 0x86, 0xa1, 0x9c, 0x65, 0x43, 0x52, 0x14, 0x26, 0x26,
+	0x7a, 0x08, 0xdb, 0x11, 0x25, 0x9a, 0x2b, 0x27, 0xe3, 0x55, 0xc1, 0x6a, 0xba, 0x26, 0x18, 0x49,
+	0xde, 0x7c, 0xd5, 0x41, 0xca, 0x2b, 0x22, 0x9f, 0x54, 0x2e, 0xbe, 0xf1, 0x6b, 0xd8, 0x13, 0xae,
+	0x1c, 0x04, 0xfe, 0x85, 0x7d, 0xe1, 0xb8, 0x0e, 0xbb, 0x8e, 0x82, 0x9c, 0x2f, 0x3c, 0xf0, 0xe7,
+	0x84, 0xef, 0x6d, 0xe4, 0x02, 0x0e, 0xf4, 0xfc, 0x09, 0xe5, 0x2e, 0x60, 0xbe, 0x14, 0x29, 0x17,
+	0x30, 0x5f, 0x08, 0x92, 0x9d, 0x37, 0x9b, 0xea, 0xbc, 0x8d, 0x2b, 0xa8, 0xde, 0x9e, 0x4b, 0xc5,
+	0x4c, 0x1d, 0x0a, 0x8b, 0x15, 0x2c, 0xa6, 0xd3, 0x70, 0x12, 0x4a, 0xfa, 0x36, 0xf3, 0x66, 0xdf,
+	0x36, 0xfe, 0xa8, 0xc1, 0xce, 0xf1, 0xd2, 0x71, 0x27, 0xa9, 0xc4, 0x4d, 0x5a, 0xa7, 0xa5, 0xcf,
+	0x05, 0xeb, 0x9a, 0x7e, 0x66, 0x6d, 0xd3, 0xff, 0x68, 0x4d, 0x63, 0xcd, 0x8a, 0xc6, 0x9a, 0x59,
+	0xd3, 0x56, 0xdf, 0x85, 0xc2, 0xaa, 0x4b, 0x86, 0x55, 0xbd, 0x9e, 0x6d, 0x16, 0x31, 0xcc, 0xa2,
+	0x16, 0x19, 0x36, 0x3e, 0x05, 0x94, 0x34, 0x54, 0x6d, 0x48, 0x5c, 0x3f, 0xb4, 0xbb, 0xeb, 0xc7,
+	0x7d, 0xa8, 0x0d, 0x97, 0x17, 0xe1, 0x38, 0x70, 0x2e, 0xe8, 0x29, 0x73, 0xc7, 0xe6, 0x4b, 0xea,
+	0xb1, 0x30, 0xca, 0xd2, 0x7f, 0xea, 0xb0, 0x15, 0xa3, 0xbc, 0x3c, 0x3b, 0xde, 0xd8, 0x9f, 0x47,
+	0x46, 0x7b, 0xd4, 0xe5, 0x76, 0xcb, 0xa6, 0xb0, 0x13, 0x89, 0xda, 0x52, 0x62, 0x4d, 0x38, 0x3f,
+	0xb5, 0x48, 0xc5, 0xcf, 0x48, 0x7e, 0x72, 0x8d, 0x92, 0xdf, 0x04, 0x23, 0xd6, 0x3f, 0x63, 0xee,
+	0x38, 0xde, 0x14, 0x5c, 0x8e, 0x70, 0x6e, 0x8c, 0x64, 0xc6, 0x9a, 0x23, 0xa6, 0x2e, 0x99, 0x11,
+	0xae, 0x98, 0xef, 0x41, 0x91, 0xe7, 0x43, 0xc8, 0xec, 0xf9, 0x82, 0x78, 0xa1, 0xc8, 0x0b, 0x1d,
+	0x17, 0x62, 0xac, 0x17, 0xa2, 0x2f, 0x00, 0x28, 0x5f, 0x1f, 0x61, 0xd7, 0x0b, 0x2a, 0x52, 0xa2,
+	0x7c, 0xf4, 0x4e, 0x22, 0x30, 0xe2, 0x0d, 0x38, 0x10, 0xff, 0x8e, 0xae, 0x17, 0x14, 0x6f, 0xd1,
+	0xe8, 0x27, 0xfa, 0x12, 0x4a, 0x53, 0x3f, 0x78, 0x65, 0x07, 0x13, 0x22, 0x40, 0x55, 0x36, 0xf6,
+	0x12, 0x1a, 0x4e, 0xa4, 0x5c, 0x0c, 0x3f, 0x7d, 0x0b, 0x17, 0xa7, 0x89, 0x6f, 0xf4, 0x1c, 0x50,
+	0x34, 0x5e, 0x64, 0xb9, 0x54, 0x92, 0x17, 0x4a, 0xf6, 0x6f, 0x2b, 0xe1, 0x45, 0x3a, 0x52, 0x64,
+	0x4c, 0x6f, 0x60, 0xe8, 0x33, 0x28, 0x86, 0x94, 0x31, 0x97, 0x2a, 0x35, 0x5b, 0x42, 0xcd, 0xbd,
+	0xd4, 0x99, 0x86, 0x8b, 0x23, 0x0d, 0x85, 0x70, 0xf5, 0x89, 0x8e, 0x61, 0xdb, 0x75, 0xbc, 0xab,
+	0xa4, 0x19, 0x20, 0xc6, 0x57, 0x13, 0xe3, 0xbb, 0x8e, 0x77, 0x95, 0xb4, 0xa1, 0xe4, 0x26, 0x81,
+	0xc6, 0xe7, 0xb0, 0x15, 0xef, 0x12, 0x2a, 0xc0, 0xe6, 0x79, 0xef, 0x79, 0xaf, 0xff, 0x4d, 0xcf,
+	0x78, 0x0b, 0xe5, 0x41, 0x1f, 0x9a, 0xbd, 0x8e, 0xa1, 0x71, 0x18, 0x9b, 0x6d, 0xd3, 0x7a, 0x61,
+	0x1a, 0x19, 0xfe, 0x71, 0xd2, 0xc7, 0xdf, 0xb4, 0x70, 0xc7, 0xc8, 0x1e, 0x6f, 0xc2, 0x86, 0x98,
+	0xb7, 0xf1, 0x67, 0x0d, 0xf2, 0xc2, 0x83, 0xde, 0xd4, 0x47, 0xff, 0x0f, 0x71, 0x70, 0x89, 0xe2,
+	0xc6, 0x1b, 0xae, 0x88, 0xba, 0x12, 0x8e, 0x03, 0x66, 0xa4, 0x70, 0x4e, 0x8e, 0x43, 0x23, 0x26,
+	0x67, 0x24, 0x39, 0x12, 0xc4, 0xe4, 0xc7, 0x09, 0xcd, 0xa9, 0x92, 0xa3, 0xe3, 0xed, 0x48, 0x10,
+	0x55, 0xd8, 0xe4, 0xd9, 0x36, 0x55, 0x89, 0x13, 0x67, 0x5b, 0xc5, 0x6d, 0xfc, 0x14, 0x8a, 0x49,
+	0x9f, 0xa3, 0x47, 0xa0, 0x3b, 0xde, 0xd4, 0x57, 0x89, 0x58, 0xb9, 0x11, 0x5c, 0x7c, 0x91, 0x58,
+	0x10, 0x1a, 0x08, 0x8c, 0x9b, 0x7e, 0x6e, 0x94, 0xa0, 0x90, 0x70, 0x5a, 0xe3, 0x6f, 0x1a, 0x94,
+	0x52, 0x4e, 0xf8, 0xb7, 0xb5, 0xa3, 0x2f, 0xa0, 0xf8, 0xca, 0x09, 0x28, 0x49, 0xb6, 0xff, 0xf2,
+	0x51, 0x2d, 0xdd, 0xfe, 0xa3, 0xff, 0xdb, 0xfe, 0x84, 0xe2, 0x02, 0xe7, 0x2b, 0x00, 0xfd, 0x02,
+	0xca, 0x6a, 0x24, 0x99, 0x50, 0x66, 0x3b, 0xae, 0xd8, 0xaa, 0x72, 0x2a, 0x3c, 0x14, 0xb7, 0x23,
+	0xe4, 0xb8, 0x34, 0x4d, 0x7e, 0xa2, 0x0f, 0x57, 0x0a, 0x42, 0x16, 0x38, 0xde, 0xa5, 0xd8, 0xbf,
+	0xad, 0x98, 0x36, 0x14, 0x20, 0x6f, 0xe4, 0x25, 0x75, 0x78, 0x1c, 0x32, 0x9b, 0x2d, 0x43, 0xf4,
+	0x31, 0x6c, 0x84, 0xcc, 0x56, 0x95, 0xac, 0x9c, 0xca, 0xad, 0x04, 0x91, 0x62, 0xc9, 0x4a, 0x9d,
+	0x7e, 0x32, 0xb7, 0x4e, 0x3f, 0x1b, 0xbc, 0x62, 0xc8, 0x2a, 0x5a, 0x38, 0x42, 0x6a, 0xf1, 0xa7,
+	0xa3, 0x6e, 0xbb, 0xc5, 0x18, 0x9d, 0x2f, 0x18, 0x96, 0x04, 0xd5, 0xdd, 0xbe, 0x04, 0x68, 0x3b,
+	0xc1, 0x78, 0xe9, 0xb0, 0xe7, 0xf4, 0x9a, 0xf7, 0xac, 0xa8, 0x5c, 0xcb, 0xb2, 0x97, 0x1b, 0xcb,
+	0x12, 0xbd, 0x07, 0x9b, 0x51, 0x21, 0x92, 0xf5, 0x2d, 0x37, 0x13, 0x05, 0xa8, 0xf1, 0x07, 0x1d,
+	0xf6, 0x95, 0x4b, 0xa5, 0x37, 0x18, 0x0d, 0xc6, 0x74, 0x11, 0x1f, 0x8b, 0x9f, 0xc2, 0xee, 0xaa,
+	0xa8, 0xca, 0x89, 0x48, 0x74, 0xd4, 0x2e, 0x1c, 0xbd, 0x9d, 0x58, 0xe9, 0xca, 0x0c, 0x8c, 0xe2,
+	0x62, 0xbb, 0x32, 0xed, 0x30, 0xa1, 0xc8, 0x9e, 0xfb, 0x4b, 0x4f, 0x85, 0xa8, 0xac, 0x78, 0x68,
+	0x15, 0xce, 0x5c, 0x24, 0x22, 0xfa, 0x11, 0xc4, 0x41, 0x4e, 0xe8, 0x0f, 0x0b, 0x27, 0xb8, 0x16,
+	0xd5, 0xaf, 0xb4, 0x2a, 0xb7, 0xa6, 0x40, 0x6f, 0x9d, 0x55, 0x33, 0xb7, 0xcf, 0xaa, 0x9f, 0x41,
+	0x2d, 0xce, 0x0e, 0x75, 0x8d, 0xa5, 0x93, 0xb8, 0xb5, 0x6d, 0x0a, 0x1b, 0xf6, 0x22, 0x06, 0x8e,
+	0x08, 0xaa, 0xbf, 0x1d, 0xc2, 0x6e, 0x22, 0xb5, 0x56, 0xa6, 0xcb, 0x4c, 0x44, 0xab, 0xec, 0x4a,
+	0x9a, 0x1e, 0x8f, 0x50, 0xa6, 0xeb, 0xd2, 0xf4, 0x08, 0x56, 0xa6, 0xff, 0x0a, 0xca, 0x37, 0xae,
+	0x79, 0x79, 0xe1, 0xf7, 0x9f, 0xdd, 0xae, 0xac, 0xeb, 0xdc, 0x73, 0xb0, 0xe6, 0xae, 0x57, 0x1a,
+	0x27, 0xb1, 0xda, 0x57, 0x80, 0xfe, 0xcb, 0x0b, 0xd3, 0x5f, 0x34, 0xb8, 0xbf, 0xde, 0x06, 0xd5,
+	0xc8, 0xff, 0x67, 0x31, 0xf2, 0x19, 0xe4, 0xec, 0x31, 0x73, 0x7c, 0x4f, 0xa5, 0xfe, 0xfb, 0x89,
+	0xa1, 0x98, 0x86, 0xbe, 0xfb, 0x92, 0x9e, 0xfa, 0xee, 0x44, 0x19, 0xd3, 0x12, 0x54, 0xac, 0x86,
+	0xa4, 0xb2, 0x2a, 0x9b, 0xce, 0xaa, 0xc7, 0xbf, 0xd5, 0xa1, 0x94, 0x4a, 0xfd, 0x74, 0xed, 0x2f,
+	0xc1, 0x56, 0xaf, 0x4f, 0x3a, 0xe6, 0xa8, 0x65, 0x75, 0x0d, 0x0d, 0x19, 0x50, 0xec, 0xf7, 0xac,
+	0x7e, 0x8f, 0x74, 0xcc, 0x76, 0xbf, 0xc3, 0xbb, 0xc0, 0xdb, 0xb0, 0xd3, 0xb5, 0x7a, 0xcf, 0x49,
+	0xaf, 0x3f, 0x22, 0x66, 0xd7, 0x7a, 0x6a, 0x1d, 0x77, 0x4d, 0x23, 0x8b, 0x76, 0xc1, 0xe8, 0xf7,
+	0x48, 0xfb, 0xb4, 0x65, 0xf5, 0xc8, 0xc8, 0x3a, 0x33, 0xfb, 0xe7, 0x23, 0x43, 0xe7, 0x28, 0x4f,
+	0x57, 0x62, 0x7e, 0xdb, 0x36, 0xcd, 0xce, 0x90, 0x9c, 0xb5, 0xbe, 0x35, 0x36, 0x50, 0x15, 0x76,
+	0xad, 0xde, 0xf0, 0xfc, 0xe4, 0xc4, 0x6a, 0x5b, 0x66, 0x6f, 0x44, 0x8e, 0x5b, 0xdd, 0x56, 0xaf,
+	0x6d, 0x1a, 0x39, 0x74, 0x0f, 0x90, 0xd5, 0x6b, 0xf7, 0xcf, 0x06, 0x5d, 0x73, 0x64, 0x92, 0xa8,
+	0xdb, 0x6c, 0xa2, 0x0a, 0x6c, 0x0b, 0x3d, 0xad, 0x4e, 0x87, 0x9c, 0xb4, 0xac, 0xae, 0xd9, 0x31,
+	0xf2, 0xdc, 0x12, 0xc5, 0x18, 0x92, 0x8e, 0x35, 0x6c, 0x1d, 0x73, 0x78, 0x8b, 0xcf, 0x69, 0xf5,
+	0x5e, 0xf4, 0xad, 0xb6, 0x49, 0xda, 0x5c, 0x2d, 0x47, 0x81, 0x93, 0x23, 0xf4, 0xbc, 0xd7, 0x31,
+	0xf1, 0xa0, 0x65, 0x75, 0x8c, 0x02, 0xda, 0x87, 0xbd, 0x08, 0x36, 0xbf, 0x1d, 0x58, 0xf8, 0x3b,
+	0x32, 0xea, 0xf7, 0xc9, 0xb0, 0xdf, 0xef, 0x19, 0xc5, 0xa4, 0x26, 0xbe, 0xda, 0xfe, 0xc0, 0xec,
+	0x19, 0x25, 0xb4, 0x07, 0x95, 0xb3, 0xc1, 0x80, 0x44, 0x92, 0x68, 0xb1, 0x65, 0x4e, 0x6f, 0x75,
+	0x3a, 0xd8, 0x1c, 0x0e, 0xc9, 0x99, 0x35, 0x3c, 0x6b, 0x8d, 0xda, 0xa7, 0xc6, 0x36, 0x5f, 0xd2,
+	0xd0, 0x1c, 0x91, 0x51, 0x7f, 0xd4, 0xea, 0xae, 0x70, 0x83, 0x1b, 0xb4, 0xc2, 0xf9, 0xa4, 0xdd,
+	0xfe, 0x37, 0xc6, 0x0e, 0xdf, 0x70, 0x0e, 0xf7, 0x5f, 0x28, 0x13, 0x11, 0x5f, 0xbb, 0x72, 0x4f,
+	0x34, 0xa7, 0x51, 0xe1, 0xa0, 0xd5, 0x7b, 0xd1, 0xea, 0x5a, 0x1d, 0xf2, 0xdc, 0xfc, 0x4e, 0x74,
+	0xeb, 0x5d, 0x0e, 0x4a, 0xcb, 0xc8, 0x00, 0xf7, 0x9f, 0x72, 0x43, 0x8c, 0xb7, 0x11, 0x82, 0x72,
+	0xdb, 0xc2, 0xed, 0xf3, 0x6e, 0x0b, 0x13, 0xdc, 0x3f, 0x1f, 0x99, 0xc6, 0xbd, 0xc7, 0x7f, 0xd2,
+	0xa0, 0x98, 0xac, 0xc6, 0xdc, 0xeb, 0x56, 0x8f, 0x9c, 0x74, 0xad, 0xa7, 0xa7, 0x23, 0x19, 0x04,
+	0xc3, 0xf3, 0x36, 0x77, 0x99, 0xc9, 0x4f, 0x01, 0x08, 0xca, 0x72, 0xd3, 0xe3, 0xc5, 0x66, 0xf8,
+	0x5c, 0x0a, 0xeb, 0xf5, 0x95, 0xde, 0x2c, 0x37, 0x5e, 0x81, 0x26, 0xc6, 0x7d, 0x6c, 0xe8, 0xe8,
+	0x03, 0xa8, 0x2b, 0x84, 0xfb, 0x15, 0x63, 0xb3, 0x3d, 0x22, 0x83, 0xd6, 0x77, 0x67, 0xdc, 0xed,
+	0x32, 0xc8, 0x86, 0xc6, 0x06, 0x7a, 0x17, 0xf6, 0x63, 0xd6, 0xba, 0xb8, 0x78, 0xfc, 0x39, 0x54,
+	0xef, 0x0a, 0x7a, 0x04, 0x90, 0x1b, 0x9a, 0xa3, 0x51, 0xd7, 0x94, 0x27, 0x97, 0x13, 0x19, 0xb8,
+	0x00, 0x39, 0x6c, 0x0e, 0xcf, 0xcf, 0x4c, 0x23, 0x73, 0xf4, 0xd7, 0x3c, 0xe4, 0xc4, 0x51, 0x3a,
+	0x40, 0x5f, 0x41, 0x29, 0xf1, 0x54, 0xf4, 0xe2, 0x08, 0x3d, 0x78, 0xed, 0x23, 0x52, 0x2d, 0xba,
+	0x70, 0x2b, 0xf8, 0x50, 0x43, 0xc7, 0x50, 0x4e, 0xbe, 0x99, 0xbc, 0x38, 0x42, 0xc9, 0x13, 0xe8,
+	0x9a, 0xe7, 0x94, 0x35, 0x3a, 0x9e, 0x83, 0x61, 0x86, 0xcc, 0x99, 0xf3, 0x46, 0xa8, 0x5e, 0x35,
+	0x50, 0x2d, 0x99, 0xe0, 0xe9, 0xa7, 0x92, 0xda, 0xfe, 0x5a, 0x99, 0x2a, 0x39, 0x5f, 0xf3, 0x43,
+	0x47, 0xfc, 0xae, 0x70, 0x6b, 0x41, 0xe9, 0xc7, 0x8c, 0xda, 0x3b, 0x77, 0x89, 0xd5, 0x5b, 0x40,
+	0xf6, 0x77, 0x19, 0xbe, 0xc6, 0x52, 0x42, 0xb6, 0x66, 0x97, 0x6e, 0x28, 0x5d, 0xd3, 0x9a, 0xd1,
+	0x04, 0x2a, 0x6b, 0xde, 0x1c, 0xd0, 0x87, 0xe9, 0x3a, 0x76, 0xc7, 0x8b, 0x45, 0xed, 0xe1, 0x9b,
+	0x68, 0x6a, 0xf1, 0x13, 0xa8, 0xac, 0x79, 0x9c, 0x48, 0xcd, 0x72, 0xf7, 0xd3, 0x46, 0x6a, 0x96,
+	0xd7, 0xbd, 0x71, 0x7c, 0x0f, 0xc6, 0xcd, 0xbb, 0x2c, 0x6a, 0xdc, 0x1c, 0x7b, 0xfb, 0x52, 0x5d,
+	0x7b, 0xff, 0xb5, 0x1c, 0xa5, 0xdc, 0x02, 0x58, 0xdd, 0x08, 0xd1, 0xfd, 0xc4, 0x90, 0x5b, 0x37,
+	0xda, 0xda, 0x83, 0x3b, 0xa4, 0x4a, 0xd5, 0x08, 0x2a, 0x6b, 0xae, 0x88, 0xa9, 0xdd, 0xb8, 0xfb,
+	0x0a, 0x59, 0xdb, 0x5d, 0x77, 0x93, 0x3a, 0xd4, 0xd0, 0x99, 0x0c, 0xb0, 0xe8, 0xfd, 0xf3, 0x0d,
+	0x19, 0x53, 0x5d, 0x7f, 0xe2, 0x5b, 0x86, 0x22, 0xb4, 0x0e, 0x35, 0xd4, 0x87, 0x62, 0x32, 0x4b,
+	0xde, 0x98, 0x3e, 0x6f, 0x54, 0x38, 0x85, 0xed, 0x54, 0x33, 0xf6, 0x03, 0xf4, 0xe8, 0x8d, 0x67,
+	0x06, 0xb9, 0x63, 0xa9, 0x08, 0x78, 0xcd, 0xe1, 0xa2, 0xa9, 0x1d, 0x6a, 0xc7, 0x9f, 0xfc, 0xf2,
+	0xc9, 0xa5, 0xc3, 0x66, 0xcb, 0x8b, 0x83, 0xb1, 0x3f, 0x7f, 0x22, 0x9e, 0x37, 0x3d, 0xc7, 0xbb,
+	0xf4, 0x28, 0x7b, 0xe5, 0x07, 0x57, 0x4f, 0x5c, 0x6f, 0xf2, 0x44, 0xa4, 0xc1, 0x93, 0x58, 0xe5,
+	0x45, 0x4e, 0xfc, 0x75, 0xe3, 0x47, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x9f, 0xe0, 0x07,
+	0x0d, 0x19, 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 ef03b0fa..30ab825e 100644
--- a/lnrpc/routerrpc/router.proto
+++ b/lnrpc/routerrpc/router.proto
@@ -628,6 +628,9 @@ message ForwardHtlcInterceptRequest {
 
     // The outgoing htlc expiry.
     uint32 outgoing_expiry = 4;
+
+    // Any custom records that were present in the payload.
+    map<uint64, bytes> custom_records = 8;
 }
 
 /**
diff --git a/lnrpc/routerrpc/router.swagger.json b/lnrpc/routerrpc/router.swagger.json
index 16a0a0af..ed500d1d 100644
--- a/lnrpc/routerrpc/router.swagger.json
+++ b/lnrpc/routerrpc/router.swagger.json
@@ -936,6 +936,14 @@
           "type": "integer",
           "format": "int64",
           "description": "The outgoing htlc expiry."
+        },
+        "custom_records": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string",
+            "format": "byte"
+          },
+          "description": "Any custom records that were present in the payload."
         }
       }
     },
diff --git a/lntest/itest/lnd_forward_interceptor_test.go b/lntest/itest/lnd_forward_interceptor_test.go
index e85c18ac..95b49dae 100644
--- a/lntest/itest/lnd_forward_interceptor_test.go
+++ b/lntest/itest/lnd_forward_interceptor_test.go
@@ -21,6 +21,11 @@ import (
 	"google.golang.org/grpc/status"
 )
 
+var (
+	customTestKey   uint64 = 394829
+	customTestValue        = []byte{1, 3, 5}
+)
+
 type interceptorTestCase struct {
 	amountMsat        int64
 	invoice           *lnrpc.Invoice
@@ -149,6 +154,10 @@ func testForwardInterceptor(net *lntest.NetworkHarness, t *harnessTest) {
 				request.IncomingAmountMsat,
 			)
 
+			value, ok := request.CustomRecords[customTestKey]
+			require.True(t.t, ok, "expected custom record")
+			require.Equal(t.t, customTestValue, value)
+
 			testCase := testCases[i]
 
 			// For held packets we ignore, keeping them in hold status.
@@ -369,6 +378,11 @@ func (c *interceptorTestContext) sendAliceToCarolPayment(ctx context.Context,
 		Route:       route,
 	}
 
+	// Send a custom record to the forwarding node.
+	route.Hops[0].CustomRecords = map[uint64][]byte{
+		customTestKey: customTestValue,
+	}
+
 	// Send the payment.
 	return c.alice.RouterClient.SendToRouteV2(ctx, sendReq)
 }