From ab824d1565745dd436e6527ffde61a00c42e61fc Mon Sep 17 00:00:00 2001 From: Yaacov Akiba Slama Date: Mon, 22 Jul 2019 15:12:35 +0300 Subject: [PATCH] Add output index to OpenChannelReply --- rpc/lspd.pb.go | 72 ++++++++++++++++++++++++++++---------------------- rpc/lspd.proto | 2 ++ server.go | 5 ++-- 3 files changed, 46 insertions(+), 33 deletions(-) diff --git a/rpc/lspd.pb.go b/rpc/lspd.pb.go index 88fd420..69793b9 100644 --- a/rpc/lspd.pb.go +++ b/rpc/lspd.pb.go @@ -35,7 +35,7 @@ func (m *ChannelInformationRequest) Reset() { *m = ChannelInformationReq func (m *ChannelInformationRequest) String() string { return proto.CompactTextString(m) } func (*ChannelInformationRequest) ProtoMessage() {} func (*ChannelInformationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_lspd_c62fb8bb40946759, []int{0} + return fileDescriptor_lspd_f6548acf9d60fb70, []int{0} } func (m *ChannelInformationRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ChannelInformationRequest.Unmarshal(m, b) @@ -94,7 +94,7 @@ func (m *ChannelInformationReply) Reset() { *m = ChannelInformationReply func (m *ChannelInformationReply) String() string { return proto.CompactTextString(m) } func (*ChannelInformationReply) ProtoMessage() {} func (*ChannelInformationReply) Descriptor() ([]byte, []int) { - return fileDescriptor_lspd_c62fb8bb40946759, []int{1} + return fileDescriptor_lspd_f6548acf9d60fb70, []int{1} } func (m *ChannelInformationReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ChannelInformationReply.Unmarshal(m, b) @@ -189,7 +189,7 @@ func (m *OpenChannelRequest) Reset() { *m = OpenChannelRequest{} } func (m *OpenChannelRequest) String() string { return proto.CompactTextString(m) } func (*OpenChannelRequest) ProtoMessage() {} func (*OpenChannelRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_lspd_c62fb8bb40946759, []int{2} + return fileDescriptor_lspd_f6548acf9d60fb70, []int{2} } func (m *OpenChannelRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OpenChannelRequest.Unmarshal(m, b) @@ -218,7 +218,9 @@ func (m *OpenChannelRequest) GetPubkey() string { type OpenChannelReply struct { // / The transaction hash - TxHash string `protobuf:"bytes,1,opt,name=tx_hash,proto3" json:"tx_hash,omitempty"` + TxHash string `protobuf:"bytes,1,opt,name=tx_hash,proto3" json:"tx_hash,omitempty"` + // / The output index + OutputIndex uint32 `protobuf:"varint,2,opt,name=output_index,proto3" json:"output_index,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -228,7 +230,7 @@ func (m *OpenChannelReply) Reset() { *m = OpenChannelReply{} } func (m *OpenChannelReply) String() string { return proto.CompactTextString(m) } func (*OpenChannelReply) ProtoMessage() {} func (*OpenChannelReply) Descriptor() ([]byte, []int) { - return fileDescriptor_lspd_c62fb8bb40946759, []int{3} + return fileDescriptor_lspd_f6548acf9d60fb70, []int{3} } func (m *OpenChannelReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OpenChannelReply.Unmarshal(m, b) @@ -255,6 +257,13 @@ func (m *OpenChannelReply) GetTxHash() string { return "" } +func (m *OpenChannelReply) GetOutputIndex() uint32 { + if m != nil { + return m.OutputIndex + } + return 0 +} + func init() { proto.RegisterType((*ChannelInformationRequest)(nil), "lspd.ChannelInformationRequest") proto.RegisterType((*ChannelInformationReply)(nil), "lspd.ChannelInformationReply") @@ -367,31 +376,32 @@ var _ChannelOpener_serviceDesc = grpc.ServiceDesc{ Metadata: "lspd.proto", } -func init() { proto.RegisterFile("lspd.proto", fileDescriptor_lspd_c62fb8bb40946759) } +func init() { proto.RegisterFile("lspd.proto", fileDescriptor_lspd_f6548acf9d60fb70) } -var fileDescriptor_lspd_c62fb8bb40946759 = []byte{ - // 364 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x8a, 0xdb, 0x30, - 0x10, 0xc6, 0xab, 0xfc, 0xcf, 0x84, 0xd0, 0x20, 0x4a, 0xaa, 0x06, 0x4a, 0x8d, 0xdb, 0x83, 0x29, - 0x21, 0x87, 0xe6, 0x09, 0x9a, 0x9e, 0x0a, 0x85, 0x06, 0x1f, 0x7a, 0x15, 0x8a, 0x32, 0x89, 0x4d, - 0x6c, 0x49, 0xb5, 0x94, 0x52, 0xbf, 0x52, 0xdf, 0xa0, 0x6f, 0xb7, 0xc8, 0xf6, 0x2e, 0xce, 0x26, - 0x61, 0x6f, 0x33, 0x9f, 0x7f, 0xf3, 0x8d, 0x35, 0x33, 0x00, 0x99, 0x35, 0xfb, 0x95, 0x29, 0xb4, - 0xd3, 0xb4, 0xe7, 0xe3, 0x70, 0x0d, 0xef, 0xbe, 0x25, 0x42, 0x29, 0xcc, 0xbe, 0xab, 0x83, 0x2e, - 0x72, 0xe1, 0x52, 0xad, 0x62, 0xfc, 0x7d, 0x46, 0xeb, 0xe8, 0x1c, 0x06, 0xe6, 0xbc, 0x3b, 0x61, - 0xc9, 0x48, 0x40, 0xa2, 0x71, 0xdc, 0x64, 0xe1, 0xff, 0x0e, 0xbc, 0xbd, 0x55, 0x65, 0xb2, 0x92, - 0x52, 0xe8, 0x29, 0x91, 0x63, 0x53, 0x51, 0xc5, 0x2d, 0x9f, 0x4e, 0xdb, 0xc7, 0xb3, 0x89, 0xb6, - 0x8e, 0x75, 0x6b, 0xd6, 0xc7, 0xf4, 0x33, 0xcc, 0x64, 0x6d, 0xcd, 0xa5, 0x30, 0x42, 0xa6, 0xae, - 0x64, 0xbd, 0x80, 0x44, 0xdd, 0xf8, 0x4a, 0xa7, 0x01, 0x4c, 0x9c, 0x28, 0x8e, 0xe8, 0xb8, 0xd4, - 0xea, 0xc0, 0xfa, 0x01, 0x89, 0xfa, 0x71, 0x5b, 0xa2, 0x9f, 0x60, 0xba, 0x13, 0x16, 0xf9, 0x01, - 0x91, 0xe7, 0x56, 0x38, 0x36, 0xa8, 0xac, 0x2e, 0x45, 0xba, 0x80, 0x91, 0x8f, 0x0b, 0xe1, 0x90, - 0x0d, 0x03, 0x12, 0x91, 0xf8, 0x29, 0xa7, 0x11, 0xbc, 0x76, 0x69, 0x8e, 0x3c, 0xd3, 0xf2, 0xc4, - 0xf7, 0x98, 0x39, 0xc1, 0x46, 0x01, 0x89, 0xa6, 0xf1, 0x73, 0xd9, 0xf7, 0xca, 0x53, 0xc5, 0x13, - 0x97, 0xc9, 0xba, 0xd7, 0xb8, 0xee, 0x75, 0x21, 0x86, 0x4b, 0xa0, 0x3f, 0x0d, 0xaa, 0x66, 0x7c, - 0x2f, 0x4d, 0x7a, 0x09, 0xb3, 0x0b, 0xda, 0x4f, 0x98, 0xc1, 0xd0, 0xfd, 0xe5, 0x89, 0xb0, 0x49, - 0x03, 0x3f, 0xa6, 0x5f, 0xfe, 0x11, 0x98, 0x36, 0xa8, 0xaf, 0xc2, 0x82, 0xfe, 0x02, 0x7a, 0xbd, - 0x28, 0xfa, 0x61, 0x55, 0xdd, 0xc1, 0xdd, 0xc5, 0x2f, 0xde, 0xdf, 0x07, 0x4c, 0x56, 0x86, 0xaf, - 0xe8, 0x57, 0x98, 0xb4, 0xfe, 0x8b, 0xb2, 0x9a, 0xbf, 0x7e, 0xd8, 0x62, 0x7e, 0xe3, 0x4b, 0x65, - 0xb1, 0xf9, 0x08, 0x6f, 0x52, 0xbd, 0x3a, 0x16, 0x46, 0xd6, 0x88, 0xc5, 0xe2, 0x4f, 0x2a, 0x71, - 0x33, 0xfe, 0x61, 0xcd, 0x7e, 0xeb, 0x4f, 0x74, 0x4b, 0x76, 0x83, 0xea, 0x56, 0xd7, 0x0f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0xf5, 0x9a, 0xe0, 0xb2, 0xb9, 0x02, 0x00, 0x00, +var fileDescriptor_lspd_f6548acf9d60fb70 = []byte{ + // 381 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xc1, 0x6e, 0xd4, 0x30, + 0x10, 0xc5, 0xed, 0x76, 0xdb, 0x9d, 0x12, 0x51, 0x8d, 0x50, 0x31, 0x2b, 0x21, 0xa2, 0xc0, 0x21, + 0x42, 0x68, 0x0f, 0xf4, 0x0b, 0x28, 0x27, 0x24, 0x24, 0x56, 0x39, 0x70, 0xb5, 0xbc, 0xce, 0x6c, + 0x13, 0x35, 0xb1, 0x4d, 0xec, 0xa0, 0xe6, 0x97, 0xf8, 0x03, 0xfe, 0x0e, 0x39, 0x09, 0x28, 0x61, + 0xbb, 0xe2, 0xf6, 0xe6, 0xe5, 0xcd, 0x9b, 0xe4, 0xe5, 0x01, 0x54, 0xce, 0xe6, 0x1b, 0xdb, 0x18, + 0x6f, 0x70, 0x11, 0x70, 0x72, 0x03, 0x2f, 0x3f, 0x15, 0x52, 0x6b, 0xaa, 0x3e, 0xeb, 0xbd, 0x69, + 0x6a, 0xe9, 0x4b, 0xa3, 0x33, 0xfa, 0xde, 0x92, 0xf3, 0x78, 0x0d, 0x4b, 0xdb, 0xee, 0xee, 0xa9, + 0xe3, 0x2c, 0x66, 0xe9, 0x2a, 0x1b, 0xa7, 0xe4, 0xd7, 0x09, 0xbc, 0x78, 0x6c, 0xcb, 0x56, 0x1d, + 0x22, 0x2c, 0xb4, 0xac, 0x69, 0xdc, 0xe8, 0xf1, 0xc4, 0xe7, 0x64, 0xea, 0x13, 0xb4, 0x85, 0x71, + 0x9e, 0x9f, 0x0e, 0xda, 0x80, 0xf1, 0x1d, 0x5c, 0xa9, 0xc1, 0x5a, 0x28, 0x69, 0xa5, 0x2a, 0x7d, + 0xc7, 0x17, 0x31, 0x4b, 0x4f, 0xb3, 0x03, 0x1e, 0x63, 0xb8, 0xf4, 0xb2, 0xb9, 0x23, 0x2f, 0x94, + 0xd1, 0x7b, 0x7e, 0x16, 0xb3, 0xf4, 0x2c, 0x9b, 0x52, 0xf8, 0x16, 0xa2, 0x9d, 0x74, 0x24, 0xf6, + 0x44, 0xa2, 0x76, 0xd2, 0xf3, 0x65, 0x6f, 0x35, 0x27, 0x71, 0x0d, 0x17, 0x01, 0x37, 0xd2, 0x13, + 0x3f, 0x8f, 0x59, 0xca, 0xb2, 0xbf, 0x33, 0xa6, 0xf0, 0xcc, 0x97, 0x35, 0x89, 0xca, 0xa8, 0x7b, + 0x91, 0x53, 0xe5, 0x25, 0xbf, 0x88, 0x59, 0x1a, 0x65, 0xff, 0xd2, 0xe1, 0x56, 0x5d, 0x6a, 0x51, + 0xf8, 0x4a, 0x0d, 0xb7, 0x56, 0xc3, 0xad, 0x19, 0x99, 0xbc, 0x07, 0xfc, 0x6a, 0x49, 0x8f, 0xf1, + 0xfd, 0x2f, 0xe9, 0x2d, 0x5c, 0xcd, 0xd4, 0x21, 0x61, 0x0e, 0xe7, 0xfe, 0x41, 0x14, 0xd2, 0x15, + 0xa3, 0xf8, 0xcf, 0x88, 0x09, 0x3c, 0x35, 0xad, 0xb7, 0xad, 0x17, 0xa5, 0xce, 0xe9, 0xa1, 0x4f, + 0x3b, 0xca, 0x66, 0xdc, 0x87, 0x9f, 0x0c, 0xa2, 0xd1, 0x2e, 0x38, 0x53, 0x83, 0xdf, 0x00, 0x0f, + 0x7f, 0x26, 0xbe, 0xde, 0xf4, 0x5d, 0x39, 0x5a, 0x8e, 0xf5, 0xab, 0xe3, 0x02, 0x5b, 0x75, 0xc9, + 0x13, 0xfc, 0x08, 0x97, 0x93, 0x77, 0x47, 0x3e, 0xe8, 0x0f, 0x3f, 0x7e, 0x7d, 0xfd, 0xc8, 0x93, + 0xde, 0xe2, 0xf6, 0x0d, 0x3c, 0x2f, 0xcd, 0xe6, 0xae, 0xb1, 0x6a, 0x90, 0x38, 0x6a, 0x7e, 0x94, + 0x8a, 0x6e, 0x57, 0x5f, 0x9c, 0xcd, 0xb7, 0xa1, 0xc6, 0x5b, 0xb6, 0x5b, 0xf6, 0x7d, 0xbe, 0xf9, + 0x1d, 0x00, 0x00, 0xff, 0xff, 0x47, 0xd9, 0x92, 0x62, 0xdd, 0x02, 0x00, 0x00, } diff --git a/rpc/lspd.proto b/rpc/lspd.proto index 42a7c75..cdb16ba 100644 --- a/rpc/lspd.proto +++ b/rpc/lspd.proto @@ -53,4 +53,6 @@ message OpenChannelRequest { message OpenChannelReply { /// The transaction hash string tx_hash = 1 [ json_name = "tx_hash" ]; + /// The output index + uint32 output_index = 2 [ json_name = "output_index"]; } diff --git a/server.go b/server.go index 8d9d490..c2b6a64 100644 --- a/server.go +++ b/server.go @@ -56,6 +56,7 @@ func (s *server) OpenChannel(ctx context.Context, in *lspdrpc.OpenChannelRequest return nil, err } var txidStr string + var outputIndex uint32 if len(nodeChannels) == 0 && len(pendingChannels) == 0 { response, err := client.OpenChannelSync(clientCtx, &lnrpc.OpenChannelRequest{ LocalFundingAmount: channelAmount, @@ -73,14 +74,14 @@ func (s *server) OpenChannel(ctx context.Context, in *lspdrpc.OpenChannelRequest } txid, _ := chainhash.NewHash(response.GetFundingTxidBytes()) - + outputIndex = response.GetOutputIndex() // don't fail the request in case we can't format the channel id from // some reason... if txid != nil { txidStr = txid.String() } } - return &lspdrpc.OpenChannelReply{TxHash: txidStr}, nil + return &lspdrpc.OpenChannelReply{TxHash: txidStr, OutputIndex: outputIndex}, nil }) if err != nil {