From de1a3e1436e824678ce271b6681307d166057daf Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Thu, 27 Oct 2016 19:41:42 -0700 Subject: [PATCH] lnrpc: convert all instances of lightning_id to regular compressed pubkeys This commit modifies a few of the RPC call which previously took a lightning_id as their paramter to instead take a compressed public key field. With this change must of the code within the daemon can be simplified as we only use public keys everywhere throuhgout the daemon. Signed-off-by: Olaoluwa Osuntokun --- lnrpc/rpc.pb.go | 286 ++++++++++++++++++++--------------------- lnrpc/rpc.proto | 7 +- lnrpc/rpc.swagger.json | 16 +-- 3 files changed, 151 insertions(+), 158 deletions(-) diff --git a/lnrpc/rpc.pb.go b/lnrpc/rpc.pb.go index 297ea9aa..6658f7bc 100644 --- a/lnrpc/rpc.pb.go +++ b/lnrpc/rpc.pb.go @@ -202,8 +202,8 @@ func (*ChannelPoint) ProtoMessage() {} func (*ChannelPoint) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } type LightningAddress struct { - PubKeyHash string `protobuf:"bytes,1,opt,name=pubKeyHash" json:"pubKeyHash,omitempty"` - Host string `protobuf:"bytes,2,opt,name=host" json:"host,omitempty"` + Pubkey string `protobuf:"bytes,1,opt,name=pubkey" json:"pubkey,omitempty"` + Host string `protobuf:"bytes,2,opt,name=host" json:"host,omitempty"` } func (m *LightningAddress) Reset() { *m = LightningAddress{} } @@ -416,7 +416,6 @@ func (*GetInfoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, [] type GetInfoResponse struct { LightningId string `protobuf:"bytes,1,opt,name=lightning_id" json:"lightning_id,omitempty"` - IdentityAddress string `protobuf:"bytes,2,opt,name=identity_address" json:"identity_address,omitempty"` IdentityPubkey string `protobuf:"bytes,3,opt,name=identity_pubkey" json:"identity_pubkey,omitempty"` NumPendingChannels uint32 `protobuf:"varint,4,opt,name=num_pending_channels" json:"num_pending_channels,omitempty"` NumActiveChannels uint32 `protobuf:"varint,5,opt,name=num_active_channels" json:"num_active_channels,omitempty"` @@ -646,7 +645,7 @@ func (*PendingUpdate) Descriptor() ([]byte, []int) { return fileDescriptor0, []i type OpenChannelRequest struct { TargetPeerId int32 `protobuf:"varint,1,opt,name=target_peer_id" json:"target_peer_id,omitempty"` - TargetNode []byte `protobuf:"bytes,2,opt,name=target_node,proto3" json:"target_node,omitempty"` + NodePubkey []byte `protobuf:"bytes,2,opt,name=node_pubkey,proto3" json:"node_pubkey,omitempty"` LocalFundingAmount int64 `protobuf:"varint,3,opt,name=local_funding_amount" json:"local_funding_amount,omitempty"` RemoteFundingAmount int64 `protobuf:"varint,4,opt,name=remote_funding_amount" json:"remote_funding_amount,omitempty"` CommissionSize int64 `protobuf:"varint,5,opt,name=commission_size" json:"commission_size,omitempty"` @@ -837,7 +836,7 @@ func (m *PendingChannelResponse) GetPendingChannels() []*PendingChannelResponse_ type PendingChannelResponse_PendingChannel struct { PeerId int32 `protobuf:"varint,1,opt,name=peer_id" json:"peer_id,omitempty"` - LightningId string `protobuf:"bytes,2,opt,name=lightning_id" json:"lightning_id,omitempty"` + IdentityKey string `protobuf:"bytes,2,opt,name=identity_key" json:"identity_key,omitempty"` ChannelPoint string `protobuf:"bytes,3,opt,name=channel_point" json:"channel_point,omitempty"` Capacity int64 `protobuf:"varint,4,opt,name=capacity" json:"capacity,omitempty"` LocalBalance int64 `protobuf:"varint,5,opt,name=local_balance" json:"local_balance,omitempty"` @@ -1923,144 +1922,143 @@ var _Lightning_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("rpc.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 2213 bytes of a gzipped FileDescriptorProto + // 2204 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0x49, 0x6f, 0x1c, 0xc7, - 0x15, 0x56, 0x73, 0xb8, 0xcc, 0xbc, 0x59, 0x38, 0x53, 0xdc, 0x86, 0x4d, 0x4a, 0x96, 0x2b, 0xb2, - 0x41, 0x13, 0x32, 0x69, 0xd1, 0x01, 0x12, 0xd8, 0x88, 0x03, 0x8a, 0x66, 0x4c, 0xc1, 0x34, 0x45, - 0x9b, 0x94, 0x85, 0x6c, 0x68, 0x37, 0x67, 0x8a, 0x64, 0x9b, 0x3d, 0xdd, 0x9d, 0xe9, 0x1e, 0x52, - 0x8c, 0xa1, 0x4b, 0x0e, 0xf9, 0x03, 0x01, 0x82, 0x00, 0x01, 0x72, 0x0e, 0x82, 0x20, 0xc8, 0xff, - 0xc8, 0x2d, 0x39, 0xe5, 0x9e, 0x1f, 0x92, 0x57, 0x5b, 0x77, 0xf5, 0x22, 0x01, 0x3a, 0xf8, 0x44, - 0xf6, 0xab, 0xaa, 0xb7, 0x7c, 0x6f, 0x1f, 0x68, 0x8c, 0xa3, 0xc1, 0x56, 0x34, 0x0e, 0x93, 0x90, - 0xcc, 0xf8, 0x01, 0x7e, 0xd8, 0xeb, 0x17, 0x61, 0x78, 0xe1, 0xb3, 0x6d, 0x37, 0xf2, 0xb6, 0xdd, - 0x20, 0x08, 0x13, 0x37, 0xf1, 0xc2, 0x20, 0x96, 0x97, 0xe8, 0x9f, 0x2d, 0x68, 0x9e, 0x8e, 0xdd, - 0x20, 0x76, 0x07, 0x9c, 0x4c, 0xe6, 0x61, 0x2e, 0x79, 0xe1, 0x5c, 0xba, 0xf1, 0x65, 0xdf, 0xba, - 0x6f, 0x6d, 0x34, 0x48, 0x07, 0x66, 0xdd, 0x51, 0x38, 0x09, 0x92, 0xfe, 0x14, 0x7e, 0x5b, 0x64, - 0x15, 0x7a, 0xc1, 0x64, 0xe4, 0x0c, 0xc2, 0xe0, 0xdc, 0x1b, 0x8f, 0x24, 0xaf, 0x7e, 0x0d, 0x8f, - 0x66, 0x08, 0x01, 0x38, 0xf3, 0xc3, 0xc1, 0x95, 0x7c, 0x3e, 0x2d, 0x9e, 0x2f, 0x42, 0x4b, 0xd1, - 0x98, 0x77, 0x71, 0x99, 0xf4, 0x67, 0xf4, 0xcd, 0xc4, 0x1b, 0x31, 0x27, 0x4e, 0xdc, 0x51, 0xd4, - 0x9f, 0x45, 0x5a, 0x4d, 0xd0, 0x50, 0x39, 0xdf, 0x39, 0x67, 0x2c, 0xee, 0xcf, 0x71, 0x1a, 0xed, - 0xc3, 0xf2, 0x67, 0x2c, 0x31, 0xf4, 0x8b, 0xbf, 0x62, 0xbf, 0x99, 0xb0, 0x38, 0xa1, 0x9f, 0x00, - 0x31, 0xc8, 0x9f, 0xb2, 0xc4, 0xf5, 0xfc, 0x98, 0x6c, 0x40, 0x2b, 0x31, 0x2e, 0xa3, 0x09, 0xb5, - 0x8d, 0xe6, 0x0e, 0xd9, 0x12, 0x48, 0x6c, 0x19, 0x0f, 0xe8, 0x97, 0xd0, 0x3c, 0x61, 0xc1, 0x50, - 0xb1, 0x23, 0x2d, 0x98, 0x1e, 0xe2, 0x5f, 0x61, 0x73, 0x8b, 0x34, 0xa1, 0xe6, 0x8e, 0xa4, 0xc1, - 0x35, 0x6e, 0x41, 0xe4, 0xde, 0x8e, 0x58, 0x90, 0x48, 0xbb, 0x6a, 0xe2, 0x4a, 0x0f, 0x1a, 0xe7, - 0x6e, 0x9c, 0x38, 0x31, 0x32, 0x11, 0xa6, 0xd6, 0x69, 0x07, 0x5a, 0x92, 0x65, 0x1c, 0xa1, 0x6c, - 0x46, 0x4f, 0xa1, 0xb5, 0x77, 0x89, 0x88, 0x33, 0xff, 0x38, 0xf4, 0x82, 0x84, 0x33, 0x3a, 0x9f, - 0x04, 0x43, 0x2f, 0xb8, 0x70, 0x92, 0x17, 0xde, 0x50, 0xc9, 0xea, 0x43, 0xd7, 0xa4, 0x22, 0x24, - 0x63, 0x21, 0x58, 0x40, 0x17, 0x4e, 0x92, 0x68, 0x92, 0x38, 0x5e, 0x30, 0x64, 0x2f, 0x84, 0xe0, - 0x36, 0xfd, 0x21, 0x74, 0x0f, 0x39, 0x92, 0x01, 0xbe, 0xd8, 0x1d, 0x0e, 0xc7, 0x2c, 0x8e, 0x39, - 0x74, 0xd1, 0xe4, 0xec, 0x73, 0x76, 0x7b, 0x90, 0xf9, 0x0d, 0x2d, 0xba, 0x0c, 0x63, 0x69, 0x44, - 0x83, 0xfe, 0xde, 0x82, 0x79, 0xae, 0xdc, 0x17, 0x6e, 0x70, 0xab, 0x6d, 0xfe, 0x04, 0x5a, 0x9c, - 0xc1, 0x69, 0xb8, 0x2b, 0xfd, 0x2b, 0xc1, 0xda, 0x50, 0x60, 0x15, 0x6e, 0x6f, 0x99, 0x57, 0xf7, - 0x83, 0x64, 0x7c, 0x6b, 0x7f, 0x08, 0xbd, 0x12, 0x91, 0x43, 0x77, 0xc5, 0x6e, 0x95, 0x0e, 0x6d, - 0x98, 0xb9, 0x76, 0xfd, 0x09, 0x93, 0x48, 0x7e, 0x34, 0xf5, 0x63, 0x8b, 0xde, 0x87, 0x6e, 0xc6, - 0x59, 0x02, 0xc5, 0x55, 0x4d, 0x01, 0x69, 0xd0, 0x0f, 0xe4, 0x8d, 0x3d, 0xc4, 0x2c, 0x36, 0xdc, - 0xe3, 0xa2, 0xa8, 0xca, 0x90, 0xac, 0xd1, 0xb7, 0xa1, 0x67, 0xbc, 0xa8, 0x64, 0xfa, 0x27, 0x0b, - 0x7a, 0x47, 0xec, 0x46, 0x01, 0xa6, 0xd9, 0xee, 0xe0, 0x9d, 0xdb, 0x88, 0x89, 0x3b, 0x9d, 0x9d, - 0x07, 0xca, 0xf2, 0xd2, 0xbd, 0x2d, 0xf5, 0x79, 0x8a, 0x77, 0xe9, 0x53, 0x68, 0x1a, 0x9f, 0x64, - 0x05, 0x16, 0x9e, 0x3f, 0x39, 0x3d, 0xda, 0x3f, 0x39, 0x71, 0x8e, 0x9f, 0x3d, 0xfe, 0x7c, 0xff, - 0xe7, 0xce, 0xc1, 0xee, 0xc9, 0x41, 0xf7, 0x0e, 0x59, 0x06, 0x82, 0xd4, 0xd3, 0xfd, 0x4f, 0x73, - 0x74, 0x0b, 0x13, 0xac, 0x69, 0x12, 0xa6, 0xa8, 0x0d, 0x7d, 0x94, 0xf8, 0xdc, 0x4b, 0x02, 0xe4, - 0x99, 0x17, 0x4c, 0xdf, 0x41, 0x26, 0x86, 0x36, 0xca, 0x34, 0xcc, 0x51, 0x57, 0x92, 0x94, 0x75, - 0x1f, 0x03, 0xd9, 0x0b, 0x31, 0xd0, 0x06, 0xc9, 0x31, 0x63, 0x63, 0x6d, 0xdd, 0x3b, 0x06, 0x68, - 0xcd, 0x9d, 0x15, 0x65, 0x5d, 0x31, 0x78, 0xe8, 0xbb, 0xb0, 0x90, 0x7b, 0x9c, 0x09, 0x89, 0xf0, - 0xdb, 0x51, 0x10, 0xce, 0xd0, 0x08, 0xa6, 0x0f, 0x4e, 0x0f, 0xf7, 0x48, 0x17, 0xea, 0x5e, 0x30, - 0x08, 0x47, 0xc8, 0x42, 0x9c, 0xd4, 0x8b, 0xfe, 0xe0, 0xb9, 0xc1, 0x33, 0xc5, 0xe1, 0x79, 0xaf, - 0xd2, 0x05, 0xab, 0x06, 0x7b, 0x11, 0x79, 0x63, 0x51, 0x2f, 0x74, 0x2d, 0xe0, 0x69, 0xd3, 0xe6, - 0x09, 0x30, 0x66, 0xd7, 0xe1, 0x40, 0x1e, 0x0d, 0x99, 0xef, 0xde, 0x8a, 0x2a, 0xd1, 0xa6, 0xff, - 0xb6, 0xa0, 0xbd, 0x8b, 0xe9, 0x7a, 0xcd, 0x54, 0x1e, 0x91, 0x25, 0x68, 0x8f, 0xd9, 0x28, 0x4c, - 0x98, 0x83, 0xf1, 0x9e, 0xc5, 0x19, 0x92, 0x07, 0xf2, 0x86, 0x13, 0xf1, 0x54, 0x53, 0x09, 0x84, - 0x9a, 0x0e, 0xdc, 0xc8, 0x1d, 0x78, 0xc9, 0xad, 0x50, 0xa3, 0xc6, 0x2f, 0xa2, 0x52, 0x58, 0x63, - 0xce, 0x5c, 0xdf, 0x0d, 0x06, 0x4c, 0xa8, 0x50, 0x43, 0x5f, 0x75, 0x14, 0x5b, 0x4d, 0x9f, 0x11, - 0x74, 0xd4, 0x7a, 0x82, 0x58, 0x24, 0x89, 0xcf, 0x86, 0xe9, 0x91, 0xac, 0x56, 0x14, 0xda, 0x11, - 0x93, 0x69, 0x7b, 0x99, 0xf8, 0x03, 0x5e, 0xb0, 0x78, 0xf6, 0x34, 0x15, 0xca, 0x02, 0xa9, 0x05, - 0x68, 0xf2, 0x52, 0x39, 0x89, 0x86, 0x6e, 0x82, 0x25, 0xad, 0x8e, 0x0f, 0xa7, 0xe9, 0x12, 0x2c, - 0x1c, 0x7a, 0x71, 0xa2, 0x2c, 0x32, 0xea, 0xd9, 0x62, 0x9e, 0xac, 0xdc, 0xf0, 0x2e, 0xda, 0xa0, - 0x68, 0xfd, 0x86, 0x10, 0xb1, 0xa8, 0x44, 0xe4, 0x90, 0xa1, 0x7f, 0xb4, 0x60, 0x9a, 0xfb, 0x4f, - 0xf8, 0x6d, 0x72, 0xe6, 0x64, 0xe0, 0x18, 0x8e, 0x9c, 0x12, 0xc5, 0xd7, 0x08, 0x9f, 0x9a, 0xb8, - 0xc1, 0xeb, 0xf6, 0x2d, 0x6a, 0xc8, 0x8b, 0x99, 0xf4, 0xca, 0x74, 0x46, 0x1b, 0xb3, 0xc1, 0xb5, - 0x80, 0x63, 0x9a, 0xe3, 0x19, 0xbb, 0x89, 0xbc, 0x25, 0x51, 0x50, 0x14, 0x71, 0x47, 0x54, 0x6c, - 0xce, 0xdc, 0x0b, 0xce, 0x30, 0x18, 0x86, 0xc2, 0xde, 0x3a, 0x25, 0xbc, 0x5e, 0xc5, 0x22, 0xb6, - 0x52, 0x63, 0xb7, 0xa1, 0x67, 0xd0, 0x94, 0xa5, 0x36, 0xcc, 0x70, 0x3d, 0x75, 0xd1, 0xd6, 0x48, - 0xf2, 0x4b, 0xb4, 0x0b, 0x1d, 0xec, 0x03, 0x4f, 0x82, 0xf3, 0x50, 0xb3, 0xf8, 0x2b, 0x16, 0xb4, - 0x94, 0xa4, 0x38, 0x60, 0xc1, 0xf4, 0x75, 0x74, 0xeb, 0xb8, 0x6d, 0xf0, 0xf8, 0xf2, 0x86, 0xa8, - 0x32, 0x46, 0x81, 0xa3, 0xed, 0x96, 0xf1, 0xb1, 0x02, 0xf3, 0xe9, 0x89, 0x8a, 0x27, 0x09, 0xc8, - 0x3a, 0x2c, 0x72, 0xc7, 0x69, 0x07, 0xa7, 0x0e, 0x90, 0x01, 0xbb, 0x06, 0x0b, 0xfc, 0xd4, 0x15, - 0xf8, 0x67, 0x87, 0x22, 0x66, 0x79, 0xec, 0xcb, 0xa7, 0xdc, 0x92, 0x59, 0x11, 0xc6, 0xcf, 0x44, - 0x76, 0xa6, 0xdd, 0xf2, 0x99, 0x08, 0x07, 0x7e, 0x51, 0x36, 0xc6, 0xf8, 0xd2, 0x55, 0xad, 0xa0, - 0xd8, 0x2b, 0xa5, 0xbb, 0x30, 0x38, 0x75, 0xc3, 0x8d, 0x1d, 0x9f, 0x9d, 0x27, 0xaa, 0x11, 0xfc, - 0x14, 0x7a, 0xca, 0xf9, 0x4f, 0x51, 0x51, 0xc5, 0x75, 0xb3, 0x98, 0x09, 0x32, 0xf9, 0x17, 0x14, - 0x98, 0x66, 0x3f, 0x12, 0x55, 0x43, 0x7e, 0xef, 0xf9, 0x61, 0xcc, 0x14, 0x07, 0x54, 0x62, 0x80, - 0x9f, 0x85, 0x2e, 0x85, 0x6e, 0x8d, 0x27, 0x83, 0x81, 0xc6, 0xae, 0x4e, 0x87, 0x58, 0x35, 0xf8, - 0x2b, 0xc5, 0x41, 0xd7, 0x9c, 0x37, 0x90, 0x9f, 0x0e, 0x01, 0xbe, 0x37, 0xf2, 0x74, 0xe9, 0xc0, - 0x8e, 0x71, 0x1e, 0x8e, 0x31, 0xcb, 0x6a, 0x42, 0xca, 0x3f, 0xb1, 0x6c, 0x0b, 0x31, 0x27, 0x38, - 0xb5, 0x4c, 0x62, 0xa5, 0xe2, 0xfb, 0x28, 0x84, 0x13, 0xb5, 0x83, 0x94, 0x90, 0xc5, 0x34, 0x62, - 0x04, 0x55, 0x5e, 0x3e, 0xb8, 0x43, 0x1e, 0xa1, 0x45, 0x06, 0xfe, 0x42, 0x52, 0x73, 0x67, 0x55, - 0xab, 0x54, 0x72, 0x0d, 0x3e, 0xd9, 0x06, 0xe0, 0x66, 0x38, 0x42, 0x8c, 0xd0, 0xc5, 0x78, 0x50, - 0xc2, 0xec, 0xe0, 0xce, 0xe3, 0x3a, 0xcc, 0xca, 0x34, 0xa7, 0x77, 0xa1, 0x9d, 0x53, 0x20, 0xd7, - 0x88, 0x5a, 0xf4, 0x6f, 0x16, 0x10, 0xee, 0xaf, 0x02, 0x6e, 0xe8, 0xe4, 0xc4, 0x1d, 0x5f, 0xb0, - 0xc4, 0xc9, 0x15, 0x5d, 0x5e, 0x42, 0x14, 0x3d, 0x08, 0x87, 0xb2, 0x8f, 0xb6, 0x78, 0x78, 0xca, - 0x2a, 0xa6, 0x07, 0x07, 0x55, 0x7d, 0x65, 0x8d, 0xbb, 0x0b, 0x4b, 0xaa, 0x98, 0x15, 0x8e, 0x65, - 0xad, 0xc3, 0xa0, 0xc7, 0xe2, 0x3d, 0xf2, 0xe2, 0x98, 0x97, 0xdb, 0xd8, 0xfb, 0xad, 0x2e, 0x76, - 0x2a, 0x72, 0x45, 0x9c, 0xa9, 0xc8, 0xfd, 0xbb, 0x05, 0x5d, 0xae, 0x6c, 0x0e, 0xfd, 0x87, 0x08, - 0x27, 0xc7, 0xe6, 0x7b, 0x03, 0xff, 0x7d, 0x68, 0x08, 0x01, 0x21, 0x4a, 0x50, 0xd8, 0xf7, 0xf3, - 0xd8, 0x67, 0x01, 0x9f, 0x83, 0xfe, 0x27, 0xb0, 0xa4, 0xc4, 0x17, 0xd0, 0x7d, 0x00, 0xb3, 0xb1, - 0x30, 0x41, 0x75, 0xfa, 0xc5, 0x3c, 0x3b, 0x69, 0x1e, 0xfd, 0xc7, 0x14, 0x2c, 0x17, 0xdf, 0xab, - 0xca, 0xf2, 0x33, 0xe8, 0x96, 0x8a, 0x81, 0x2c, 0x53, 0x0f, 0xf3, 0x76, 0x17, 0x1e, 0x16, 0xc8, - 0xf6, 0xbf, 0x2c, 0xe8, 0xe4, 0x49, 0xa5, 0x3e, 0x5b, 0xaa, 0x62, 0x53, 0xd5, 0x2d, 0xae, 0x56, - 0x6a, 0x71, 0xd3, 0xd5, 0x2d, 0x6e, 0xe6, 0x15, 0x2d, 0x6e, 0x56, 0x4f, 0xb7, 0xb9, 0x74, 0x9f, - 0x13, 0x6c, 0x33, 0xc0, 0xea, 0xaf, 0x01, 0xec, 0x21, 0x2c, 0x3e, 0x77, 0x7d, 0x9f, 0x25, 0x8f, - 0x25, 0x4b, 0x0d, 0x37, 0xf2, 0xbc, 0x91, 0xe3, 0x8c, 0x13, 0x06, 0xbe, 0xec, 0x43, 0x75, 0xba, - 0x01, 0x4b, 0x85, 0xdb, 0xd9, 0xa4, 0xa1, 0x75, 0xe2, 0x37, 0x2d, 0xba, 0x02, 0x4b, 0x4a, 0x50, - 0x9e, 0x31, 0x7d, 0x0f, 0x96, 0x8b, 0x07, 0xd5, 0x3c, 0x6a, 0xf4, 0x1b, 0xe8, 0x7e, 0x85, 0xd3, - 0x33, 0xda, 0x75, 0xea, 0x9e, 0xf9, 0xec, 0xd0, 0x0b, 0xae, 0xf8, 0x6c, 0xea, 0x0d, 0x1f, 0xa9, - 0xb6, 0x20, 0x3e, 0x76, 0xb2, 0x49, 0x81, 0x8f, 0xda, 0xaf, 0x05, 0x16, 0xa7, 0x9c, 0x9b, 0x6c, - 0x87, 0xb1, 0xe8, 0x2a, 0xac, 0x9c, 0x5c, 0x86, 0x37, 0xa6, 0x14, 0xad, 0xe7, 0x3e, 0xf4, 0xcb, - 0x47, 0x4a, 0xd3, 0xf7, 0x8c, 0x86, 0x2e, 0x43, 0x48, 0x4f, 0x66, 0x45, 0x7d, 0xa9, 0x0f, 0x73, - 0x4f, 0x82, 0xeb, 0xd0, 0x1b, 0x88, 0x22, 0x32, 0x42, 0xf7, 0x65, 0x2d, 0x1d, 0x5b, 0x2e, 0xf3, - 0xa2, 0x44, 0x55, 0x04, 0x2c, 0xa5, 0x63, 0x27, 0x1a, 0x33, 0x6f, 0xe4, 0x5e, 0x30, 0x35, 0x72, - 0xa1, 0xbe, 0xe3, 0x6c, 0x13, 0x6b, 0x65, 0xc3, 0xf8, 0x8c, 0x6e, 0xd4, 0x6a, 0xb2, 0x11, 0x91, - 0x50, 0xa7, 0x0f, 0x80, 0xe0, 0x48, 0xa8, 0x04, 0xa6, 0xea, 0x66, 0x5c, 0x64, 0xfd, 0x7a, 0x84, - 0xe3, 0xab, 0xdc, 0x86, 0xf8, 0xae, 0x21, 0x05, 0x8b, 0x61, 0x8f, 0xef, 0x2d, 0xe9, 0x78, 0xae, - 0x9e, 0x08, 0xe5, 0xe8, 0x26, 0x10, 0xde, 0xed, 0x53, 0xce, 0x69, 0x90, 0xe8, 0x94, 0x32, 0x82, - 0xe4, 0x47, 0x72, 0x3a, 0x2a, 0x6a, 0x71, 0x9f, 0xcf, 0x9c, 0x82, 0xa4, 0x41, 0xeb, 0x28, 0xd0, - 0xd4, 0x4d, 0x3e, 0x56, 0xa9, 0x7f, 0x4f, 0x26, 0x67, 0xf1, 0x60, 0x8c, 0xd8, 0x60, 0x4d, 0xd9, - 0xdc, 0x81, 0x76, 0x2e, 0x66, 0xc9, 0x1c, 0xd4, 0x76, 0x0f, 0x0f, 0x71, 0x3e, 0x6f, 0xc2, 0xdc, - 0xd3, 0xe3, 0xfd, 0xa3, 0x27, 0x47, 0x9f, 0xe1, 0x50, 0x8e, 0x1f, 0x7b, 0x87, 0x4f, 0x4f, 0xf8, - 0xc7, 0xd4, 0xce, 0x7f, 0xe7, 0xa1, 0x91, 0x4e, 0xc9, 0xe4, 0x5b, 0x68, 0xe7, 0xc2, 0x96, 0xac, - 0x29, 0xc9, 0x55, 0xa1, 0x6f, 0xaf, 0x57, 0x1f, 0xaa, 0x8d, 0xf0, 0xde, 0xef, 0xfe, 0xf3, 0xbf, - 0x3f, 0x4c, 0xf5, 0xc9, 0xf2, 0xf6, 0xf5, 0xa3, 0x6d, 0x15, 0xaf, 0xdb, 0xa2, 0xe5, 0x63, 0x48, - 0x78, 0x01, 0xb9, 0x82, 0x4e, 0x3e, 0xbe, 0xc9, 0x7a, 0x3e, 0xf1, 0x0a, 0xd2, 0xee, 0xbe, 0xe2, - 0x54, 0x89, 0x5b, 0x17, 0xe2, 0x96, 0xc9, 0xa2, 0x29, 0x4e, 0x07, 0x1f, 0x61, 0x62, 0x80, 0x32, - 0x77, 0x6b, 0xa2, 0xf9, 0x55, 0xef, 0xdc, 0xf6, 0x6a, 0x79, 0x8f, 0x56, 0x8b, 0x37, 0xed, 0x0b, - 0x51, 0x84, 0x74, 0xb9, 0x28, 0x73, 0x05, 0x27, 0xbf, 0x84, 0x46, 0xba, 0x9c, 0x91, 0x15, 0x63, - 0xb9, 0x34, 0x17, 0x3c, 0xbb, 0x5f, 0x3e, 0x50, 0x46, 0xac, 0x09, 0xce, 0x4b, 0xb4, 0xc4, 0xf9, - 0x23, 0x6b, 0x93, 0x1c, 0xc2, 0x92, 0x72, 0xf7, 0x19, 0x7b, 0x13, 0x4b, 0x2a, 0x7e, 0x11, 0xf8, - 0xc0, 0x22, 0x1f, 0x43, 0x5d, 0xef, 0xa6, 0x64, 0xb9, 0x7a, 0x0d, 0xb6, 0x57, 0x4a, 0x74, 0x15, - 0xa2, 0xbb, 0x00, 0xd9, 0xaa, 0x46, 0xfa, 0xaf, 0xda, 0x25, 0x53, 0x10, 0x2b, 0xf6, 0xba, 0x0b, - 0xb1, 0xa3, 0xe6, 0x37, 0x41, 0xf2, 0x56, 0x76, 0xbf, 0x72, 0x47, 0x7c, 0x0d, 0x43, 0xba, 0x2c, - 0xb0, 0xeb, 0x92, 0x0e, 0xc7, 0x2e, 0x60, 0x37, 0x6a, 0xfc, 0x25, 0xbf, 0x80, 0xa6, 0xb1, 0xf2, - 0x11, 0xa3, 0x1b, 0x17, 0x76, 0x48, 0xdb, 0xae, 0x3a, 0x52, 0xdc, 0x17, 0x05, 0xf7, 0x0e, 0x6d, - 0x70, 0xee, 0x62, 0xe0, 0xe5, 0x2e, 0xf9, 0x92, 0x27, 0x8f, 0x9a, 0xed, 0x49, 0xb6, 0x74, 0xe6, - 0x37, 0x80, 0xd4, 0xdf, 0xa5, 0x35, 0x80, 0xf6, 0x04, 0xd7, 0x26, 0xc9, 0xb8, 0x92, 0x2f, 0x60, - 0x4e, 0x8d, 0xfa, 0x64, 0x29, 0xf3, 0xab, 0xb1, 0x0d, 0xd8, 0xcb, 0x45, 0xb2, 0x62, 0xb6, 0x20, - 0x98, 0xb5, 0x49, 0x93, 0x33, 0xc3, 0x29, 0xca, 0xe3, 0x3c, 0x7c, 0x98, 0xcf, 0xf7, 0xe0, 0x38, - 0x4d, 0xb3, 0xca, 0xf1, 0x21, 0x4d, 0xb3, 0xea, 0x1e, 0x9f, 0x4f, 0x33, 0x9d, 0x5e, 0xdb, 0xaa, - 0xb8, 0x91, 0x5f, 0x43, 0xcb, 0x5c, 0xec, 0x88, 0x6d, 0x58, 0x5e, 0x58, 0x02, 0xed, 0xb5, 0xca, - 0xb3, 0x3c, 0xdc, 0xa4, 0x65, 0x8a, 0x21, 0xbf, 0x82, 0xa6, 0x31, 0x4e, 0xa6, 0xae, 0x2c, 0x8f, - 0x98, 0x69, 0xe4, 0x16, 0x07, 0x3a, 0xba, 0x22, 0x18, 0xf7, 0x68, 0x8e, 0x31, 0xba, 0x12, 0x33, - 0xe2, 0x2f, 0x16, 0xb4, 0xcc, 0x31, 0x3f, 0xd5, 0xbe, 0x62, 0xf6, 0x4f, 0x7d, 0x5a, 0x1a, 0xd8, - 0xe9, 0xd7, 0x42, 0xc2, 0xf1, 0xe6, 0x51, 0x0e, 0xa1, 0xef, 0x72, 0x03, 0xcd, 0x96, 0xf9, 0x2b, - 0xd8, 0xcb, 0xe2, 0xa1, 0xf9, 0x43, 0x18, 0x1e, 0x8a, 0x1d, 0xe1, 0x25, 0x2a, 0xf8, 0x8d, 0xfc, - 0x19, 0x4f, 0xb5, 0x24, 0x42, 0x8c, 0xec, 0xd4, 0x6a, 0x2d, 0xe4, 0x68, 0x0a, 0xcc, 0x07, 0x42, - 0xa3, 0x7b, 0x74, 0x35, 0xa7, 0x51, 0xa1, 0xbc, 0x6c, 0x58, 0x28, 0xe1, 0x18, 0x20, 0x6b, 0x8b, - 0xa4, 0xd0, 0x76, 0xd2, 0xe4, 0x2b, 0x77, 0xce, 0x3c, 0xac, 0xba, 0x7b, 0xf1, 0x0c, 0xf9, 0x56, - 0x46, 0x84, 0xba, 0x1f, 0xa7, 0x3e, 0x2b, 0x37, 0x49, 0xdb, 0xae, 0x3a, 0x52, 0xfc, 0x7f, 0x20, - 0xf8, 0xdf, 0x25, 0x6b, 0x26, 0xff, 0xed, 0xef, 0xcc, 0xa6, 0xfa, 0x92, 0x7c, 0x0d, 0xed, 0xc3, - 0x30, 0xbc, 0x9a, 0x44, 0xda, 0x00, 0x8d, 0x90, 0xd1, 0xc4, 0xed, 0x62, 0x2f, 0x7d, 0x5b, 0x70, - 0x5e, 0x23, 0xab, 0x79, 0xce, 0x59, 0xa3, 0x7f, 0x49, 0x5c, 0xe8, 0xa5, 0x85, 0x37, 0x35, 0xc4, - 0xce, 0xf3, 0x31, 0x1b, 0x71, 0x49, 0x46, 0xae, 0x15, 0xa6, 0x32, 0x62, 0xcd, 0x13, 0x81, 0x3f, - 0x81, 0x6e, 0x71, 0x88, 0x22, 0xf7, 0xb4, 0x2f, 0xab, 0x07, 0x2f, 0xfb, 0xad, 0x57, 0x9e, 0x4b, - 0xd0, 0xce, 0x66, 0xc5, 0xaf, 0xde, 0x1f, 0xfe, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x10, 0x5c, 0x61, - 0x90, 0x27, 0x17, 0x00, 0x00, + 0x15, 0x56, 0x73, 0xb8, 0xcc, 0xbc, 0x59, 0x34, 0x53, 0xdc, 0x86, 0x4d, 0x4a, 0x96, 0x2b, 0xb2, + 0x41, 0x13, 0x32, 0x69, 0xd1, 0x87, 0x04, 0x36, 0xe2, 0x80, 0xa2, 0x19, 0x53, 0x08, 0x4d, 0xd1, + 0x26, 0x65, 0x21, 0x1b, 0xda, 0x3d, 0x33, 0x45, 0xb2, 0xcd, 0x9e, 0xee, 0xce, 0x74, 0x0f, 0x29, + 0xc6, 0xd0, 0x25, 0x87, 0x1c, 0x73, 0x09, 0x10, 0x04, 0x08, 0x90, 0x1f, 0x10, 0x04, 0x41, 0xfe, + 0x47, 0x6e, 0xc9, 0x29, 0xf7, 0xfc, 0x90, 0xbc, 0xda, 0xba, 0xab, 0x17, 0x09, 0xf0, 0xc1, 0x27, + 0xb2, 0x5f, 0x55, 0xbd, 0xe5, 0x7b, 0xfb, 0x40, 0x63, 0x12, 0x0d, 0xb7, 0xa3, 0x49, 0x98, 0x84, + 0x64, 0xce, 0x0f, 0xf0, 0xc3, 0xde, 0xb8, 0x08, 0xc3, 0x0b, 0x9f, 0xed, 0xb8, 0x91, 0xb7, 0xe3, + 0x06, 0x41, 0x98, 0xb8, 0x89, 0x17, 0x06, 0xb1, 0xbc, 0x44, 0xff, 0x62, 0x41, 0xf3, 0x6c, 0xe2, + 0x06, 0xb1, 0x3b, 0xe4, 0x64, 0x72, 0x17, 0x16, 0x92, 0x97, 0xce, 0xa5, 0x1b, 0x5f, 0xf6, 0xad, + 0x07, 0xd6, 0x66, 0x83, 0x74, 0x60, 0xde, 0x1d, 0x87, 0xd3, 0x20, 0xe9, 0xcf, 0xe0, 0xb7, 0x45, + 0xd6, 0xa0, 0x17, 0x4c, 0xc7, 0xce, 0x30, 0x0c, 0xce, 0xbd, 0xc9, 0x58, 0xf2, 0xea, 0xd7, 0xf0, + 0x68, 0x8e, 0x10, 0x80, 0x81, 0x1f, 0x0e, 0xaf, 0xe4, 0xf3, 0x59, 0xf1, 0x7c, 0x09, 0x5a, 0x8a, + 0xc6, 0xbc, 0x8b, 0xcb, 0xa4, 0x3f, 0xa7, 0x6f, 0x26, 0xde, 0x98, 0x39, 0x71, 0xe2, 0x8e, 0xa3, + 0xfe, 0x3c, 0xd2, 0x6a, 0x82, 0x86, 0xca, 0xf9, 0xce, 0x39, 0x63, 0x71, 0x7f, 0x81, 0xd3, 0x68, + 0x1f, 0x56, 0x3e, 0x63, 0x89, 0xa1, 0x5f, 0xfc, 0x25, 0xfb, 0xcd, 0x94, 0xc5, 0x09, 0xfd, 0x04, + 0x88, 0x41, 0xfe, 0x94, 0x25, 0xae, 0xe7, 0xc7, 0x64, 0x13, 0x5a, 0x89, 0x71, 0x19, 0x4d, 0xa8, + 0x6d, 0x36, 0x77, 0xc9, 0xb6, 0x40, 0x62, 0xdb, 0x78, 0x40, 0xbf, 0x80, 0xe6, 0x29, 0x0b, 0x46, + 0x8a, 0x1d, 0x69, 0xc1, 0xec, 0x08, 0xff, 0x0a, 0x9b, 0x5b, 0xa4, 0x09, 0x35, 0x77, 0x2c, 0x0d, + 0xae, 0x71, 0x0b, 0x22, 0xf7, 0x76, 0xcc, 0x82, 0x44, 0xda, 0x55, 0x13, 0x57, 0x7a, 0xd0, 0x38, + 0x77, 0xe3, 0xc4, 0x89, 0x91, 0x89, 0x30, 0xb5, 0x4e, 0x3b, 0xd0, 0x92, 0x2c, 0xe3, 0x08, 0x65, + 0x33, 0x7a, 0x06, 0xad, 0xfd, 0x4b, 0x44, 0x9c, 0xf9, 0x27, 0xa1, 0x17, 0x24, 0x9c, 0xd1, 0xf9, + 0x34, 0x18, 0x79, 0xc1, 0x85, 0x93, 0xbc, 0xf4, 0x46, 0x4a, 0x56, 0x1f, 0xba, 0x26, 0x15, 0x21, + 0x99, 0x08, 0xc1, 0x02, 0xba, 0x70, 0x9a, 0x44, 0xd3, 0xc4, 0xf1, 0x82, 0x11, 0x7b, 0x29, 0x04, + 0xb7, 0xe9, 0x07, 0xd0, 0x3d, 0xe2, 0x48, 0x06, 0xf8, 0x62, 0x6f, 0x34, 0x9a, 0xb0, 0x38, 0xe6, + 0x3e, 0x8a, 0xa6, 0x83, 0x2b, 0x76, 0xab, 0x7c, 0x86, 0xd6, 0x5c, 0x86, 0xb1, 0x34, 0xa0, 0x41, + 0x7f, 0x6f, 0xc1, 0x5d, 0xae, 0xd8, 0xe7, 0x6e, 0x70, 0xab, 0xed, 0xfd, 0x04, 0x5a, 0xfc, 0xf1, + 0x59, 0xb8, 0x27, 0x7d, 0x2b, 0x81, 0xda, 0x54, 0x40, 0x15, 0x6e, 0x6f, 0x9b, 0x57, 0x0f, 0x82, + 0x64, 0x72, 0x6b, 0x7f, 0x08, 0xbd, 0x12, 0x91, 0xc3, 0x96, 0xe9, 0xd0, 0x86, 0xb9, 0x6b, 0xd7, + 0x9f, 0x32, 0x89, 0xe2, 0x47, 0x33, 0x3f, 0xb2, 0xe8, 0x03, 0xe8, 0x66, 0x9c, 0x25, 0x48, 0x5c, + 0xd5, 0x14, 0x8c, 0x06, 0x37, 0x8e, 0xdf, 0xd8, 0x47, 0xbc, 0x62, 0xc3, 0x35, 0x2e, 0x8a, 0xaa, + 0x0c, 0xc7, 0x1a, 0x7d, 0x1b, 0x7a, 0xc6, 0x8b, 0x4a, 0xa6, 0x7f, 0xb6, 0xa0, 0x77, 0xcc, 0x6e, + 0x14, 0x58, 0x9a, 0xed, 0x2e, 0xde, 0xb9, 0x8d, 0x98, 0xb8, 0xd3, 0xd9, 0x7d, 0xa8, 0x2c, 0x2f, + 0xdd, 0xdb, 0x56, 0x9f, 0x67, 0x78, 0x97, 0x3e, 0x83, 0xa6, 0xf1, 0x49, 0x56, 0x61, 0xf1, 0xc5, + 0xd3, 0xb3, 0xe3, 0x83, 0xd3, 0x53, 0xe7, 0xe4, 0xf9, 0x93, 0x9f, 0x1d, 0xfc, 0xdc, 0x39, 0xdc, + 0x3b, 0x3d, 0xec, 0xde, 0x21, 0x2b, 0x40, 0x90, 0x7a, 0x76, 0xf0, 0x69, 0x8e, 0x6e, 0x61, 0x72, + 0x35, 0x4d, 0xc2, 0x0c, 0xb5, 0xa1, 0x8f, 0x12, 0x5f, 0x78, 0x49, 0x80, 0x3c, 0xf3, 0x82, 0xe9, + 0x3b, 0xc8, 0xc4, 0xd0, 0x46, 0x99, 0x86, 0xf9, 0xe9, 0x4a, 0x92, 0xb2, 0xee, 0x63, 0x20, 0xfb, + 0x21, 0x06, 0xd9, 0x30, 0x39, 0x61, 0x6c, 0xa2, 0xad, 0x7b, 0xc7, 0x00, 0xad, 0xb9, 0xbb, 0xaa, + 0xac, 0x2b, 0x06, 0x0e, 0x7d, 0x17, 0x16, 0x73, 0x8f, 0x33, 0x21, 0x11, 0x7e, 0x3b, 0x0a, 0xc2, + 0x39, 0x1a, 0xc1, 0xec, 0xe1, 0xd9, 0xd1, 0x3e, 0xe9, 0x42, 0xdd, 0x0b, 0x86, 0xe1, 0x18, 0x59, + 0x88, 0x93, 0x7a, 0xd1, 0x1f, 0x3c, 0x2f, 0x78, 0x96, 0x38, 0x3c, 0xe7, 0x55, 0xaa, 0x60, 0xc5, + 0x60, 0x2f, 0x23, 0x6f, 0x22, 0x6a, 0x85, 0xae, 0x03, 0x3c, 0x65, 0xda, 0x3c, 0xf8, 0x27, 0xec, + 0x3a, 0x1c, 0xca, 0xa3, 0x11, 0xf3, 0xdd, 0x5b, 0x51, 0x21, 0xda, 0xf4, 0xdf, 0x16, 0xb4, 0xf7, + 0x30, 0x55, 0xaf, 0x99, 0xca, 0x21, 0xb2, 0x0c, 0xed, 0x09, 0x1b, 0x87, 0x09, 0x73, 0x72, 0xb1, + 0x8e, 0xe4, 0xa1, 0xbc, 0xe1, 0x44, 0x3c, 0xcd, 0x54, 0xf2, 0xa0, 0xa6, 0x43, 0x37, 0x72, 0x87, + 0x5e, 0x72, 0x2b, 0xd4, 0xa8, 0xf1, 0x8b, 0xa8, 0x14, 0xd6, 0x97, 0x81, 0xeb, 0xbb, 0xc1, 0x90, + 0x09, 0x15, 0x6a, 0xe8, 0xab, 0x8e, 0x62, 0xab, 0xe9, 0x73, 0x82, 0x8e, 0x5a, 0x4f, 0x11, 0x8b, + 0x24, 0xf1, 0xd9, 0x28, 0x3d, 0x92, 0x95, 0x8a, 0x42, 0x3b, 0x62, 0x32, 0x65, 0x2f, 0x13, 0x7f, + 0xc8, 0x8b, 0x15, 0xcf, 0x9e, 0xa6, 0x42, 0x59, 0x20, 0xb5, 0x08, 0x4d, 0x5e, 0x26, 0xa7, 0xd1, + 0xc8, 0x4d, 0xb0, 0x9c, 0xd5, 0xf1, 0xe1, 0x2c, 0x5d, 0x86, 0xc5, 0x23, 0x2f, 0x4e, 0x94, 0x45, + 0x46, 0x2d, 0x5b, 0xca, 0x93, 0x95, 0x1b, 0xde, 0x45, 0x1b, 0x14, 0xad, 0xdf, 0x10, 0x22, 0x96, + 0x94, 0x88, 0x1c, 0x32, 0xf4, 0x4f, 0x16, 0xcc, 0x72, 0xff, 0x09, 0xbf, 0x4d, 0x07, 0x4e, 0x06, + 0x8e, 0xe1, 0xc8, 0x19, 0x51, 0x78, 0x8d, 0xf0, 0xa9, 0x89, 0x1b, 0xbc, 0x66, 0xdf, 0xa2, 0x86, + 0xbc, 0x90, 0x49, 0xaf, 0xcc, 0x66, 0xb4, 0x09, 0x1b, 0x5e, 0x0b, 0x38, 0x66, 0x39, 0x9e, 0xb1, + 0x9b, 0xc8, 0x5b, 0x12, 0x05, 0x45, 0x11, 0x77, 0x44, 0xb5, 0xe6, 0xcc, 0xbd, 0x60, 0x80, 0xc1, + 0x30, 0x12, 0xf6, 0xd6, 0x29, 0xe1, 0xb5, 0x2a, 0x16, 0xb1, 0x95, 0x1a, 0xbb, 0x03, 0x3d, 0x83, + 0xa6, 0x2c, 0xb5, 0x61, 0x8e, 0xeb, 0xa9, 0x0b, 0xb6, 0x46, 0x92, 0x5f, 0xa2, 0x5d, 0xe8, 0x60, + 0x0f, 0x78, 0x1a, 0x9c, 0x87, 0x9a, 0xc5, 0x1f, 0xb0, 0xa0, 0xa5, 0x24, 0xc5, 0x01, 0x8b, 0xa5, + 0xaf, 0xa3, 0x5b, 0xc7, 0x6d, 0x03, 0x33, 0xf4, 0xae, 0x37, 0x42, 0x95, 0x31, 0x0a, 0x74, 0xd4, + 0x48, 0xb3, 0x37, 0x60, 0x89, 0xbb, 0x47, 0xbb, 0x31, 0x85, 0x59, 0x86, 0xe5, 0x3a, 0x2c, 0xf2, + 0x53, 0x57, 0xa0, 0x9c, 0x1d, 0x8a, 0xc8, 0xe4, 0x11, 0x2e, 0x9f, 0x72, 0x7d, 0xe7, 0x45, 0xb0, + 0x3e, 0x17, 0x39, 0x98, 0xf6, 0xc3, 0xe7, 0xc2, 0xe9, 0xfc, 0xa2, 0x6c, 0x7d, 0xf1, 0xa5, 0xab, + 0x8a, 0x7d, 0xb1, 0x1b, 0x4a, 0xa7, 0x60, 0x08, 0xea, 0x96, 0x1a, 0x3b, 0x3e, 0x3b, 0x4f, 0x54, + 0xa9, 0xff, 0x09, 0xf4, 0x94, 0x8b, 0x9f, 0xa1, 0xa2, 0x8a, 0xeb, 0x56, 0x31, 0xde, 0x65, 0x8a, + 0x2f, 0x2a, 0xc8, 0xcc, 0x8e, 0x23, 0x6a, 0x83, 0xfc, 0xde, 0xf7, 0xc3, 0x98, 0x29, 0x0e, 0xa8, + 0xc4, 0x10, 0x3f, 0x0b, 0x7d, 0x08, 0x9d, 0x17, 0x4f, 0x87, 0x43, 0x1e, 0x19, 0x33, 0xc2, 0x79, + 0x23, 0xac, 0x0d, 0xfc, 0x95, 0xe2, 0xa0, 0x2b, 0xcb, 0x77, 0x90, 0x9f, 0xb6, 0x79, 0xdf, 0x1b, + 0x7b, 0xba, 0x40, 0x60, 0x5f, 0x38, 0x0f, 0x27, 0x98, 0x4b, 0x35, 0x21, 0xe5, 0x9f, 0x58, 0x9c, + 0x85, 0x98, 0x53, 0x9c, 0x4b, 0xa6, 0xb1, 0x52, 0xf1, 0x7d, 0x14, 0xc2, 0x89, 0xda, 0x41, 0x4a, + 0xc8, 0x52, 0x1a, 0x17, 0x82, 0x2a, 0x2f, 0x1f, 0xde, 0x21, 0x8f, 0xd1, 0x22, 0x03, 0x7f, 0x21, + 0xa9, 0xb9, 0xbb, 0xa6, 0x55, 0x2a, 0xb9, 0x06, 0x9f, 0xec, 0x00, 0x70, 0x33, 0x1c, 0x21, 0x46, + 0xe8, 0x62, 0x3c, 0x28, 0x61, 0x76, 0x78, 0xe7, 0x49, 0x1d, 0xe6, 0x65, 0x32, 0xd3, 0x7b, 0xd0, + 0xce, 0x29, 0x90, 0x6b, 0x37, 0x2d, 0xfa, 0x37, 0x0b, 0x08, 0xf7, 0x57, 0x01, 0x37, 0x74, 0x72, + 0xe2, 0x4e, 0x2e, 0x58, 0xe2, 0xe4, 0x4a, 0xab, 0x28, 0x14, 0xe1, 0x28, 0x2d, 0x6a, 0x33, 0xc2, + 0x19, 0x18, 0x9e, 0xb2, 0x56, 0xe9, 0xd1, 0x40, 0xd5, 0x58, 0x59, 0xc9, 0xee, 0xc1, 0xb2, 0x2a, + 0x59, 0x85, 0x63, 0x59, 0xd1, 0x30, 0xe8, 0xb1, 0x44, 0x8f, 0xbd, 0x38, 0xe6, 0x45, 0x35, 0xf6, + 0x7e, 0xab, 0x4b, 0x9a, 0x8a, 0x5c, 0x11, 0x67, 0x2a, 0x72, 0xff, 0x6e, 0x41, 0x97, 0x2b, 0x9b, + 0x43, 0xff, 0x11, 0xc2, 0xc9, 0xb1, 0xf9, 0xde, 0xc0, 0x7f, 0x1f, 0x1a, 0x42, 0x40, 0x88, 0x12, + 0x14, 0xf6, 0xfd, 0x3c, 0xf6, 0x59, 0xc0, 0xe7, 0xa0, 0xff, 0x31, 0x2c, 0x2b, 0xf1, 0x05, 0x74, + 0x1f, 0xc2, 0x7c, 0x2c, 0x4c, 0x50, 0xfd, 0x7c, 0x29, 0xcf, 0x4e, 0x9a, 0x47, 0xff, 0x31, 0x03, + 0x2b, 0xc5, 0xf7, 0xaa, 0x7e, 0xfc, 0x14, 0xba, 0xa5, 0x62, 0x20, 0x8b, 0xd1, 0xa3, 0xbc, 0xdd, + 0x85, 0x87, 0x05, 0xb2, 0xfd, 0x2f, 0x0b, 0x3a, 0x79, 0x52, 0xa9, 0x9b, 0xf2, 0x04, 0x4c, 0xab, + 0x92, 0xf6, 0x79, 0x45, 0x23, 0xab, 0x95, 0x1a, 0xd9, 0x6c, 0x75, 0x23, 0x9b, 0x7b, 0x4d, 0x23, + 0x9b, 0xd7, 0xf3, 0x6b, 0x2e, 0xdd, 0x17, 0x04, 0xdb, 0x0c, 0xb0, 0xfa, 0x1b, 0x00, 0x7b, 0x04, + 0x4b, 0x2f, 0x5c, 0xdf, 0x67, 0xc9, 0x13, 0xc9, 0x52, 0xc3, 0x8d, 0x3c, 0x6f, 0xe4, 0xd0, 0xe2, + 0x84, 0x81, 0x2f, 0xbb, 0x4d, 0x9d, 0x6e, 0xc2, 0x72, 0xe1, 0x76, 0x36, 0x4f, 0x68, 0x9d, 0xf8, + 0x4d, 0x8b, 0xae, 0xc2, 0xb2, 0x12, 0x94, 0x67, 0x4c, 0xdf, 0x83, 0x95, 0xe2, 0x41, 0x35, 0x8f, + 0x1a, 0xfd, 0x1a, 0xba, 0x5f, 0xe2, 0x7c, 0x8c, 0x76, 0x9d, 0xb9, 0x03, 0x9f, 0x1d, 0x79, 0xc1, + 0x15, 0x9f, 0x40, 0xbd, 0xd1, 0x63, 0x55, 0xfc, 0xc5, 0xc7, 0x6e, 0x36, 0x0f, 0xf0, 0x61, 0xfa, + 0x8d, 0xc0, 0xe2, 0x2c, 0x73, 0x93, 0x6d, 0x29, 0x16, 0x5d, 0x83, 0xd5, 0xd3, 0xcb, 0xf0, 0xc6, + 0x94, 0xa2, 0xf5, 0x3c, 0x80, 0x7e, 0xf9, 0x48, 0x69, 0xfa, 0x9e, 0xd1, 0xb6, 0x65, 0x08, 0xe9, + 0xf9, 0xab, 0xa8, 0x2f, 0xf5, 0x61, 0xe1, 0x69, 0x70, 0x1d, 0x7a, 0x43, 0x51, 0x44, 0xc6, 0xe8, + 0xbe, 0xac, 0x71, 0x63, 0x63, 0x65, 0x5e, 0x94, 0xa8, 0x8a, 0x80, 0xa5, 0x74, 0xe2, 0x44, 0x13, + 0xe6, 0x8d, 0xdd, 0x0b, 0xa6, 0x06, 0x2b, 0xd4, 0x77, 0x92, 0xed, 0x5a, 0xad, 0x6c, 0xe4, 0x9e, + 0xd3, 0xed, 0x58, 0xcd, 0x2f, 0x22, 0x12, 0xea, 0xf4, 0x21, 0x10, 0x1c, 0xfc, 0x94, 0xc0, 0x54, + 0xdd, 0x8c, 0x8b, 0xac, 0x5f, 0x8f, 0x71, 0x48, 0x95, 0xfb, 0xce, 0x21, 0x12, 0xa5, 0x60, 0x31, + 0xd2, 0xf1, 0xcd, 0x24, 0x1d, 0xc2, 0xd5, 0x13, 0xa1, 0x1c, 0xdd, 0x02, 0xc2, 0x7b, 0x7a, 0xca, + 0x39, 0x0d, 0x12, 0x9d, 0x52, 0x46, 0x90, 0xfc, 0x50, 0xce, 0x40, 0x45, 0x2d, 0x1e, 0xf0, 0xc9, + 0x52, 0x90, 0x34, 0x68, 0x1d, 0x05, 0x9a, 0xba, 0xc9, 0x87, 0x27, 0xf5, 0xef, 0xe9, 0x74, 0x10, + 0x0f, 0x27, 0x88, 0x0d, 0xd6, 0x94, 0xad, 0x5d, 0x68, 0xe7, 0x62, 0x96, 0x2c, 0x40, 0x6d, 0xef, + 0xe8, 0x08, 0xa7, 0xf0, 0x26, 0x2c, 0x3c, 0x3b, 0x39, 0x38, 0x7e, 0x7a, 0xfc, 0x19, 0x8e, 0xde, + 0xf8, 0xb1, 0x7f, 0xf4, 0xec, 0x94, 0x7f, 0xcc, 0xec, 0xfe, 0xf7, 0x2e, 0x34, 0xd2, 0x59, 0x98, + 0x7c, 0x03, 0xed, 0x5c, 0xd8, 0x92, 0x75, 0x25, 0xb9, 0x2a, 0xf4, 0xed, 0x8d, 0xea, 0x43, 0xb5, + 0xf3, 0xdd, 0xff, 0xdd, 0x7f, 0xfe, 0xf7, 0xc7, 0x99, 0x3e, 0x59, 0xd9, 0xb9, 0x7e, 0xbc, 0xa3, + 0xe2, 0x75, 0x47, 0xb4, 0x7c, 0x0c, 0x09, 0x2f, 0x20, 0x57, 0xd0, 0xc9, 0xc7, 0x37, 0xd9, 0xc8, + 0x27, 0x5e, 0x41, 0xda, 0xbd, 0xd7, 0x9c, 0x2a, 0x71, 0x1b, 0x42, 0xdc, 0x0a, 0x59, 0x32, 0xc5, + 0xe9, 0xe0, 0x23, 0x4c, 0x8c, 0x49, 0xe6, 0xf6, 0x4c, 0x34, 0xbf, 0xea, 0xad, 0xda, 0x5e, 0x2b, + 0x6f, 0xca, 0x6a, 0xb5, 0xa6, 0x7d, 0x21, 0x8a, 0x90, 0x2e, 0x17, 0x65, 0x2e, 0xd9, 0xe4, 0x97, + 0xd0, 0x48, 0x57, 0x30, 0xb2, 0x6a, 0xac, 0x90, 0xe6, 0x1a, 0x67, 0xf7, 0xcb, 0x07, 0xca, 0x88, + 0x75, 0xc1, 0x79, 0x99, 0x96, 0x38, 0x7f, 0x64, 0x6d, 0x91, 0x23, 0x58, 0x56, 0xee, 0x1e, 0xb0, + 0xef, 0x62, 0x49, 0xc5, 0xce, 0xff, 0x81, 0x45, 0x3e, 0x86, 0xba, 0xde, 0x40, 0xc9, 0x4a, 0xf5, + 0xb2, 0x6b, 0xaf, 0x96, 0xe8, 0x2a, 0x44, 0xf7, 0x00, 0xb2, 0x85, 0x8c, 0xf4, 0x5f, 0xb7, 0x31, + 0xa6, 0x20, 0x56, 0x6c, 0x6f, 0x17, 0x62, 0x13, 0xcd, 0xef, 0x7b, 0xe4, 0xad, 0xec, 0x7e, 0xe5, + 0x26, 0xf8, 0x06, 0x86, 0x74, 0x45, 0x60, 0xd7, 0x25, 0x1d, 0x8e, 0x5d, 0xc0, 0x6e, 0xd4, 0x70, + 0x4f, 0x7e, 0x01, 0x4d, 0x63, 0xb1, 0x23, 0x46, 0x37, 0x2e, 0x6c, 0x8a, 0xb6, 0x5d, 0x75, 0xa4, + 0xb8, 0x2f, 0x09, 0xee, 0x1d, 0xda, 0xe0, 0xdc, 0xc5, 0xc0, 0xcb, 0x5d, 0xf2, 0x05, 0x4f, 0x1e, + 0x35, 0xc1, 0x93, 0x6c, 0xb5, 0xcc, 0xcf, 0xf9, 0xa9, 0xbf, 0x4b, 0xc3, 0x3e, 0xed, 0x09, 0xae, + 0x4d, 0x92, 0x71, 0x25, 0x9f, 0xc3, 0x82, 0x1a, 0xe8, 0xc9, 0x72, 0xe6, 0x57, 0x63, 0xe6, 0xb7, + 0x57, 0x8a, 0x64, 0xc5, 0x6c, 0x51, 0x30, 0x6b, 0x93, 0x26, 0x67, 0x86, 0xd3, 0x95, 0xc7, 0x79, + 0xf8, 0x70, 0x37, 0xdf, 0x83, 0xe3, 0x34, 0xcd, 0x2a, 0xc7, 0x87, 0x34, 0xcd, 0xaa, 0x7b, 0x7c, + 0x3e, 0xcd, 0x74, 0x7a, 0xed, 0xa8, 0xe2, 0x46, 0x7e, 0x0d, 0x2d, 0x73, 0x7d, 0x23, 0xb6, 0x61, + 0x79, 0x61, 0xd5, 0xb3, 0xd7, 0x2b, 0xcf, 0xf2, 0x70, 0x93, 0x96, 0x29, 0x86, 0xfc, 0x0a, 0x9a, + 0xc6, 0x38, 0x99, 0xba, 0xb2, 0x3c, 0x62, 0xa6, 0x91, 0x5b, 0x1c, 0xe8, 0xe8, 0xaa, 0x60, 0xdc, + 0xa3, 0x39, 0xc6, 0xe8, 0x4a, 0xcc, 0x88, 0xbf, 0x5a, 0xd0, 0x32, 0xc7, 0xfc, 0x54, 0xfb, 0x8a, + 0xd9, 0x3f, 0xf5, 0x69, 0x69, 0x60, 0xa7, 0x5f, 0x09, 0x09, 0x27, 0x5b, 0xc7, 0x39, 0x84, 0xbe, + 0xcd, 0x0d, 0x34, 0xdb, 0xe6, 0xef, 0x5c, 0xaf, 0x8a, 0x87, 0xe6, 0x4f, 0x5d, 0x78, 0x28, 0x76, + 0x84, 0x57, 0xa8, 0xe0, 0xd7, 0xf2, 0x87, 0x3a, 0xd5, 0x92, 0x08, 0x31, 0xb2, 0x53, 0xab, 0xb5, + 0x98, 0xa3, 0x29, 0x30, 0x1f, 0x0a, 0x8d, 0xee, 0xd3, 0xb5, 0x9c, 0x46, 0x85, 0xf2, 0xb2, 0x69, + 0xa1, 0x84, 0x13, 0x80, 0xac, 0x2d, 0x92, 0x42, 0xdb, 0x49, 0x93, 0xaf, 0xdc, 0x39, 0xf3, 0xb0, + 0xea, 0xee, 0xc5, 0x33, 0xe4, 0x1b, 0x19, 0x11, 0xea, 0x7e, 0x9c, 0xfa, 0xac, 0xdc, 0x24, 0x6d, + 0xbb, 0xea, 0x48, 0xf1, 0xff, 0x81, 0xe0, 0x7f, 0x8f, 0xac, 0x9b, 0xfc, 0x77, 0xbe, 0x35, 0x9b, + 0xea, 0x2b, 0xf2, 0x15, 0xb4, 0x8f, 0xc2, 0xf0, 0x6a, 0x1a, 0x69, 0x03, 0x34, 0x42, 0x46, 0x13, + 0xb7, 0x8b, 0xbd, 0xf4, 0x6d, 0xc1, 0x79, 0x9d, 0xac, 0xe5, 0x39, 0x67, 0x8d, 0xfe, 0x15, 0x71, + 0xa1, 0x97, 0x16, 0xde, 0xd4, 0x10, 0x3b, 0xcf, 0xc7, 0x6c, 0xc4, 0x25, 0x19, 0xb9, 0x56, 0x98, + 0xca, 0x88, 0x35, 0x4f, 0x04, 0xfe, 0x14, 0xba, 0xc5, 0x21, 0x8a, 0xdc, 0xd7, 0xbe, 0xac, 0x1e, + 0xbc, 0xec, 0xb7, 0x5e, 0x7b, 0x2e, 0x41, 0x1b, 0xcc, 0x8b, 0xdf, 0xb5, 0x3f, 0xfc, 0x7f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x37, 0x77, 0x59, 0xa8, 0x09, 0x17, 0x00, 0x00, } diff --git a/lnrpc/rpc.proto b/lnrpc/rpc.proto index e1dfd5b7..90516a1c 100644 --- a/lnrpc/rpc.proto +++ b/lnrpc/rpc.proto @@ -144,7 +144,7 @@ message ChannelPoint { } message LightningAddress { - string pubKeyHash = 1; + string pubkey = 1; string host = 2; } @@ -233,7 +233,6 @@ message ListPeersResponse { message GetInfoRequest{} message GetInfoResponse { string lightning_id = 1; - string identity_address = 2; string identity_pubkey = 3; uint32 num_pending_channels = 4; @@ -278,7 +277,7 @@ message PendingUpdate { message OpenChannelRequest { int32 target_peer_id = 1; - bytes target_node = 2; + bytes node_pubkey = 2; int64 local_funding_amount = 3; int64 remote_funding_amount = 4; @@ -307,7 +306,7 @@ message PendingChannelResponse { message PendingChannel { int32 peer_id = 1; - string lightning_id = 2; + string identity_key = 2; string channel_point = 3; int64 capacity = 4; diff --git a/lnrpc/rpc.swagger.json b/lnrpc/rpc.swagger.json index e5702d06..5c457cd2 100644 --- a/lnrpc/rpc.swagger.json +++ b/lnrpc/rpc.swagger.json @@ -391,7 +391,7 @@ "type": "string", "format": "string" }, - "lightning_id": { + "identity_key": { "type": "string", "format": "string" }, @@ -589,10 +589,6 @@ "lnrpcGetInfoResponse": { "type": "object", "properties": { - "identity_address": { - "type": "string", - "format": "string" - }, "identity_pubkey": { "type": "string", "format": "string" @@ -682,7 +678,7 @@ "type": "string", "format": "string" }, - "pubKeyHash": { + "pubkey": { "type": "string", "format": "string" } @@ -759,6 +755,10 @@ "type": "string", "format": "int64" }, + "node_pubkey": { + "type": "string", + "format": "byte" + }, "num_confs": { "type": "integer", "format": "int64" @@ -767,10 +767,6 @@ "type": "string", "format": "int64" }, - "target_node": { - "type": "string", - "format": "byte" - }, "target_peer_id": { "type": "integer", "format": "int32"