From eb700d35e12eebd9f72badfeacdc6390fc74d9d3 Mon Sep 17 00:00:00 2001 From: Joost Jager Date: Thu, 18 Apr 2019 09:34:28 +0200 Subject: [PATCH] routerrpc: extend payment request parameters Add missing parameters to routerrpc version of SendPayment. --- lnrpc/routerrpc/config_active.go | 9 +- lnrpc/routerrpc/router.pb.go | 296 +++++++++++++++++------------- lnrpc/routerrpc/router.proto | 54 ++++-- lnrpc/routerrpc/router_backend.go | 164 +++++++++++++++++ lnrpc/routerrpc/router_server.go | 46 +---- rpcserver.go | 19 +- subrpcserver_config.go | 3 - 7 files changed, 376 insertions(+), 215 deletions(-) diff --git a/lnrpc/routerrpc/config_active.go b/lnrpc/routerrpc/config_active.go index c2ee3a234..d04f5821c 100644 --- a/lnrpc/routerrpc/config_active.go +++ b/lnrpc/routerrpc/config_active.go @@ -5,10 +5,9 @@ package routerrpc import ( "time" - "github.com/lightningnetwork/lnd/lnwire" - "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcutil" + "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/macaroons" "github.com/lightningnetwork/lnd/routing" ) @@ -45,12 +44,6 @@ type Config struct { // server will find the macaroon named DefaultRouterMacFilename. NetworkDir string - // ActiveNetParams are the network parameters of the primary network - // that the route is operating on. This is necessary so we can ensure - // that we receive payment requests that send to destinations on our - // network. - ActiveNetParams *chaincfg.Params - // MacService is the main macaroon service that we'll use to handle // authentication for the Router rpc server. MacService *macaroons.Service diff --git a/lnrpc/routerrpc/router.pb.go b/lnrpc/routerrpc/router.pb.go index 63c436446..224bd4d01 100644 --- a/lnrpc/routerrpc/router.pb.go +++ b/lnrpc/routerrpc/router.pb.go @@ -113,32 +113,43 @@ func (Failure_FailureCode) EnumDescriptor() ([]byte, []int) { } type PaymentRequest struct { + /// The identity pubkey of the payment recipient + Dest []byte `protobuf:"bytes,1,opt,name=dest,proto3" json:"dest,omitempty"` + /// Number of satoshis to send. + Amt int64 `protobuf:"varint,2,opt,name=amt,proto3" json:"amt,omitempty"` + /// The hash to use within the payment's HTLC + PaymentHash []byte `protobuf:"bytes,3,opt,name=payment_hash,json=paymentHash,proto3" json:"payment_hash,omitempty"` //* - //A serialized BOLT-11 payment request that contains all information - //required to dispatch the payment. If the pay req is invalid, or expired, - //an error will be returned. - PayReq string `protobuf:"bytes,1,opt,name=pay_req,json=payReq,proto3" json:"pay_req,omitempty"` + //The CLTV delta from the current height that should be used to set the + //timelock for the final hop. + FinalCltvDelta int32 `protobuf:"varint,4,opt,name=final_cltv_delta,json=finalCltvDelta,proto3" json:"final_cltv_delta,omitempty"` //* - //An absolute limit on the highest fee we should pay when looking for a route - //to the destination. Routes with fees higher than this will be ignored, if - //there are no routes with a fee below this amount, an error will be - //returned. - FeeLimitSat int64 `protobuf:"varint,2,opt,name=fee_limit_sat,json=feeLimitSat,proto3" json:"fee_limit_sat,omitempty"` - //* - //An absolute limit on the cumulative CLTV value along the route for this - //payment. Routes with total CLTV values higher than this will be ignored, - //if there are no routes with a CLTV value below this amount, an error will - //be returned. - CltvLimit int32 `protobuf:"varint,3,opt,name=cltv_limit,json=cltvLimit,proto3" json:"cltv_limit,omitempty"` + //A bare-bones invoice for a payment within the Lightning Network. With the + //details of the invoice, the sender has all the data necessary to send a + //payment to the recipient. The amount in the payment request may be zero. In + //that case it is required to set the amt field as well. If no payment request + //is specified, the following fields are required: dest, amt and payment_hash. + PaymentRequest string `protobuf:"bytes,5,opt,name=payment_request,json=paymentRequest,proto3" json:"payment_request,omitempty"` //* //An upper limit on the amount of time we should spend when attempting to //fulfill the payment. This is expressed in seconds. If we cannot make a //successful payment within this time frame, an error will be returned. - TimeoutSeconds int32 `protobuf:"varint,4,opt,name=timeout_seconds,json=timeoutSeconds,proto3" json:"timeout_seconds,omitempty"` + //This field must be non-zero. + TimeoutSeconds int32 `protobuf:"varint,6,opt,name=timeout_seconds,json=timeoutSeconds,proto3" json:"timeout_seconds,omitempty"` + //* + //The maximum number of satoshis that will be paid as a fee of the payment. + //If this field is left to the default value of 0, only zero-fee routes will + //be considered. This usually means single hop routes connecting directly to + //the destination. To send the payment without a fee limit, use max int here. + FeeLimitSat int64 `protobuf:"varint,7,opt,name=fee_limit_sat,json=feeLimitSat,proto3" json:"fee_limit_sat,omitempty"` //* //The channel id of the channel that must be taken to the first hop. If zero, //any channel may be used. - OutgoingChannelId int64 `protobuf:"varint,5,opt,name=outgoing_channel_id,json=outgoingChannelId,proto3" json:"outgoing_channel_id,omitempty"` + OutgoingChanId uint64 `protobuf:"varint,8,opt,name=outgoing_chan_id,json=outgoingChanId,proto3" json:"outgoing_chan_id,omitempty"` + //* + //An optional maximum total time lock for the route. If zero, there is no + //maximum enforced. + CltvLimit int32 `protobuf:"varint,9,opt,name=cltv_limit,json=cltvLimit,proto3" json:"cltv_limit,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -169,27 +180,41 @@ func (m *PaymentRequest) XXX_DiscardUnknown() { var xxx_messageInfo_PaymentRequest proto.InternalMessageInfo -func (m *PaymentRequest) GetPayReq() string { +func (m *PaymentRequest) GetDest() []byte { if m != nil { - return m.PayReq + return m.Dest + } + return nil +} + +func (m *PaymentRequest) GetAmt() int64 { + if m != nil { + return m.Amt + } + return 0 +} + +func (m *PaymentRequest) GetPaymentHash() []byte { + if m != nil { + return m.PaymentHash + } + return nil +} + +func (m *PaymentRequest) GetFinalCltvDelta() int32 { + if m != nil { + return m.FinalCltvDelta + } + return 0 +} + +func (m *PaymentRequest) GetPaymentRequest() string { + if m != nil { + return m.PaymentRequest } return "" } -func (m *PaymentRequest) GetFeeLimitSat() int64 { - if m != nil { - return m.FeeLimitSat - } - return 0 -} - -func (m *PaymentRequest) GetCltvLimit() int32 { - if m != nil { - return m.CltvLimit - } - return 0 -} - func (m *PaymentRequest) GetTimeoutSeconds() int32 { if m != nil { return m.TimeoutSeconds @@ -197,9 +222,23 @@ func (m *PaymentRequest) GetTimeoutSeconds() int32 { return 0 } -func (m *PaymentRequest) GetOutgoingChannelId() int64 { +func (m *PaymentRequest) GetFeeLimitSat() int64 { if m != nil { - return m.OutgoingChannelId + return m.FeeLimitSat + } + return 0 +} + +func (m *PaymentRequest) GetOutgoingChanId() uint64 { + if m != nil { + return m.OutgoingChanId + } + return 0 +} + +func (m *PaymentRequest) GetCltvLimit() int32 { + if m != nil { + return m.CltvLimit } return 0 } @@ -1027,98 +1066,101 @@ func init() { func init() { proto.RegisterFile("routerrpc/router.proto", fileDescriptor_7a0613f69d37b0a5) } var fileDescriptor_7a0613f69d37b0a5 = []byte{ - // 1456 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xdb, 0x72, 0x1a, 0x47, - 0x13, 0xfe, 0x31, 0x12, 0x87, 0xe6, 0xa0, 0xd5, 0xe8, 0x60, 0x84, 0x2c, 0x5b, 0xde, 0xff, 0xff, - 0x1d, 0x95, 0xcb, 0x25, 0x55, 0x48, 0xd9, 0x95, 0xab, 0xa4, 0x30, 0x2c, 0xd1, 0x96, 0x60, 0xc1, - 0x03, 0xc8, 0x56, 0x72, 0x31, 0x35, 0x62, 0x47, 0xb0, 0x11, 0xec, 0xae, 0x76, 0x87, 0xc4, 0xe4, - 0x01, 0xf2, 0x3a, 0xc9, 0x4d, 0x6e, 0x73, 0x97, 0x87, 0xc8, 0xdb, 0xa4, 0x66, 0x66, 0x97, 0x83, - 0x8c, 0x92, 0x5c, 0xc1, 0x7e, 0xdf, 0x37, 0xdd, 0xd3, 0x3d, 0xdd, 0x3d, 0x03, 0xfb, 0x81, 0x37, - 0xe5, 0x2c, 0x08, 0xfc, 0xc1, 0x99, 0xfa, 0x77, 0xea, 0x07, 0x1e, 0xf7, 0x50, 0x76, 0x8e, 0x97, - 0xb3, 0x81, 0x3f, 0x50, 0xa8, 0xfe, 0x47, 0x02, 0x8a, 0x1d, 0x3a, 0x9b, 0x30, 0x97, 0x63, 0x76, - 0x37, 0x65, 0x21, 0x47, 0x8f, 0x21, 0xed, 0xd3, 0x19, 0x09, 0xd8, 0x5d, 0x29, 0x71, 0x9c, 0x38, - 0xc9, 0xe2, 0x94, 0x4f, 0x67, 0x98, 0xdd, 0x21, 0x1d, 0x0a, 0x37, 0x8c, 0x91, 0xb1, 0x33, 0x71, - 0x38, 0x09, 0x29, 0x2f, 0x3d, 0x3a, 0x4e, 0x9c, 0x24, 0x71, 0xee, 0x86, 0xb1, 0xa6, 0xc0, 0xba, - 0x94, 0xa3, 0x23, 0x80, 0xc1, 0x98, 0xff, 0xa0, 0x44, 0xa5, 0xe4, 0x71, 0xe2, 0x64, 0x13, 0x67, - 0x05, 0x22, 0x15, 0xe8, 0x33, 0xd8, 0xe2, 0xce, 0x84, 0x79, 0x53, 0x4e, 0x42, 0x36, 0xf0, 0x5c, - 0x3b, 0x2c, 0x6d, 0x48, 0x4d, 0x31, 0x82, 0xbb, 0x0a, 0x45, 0xa7, 0xb0, 0xe3, 0x4d, 0xf9, 0xd0, - 0x73, 0xdc, 0x21, 0x19, 0x8c, 0xa8, 0xeb, 0xb2, 0x31, 0x71, 0xec, 0xd2, 0xa6, 0xf4, 0xb8, 0x1d, - 0x53, 0x35, 0xc5, 0x98, 0xb6, 0xfe, 0x3d, 0x6c, 0xcd, 0xc3, 0x08, 0x7d, 0xcf, 0x0d, 0x19, 0x3a, - 0x80, 0x8c, 0x88, 0x63, 0x44, 0xc3, 0x91, 0x0c, 0x24, 0x8f, 0x45, 0x5c, 0xe7, 0x34, 0x1c, 0xa1, - 0x43, 0xc8, 0xfa, 0x01, 0x23, 0xce, 0x84, 0x0e, 0x99, 0x8c, 0x22, 0x8f, 0x33, 0x7e, 0xc0, 0x4c, - 0xf1, 0x8d, 0x9e, 0x41, 0xce, 0x57, 0xa6, 0x08, 0x0b, 0x02, 0x19, 0x43, 0x16, 0x43, 0x04, 0x19, - 0x41, 0xa0, 0x7f, 0x05, 0x5b, 0x58, 0xe4, 0xb2, 0xc1, 0x58, 0x9c, 0x33, 0x04, 0x1b, 0x36, 0x0b, - 0x79, 0xe4, 0x47, 0xfe, 0x17, 0x79, 0xa4, 0x93, 0xe5, 0x44, 0xa5, 0xe8, 0x44, 0xe4, 0x48, 0xb7, - 0x41, 0x5b, 0xac, 0x8f, 0x36, 0x7b, 0x02, 0x9a, 0x38, 0x1f, 0x11, 0xae, 0xc8, 0xf1, 0x44, 0xac, - 0x4a, 0xc8, 0x55, 0xc5, 0x08, 0x6f, 0x30, 0xd6, 0x0a, 0x29, 0x47, 0x2f, 0x54, 0x0a, 0xc9, 0xd8, - 0x1b, 0xdc, 0x12, 0x9b, 0x8d, 0xe9, 0x2c, 0x32, 0x5f, 0x10, 0x70, 0xd3, 0x1b, 0xdc, 0xd6, 0x05, - 0xa8, 0x7f, 0x07, 0xa8, 0xcb, 0x5c, 0xbb, 0xe7, 0x49, 0x5f, 0xf1, 0x46, 0x9f, 0x43, 0x3e, 0x0e, - 0x6e, 0x29, 0x31, 0x71, 0xc0, 0x32, 0x39, 0x3a, 0x6c, 0xca, 0x52, 0x91, 0x66, 0x73, 0x95, 0xfc, - 0xe9, 0xd8, 0x15, 0xf5, 0xa2, 0xcc, 0x28, 0x4a, 0x27, 0xb0, 0xb3, 0x62, 0x3c, 0x8a, 0xa2, 0x0c, - 0x22, 0x8d, 0x2a, 0xad, 0x89, 0x79, 0x5a, 0xe5, 0x37, 0x7a, 0x05, 0xe9, 0x1b, 0xea, 0x8c, 0xa7, - 0x41, 0x6c, 0x18, 0x9d, 0xce, 0x2b, 0xf2, 0xb4, 0xa1, 0x18, 0x1c, 0x4b, 0xf4, 0x9f, 0xd3, 0x90, - 0x8e, 0x40, 0x54, 0x81, 0x8d, 0x81, 0x67, 0x2b, 0x8b, 0xc5, 0xca, 0xd3, 0x4f, 0x97, 0xc5, 0xbf, - 0x35, 0xcf, 0x66, 0x58, 0x6a, 0x51, 0x05, 0xf6, 0x22, 0x53, 0x24, 0xf4, 0xa6, 0xc1, 0x80, 0x11, - 0x7f, 0x7a, 0x7d, 0xcb, 0x66, 0xd1, 0x69, 0xef, 0x44, 0x64, 0x57, 0x72, 0x1d, 0x49, 0xa1, 0xaf, - 0xa1, 0x18, 0x97, 0xda, 0xd4, 0xb7, 0x29, 0x67, 0xf2, 0xec, 0x73, 0x95, 0xd2, 0x92, 0xc7, 0xa8, - 0xe2, 0xfa, 0x92, 0xc7, 0x85, 0xc1, 0xf2, 0xa7, 0x28, 0xab, 0x11, 0x1f, 0x0f, 0xd4, 0xe9, 0x89, - 0xba, 0xde, 0xc0, 0x19, 0x01, 0xc8, 0x73, 0xd3, 0xa1, 0xe0, 0xb9, 0x8e, 0xe7, 0x92, 0x70, 0x44, - 0x49, 0xe5, 0xf5, 0x1b, 0x59, 0xcb, 0x79, 0x9c, 0x93, 0x60, 0x77, 0x44, 0x2b, 0xaf, 0xdf, 0x88, - 0xd2, 0x93, 0xdd, 0xc3, 0x3e, 0xfa, 0x4e, 0x30, 0x2b, 0xa5, 0x8e, 0x13, 0x27, 0x05, 0x2c, 0x1b, - 0xca, 0x90, 0x08, 0xda, 0x85, 0xcd, 0x9b, 0x31, 0x1d, 0x86, 0xa5, 0xb4, 0xa4, 0xd4, 0x87, 0xfe, - 0xe7, 0x06, 0xe4, 0x96, 0x52, 0x80, 0xf2, 0x90, 0xc1, 0x46, 0xd7, 0xc0, 0x97, 0x46, 0x5d, 0xfb, - 0x0f, 0x2a, 0xc1, 0x6e, 0xdf, 0xba, 0xb0, 0xda, 0xef, 0x2d, 0xd2, 0xa9, 0x5e, 0xb5, 0x0c, 0xab, - 0x47, 0xce, 0xab, 0xdd, 0x73, 0x2d, 0x81, 0x9e, 0x40, 0xc9, 0xb4, 0x6a, 0x6d, 0x8c, 0x8d, 0x5a, - 0x6f, 0xce, 0x55, 0x5b, 0xed, 0xbe, 0xd5, 0xd3, 0x1e, 0xa1, 0x67, 0x70, 0xd8, 0x30, 0xad, 0x6a, - 0x93, 0x2c, 0x34, 0xb5, 0x66, 0xef, 0x92, 0x18, 0x1f, 0x3a, 0x26, 0xbe, 0xd2, 0x92, 0xeb, 0x04, - 0xe7, 0xbd, 0x66, 0x2d, 0xb6, 0xb0, 0x81, 0x0e, 0x60, 0x4f, 0x09, 0xd4, 0x12, 0xd2, 0x6b, 0xb7, - 0x49, 0xb7, 0xdd, 0xb6, 0xb4, 0x4d, 0xb4, 0x0d, 0x05, 0xd3, 0xba, 0xac, 0x36, 0xcd, 0x3a, 0xc1, - 0x46, 0xb5, 0xd9, 0xd2, 0x52, 0x68, 0x07, 0xb6, 0xee, 0xeb, 0xd2, 0xc2, 0x44, 0xac, 0x6b, 0x5b, - 0x66, 0xdb, 0x22, 0x97, 0x06, 0xee, 0x9a, 0x6d, 0x4b, 0xcb, 0xa0, 0x7d, 0x40, 0xab, 0xd4, 0x79, - 0xab, 0x5a, 0xd3, 0xb2, 0x68, 0x0f, 0xb6, 0x57, 0xf1, 0x0b, 0xe3, 0x4a, 0x03, 0x91, 0x06, 0xb5, - 0x31, 0xf2, 0xd6, 0x68, 0xb6, 0xdf, 0x93, 0x96, 0x69, 0x99, 0xad, 0x7e, 0x4b, 0xcb, 0xa1, 0x5d, - 0xd0, 0x1a, 0x86, 0x41, 0x4c, 0xab, 0xdb, 0x6f, 0x34, 0xcc, 0x9a, 0x69, 0x58, 0x3d, 0x2d, 0xaf, - 0x3c, 0xaf, 0x0b, 0xbc, 0x20, 0x16, 0xd4, 0xce, 0xab, 0x96, 0x65, 0x34, 0x49, 0xdd, 0xec, 0x56, - 0xdf, 0x36, 0x8d, 0xba, 0x56, 0x44, 0x47, 0x70, 0xd0, 0x33, 0x5a, 0x9d, 0x36, 0xae, 0xe2, 0x2b, - 0x12, 0xf3, 0x8d, 0xaa, 0xd9, 0xec, 0x63, 0x43, 0xdb, 0x42, 0xcf, 0xe1, 0x08, 0x1b, 0xef, 0xfa, - 0x26, 0x36, 0xea, 0xc4, 0x6a, 0xd7, 0x0d, 0xd2, 0x30, 0xaa, 0xbd, 0x3e, 0x36, 0x48, 0xcb, 0xec, - 0x76, 0x4d, 0xeb, 0x1b, 0x4d, 0x43, 0xff, 0x83, 0xe3, 0xb9, 0x64, 0x6e, 0xe0, 0x9e, 0x6a, 0x5b, - 0xc4, 0x17, 0x9f, 0xa7, 0x65, 0x7c, 0xe8, 0x91, 0x8e, 0x61, 0x60, 0x0d, 0xa1, 0x32, 0xec, 0x2f, - 0xdc, 0x2b, 0x07, 0x91, 0xef, 0x1d, 0xc1, 0x75, 0x0c, 0xdc, 0xaa, 0x5a, 0xe2, 0x80, 0x57, 0xb8, - 0x5d, 0xb1, 0xed, 0x05, 0x77, 0x7f, 0xdb, 0x7b, 0xfa, 0x2f, 0x49, 0x28, 0xac, 0x14, 0x3d, 0x7a, - 0x02, 0xd9, 0xd0, 0x19, 0xba, 0x94, 0x8b, 0x56, 0x56, 0x5d, 0xbe, 0x00, 0xe4, 0x05, 0x30, 0xa2, - 0x8e, 0xab, 0xc6, 0x8b, 0xea, 0xb6, 0xac, 0x44, 0xe4, 0x70, 0x79, 0x0c, 0x69, 0xd1, 0x33, 0x62, - 0x96, 0x27, 0x65, 0x83, 0xa4, 0xc4, 0xa7, 0x69, 0x0b, 0xab, 0x62, 0x7e, 0x85, 0x9c, 0x4e, 0x7c, - 0xd9, 0x3b, 0x05, 0xbc, 0x00, 0xd0, 0x7f, 0xa1, 0x30, 0x61, 0x61, 0x48, 0x87, 0x8c, 0xa8, 0xfa, - 0x07, 0xa9, 0xc8, 0x47, 0x60, 0x43, 0x60, 0x42, 0x14, 0xf7, 0xaf, 0x12, 0x6d, 0x2a, 0x51, 0x04, - 0x2a, 0xd1, 0xfd, 0xf1, 0xc9, 0x69, 0xd4, 0x66, 0xcb, 0xe3, 0x93, 0x53, 0xf4, 0x12, 0xb6, 0x55, - 0x2f, 0x3b, 0xae, 0x33, 0x99, 0x4e, 0x54, 0x4f, 0xa7, 0xe5, 0x96, 0xb7, 0x64, 0x4f, 0x2b, 0x5c, - 0xb6, 0xf6, 0x01, 0x64, 0xae, 0x69, 0xc8, 0xc4, 0xe4, 0x2e, 0x65, 0xa4, 0xb1, 0xb4, 0xf8, 0x6e, - 0x30, 0x79, 0x09, 0x89, 0x79, 0x1e, 0x88, 0x69, 0x92, 0x55, 0xd4, 0x0d, 0x63, 0x58, 0xe4, 0x71, - 0xee, 0x81, 0x7e, 0x5c, 0x78, 0xc8, 0x2d, 0x79, 0x50, 0xb8, 0xf4, 0xf0, 0x12, 0xb6, 0xd9, 0x47, - 0x1e, 0x50, 0xe2, 0xf9, 0xf4, 0x6e, 0xca, 0x88, 0x4d, 0x39, 0x2d, 0xe5, 0x65, 0x72, 0xb7, 0x24, - 0xd1, 0x96, 0x78, 0x9d, 0x72, 0xaa, 0x3f, 0x81, 0x32, 0x66, 0x21, 0xe3, 0x2d, 0x27, 0x0c, 0x1d, - 0xcf, 0xad, 0x79, 0x2e, 0x0f, 0xbc, 0x71, 0x74, 0x01, 0xe8, 0x47, 0x70, 0xb8, 0x96, 0x55, 0x13, - 0x5c, 0x2c, 0x7e, 0x37, 0x65, 0xc1, 0x6c, 0xfd, 0xe2, 0x0b, 0x38, 0x5c, 0xcb, 0x46, 0xe3, 0xff, - 0x15, 0x6c, 0xba, 0x9e, 0xcd, 0xc2, 0x52, 0xe2, 0x38, 0x79, 0x92, 0xab, 0xec, 0x2f, 0xcd, 0x4d, - 0xcb, 0xb3, 0xd9, 0xb9, 0x13, 0x72, 0x2f, 0x98, 0x61, 0x25, 0xd2, 0x7f, 0x4f, 0x40, 0x6e, 0x09, - 0x46, 0xfb, 0x90, 0x8a, 0x66, 0xb4, 0x2a, 0xaa, 0xe8, 0x0b, 0xbd, 0x80, 0xe2, 0x98, 0x86, 0x9c, - 0x88, 0x91, 0x4d, 0xc4, 0x21, 0x45, 0xf7, 0xdd, 0x3d, 0x14, 0x7d, 0x09, 0x8f, 0x3d, 0x3e, 0x62, - 0x81, 0x7c, 0x2f, 0x90, 0x70, 0x3a, 0x18, 0xb0, 0x30, 0x24, 0x7e, 0xe0, 0x5d, 0xcb, 0x52, 0x7b, - 0x84, 0x1f, 0xa2, 0xd1, 0x6b, 0xc8, 0x44, 0x35, 0x22, 0x9e, 0x23, 0x62, 0xeb, 0x07, 0x9f, 0x8e, - 0xfc, 0x78, 0xf7, 0x73, 0xa9, 0xfe, 0x6b, 0x02, 0x8a, 0xab, 0x24, 0x7a, 0x2a, 0xab, 0x3f, 0x7e, - 0xad, 0x24, 0xe4, 0x61, 0x2e, 0x21, 0xff, 0x3a, 0x96, 0x0a, 0xec, 0x4e, 0x1c, 0x97, 0xf8, 0xcc, - 0xa5, 0x63, 0xe7, 0x27, 0x46, 0xe2, 0x87, 0x44, 0x52, 0xaa, 0xd7, 0x72, 0x48, 0x87, 0xfc, 0x4a, - 0xd0, 0x1b, 0x32, 0xe8, 0x15, 0xac, 0xf2, 0x5b, 0x12, 0x52, 0xf2, 0xca, 0x0e, 0x50, 0x1d, 0x72, - 0xe2, 0x0a, 0x8f, 0x5e, 0x4d, 0x68, 0x39, 0xe2, 0xd5, 0x07, 0x61, 0xb9, 0xbc, 0x8e, 0x8a, 0x8e, - 0xfc, 0x02, 0x34, 0x23, 0xe4, 0xce, 0x44, 0xdc, 0x86, 0xd1, 0x9b, 0x06, 0x2d, 0xeb, 0xef, 0x3d, - 0x94, 0xca, 0x87, 0x6b, 0xb9, 0xc8, 0x58, 0x53, 0x6d, 0x29, 0x7a, 0x55, 0xa0, 0xa3, 0x25, 0xed, - 0xa7, 0x4f, 0x99, 0xf2, 0xd3, 0x87, 0xe8, 0xc8, 0x9a, 0x0d, 0x3b, 0x6b, 0x2a, 0x1d, 0xfd, 0x7f, - 0x79, 0x07, 0x0f, 0xf6, 0x49, 0xf9, 0xc5, 0x3f, 0xc9, 0x16, 0x5e, 0xd6, 0xb4, 0xc4, 0x8a, 0x97, - 0x87, 0x1b, 0x6a, 0xc5, 0xcb, 0xdf, 0x74, 0xd6, 0xdb, 0xcf, 0xbf, 0x3d, 0x1b, 0x3a, 0x7c, 0x34, - 0xbd, 0x3e, 0x1d, 0x78, 0x93, 0xb3, 0xb1, 0x33, 0x1c, 0x71, 0xd7, 0x71, 0x87, 0x2e, 0xe3, 0x3f, - 0x7a, 0xc1, 0xed, 0xd9, 0xd8, 0xb5, 0xcf, 0xe4, 0x2b, 0xed, 0x6c, 0x6e, 0xee, 0x3a, 0x25, 0x1f, - 0xf8, 0x5f, 0xfc, 0x15, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x3e, 0x2a, 0xde, 0x10, 0x0c, 0x00, 0x00, + // 1503 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0xdd, 0x72, 0xda, 0xce, + 0x15, 0x2f, 0x06, 0x1b, 0x38, 0x7c, 0xc9, 0xeb, 0x8f, 0x60, 0x6c, 0xe7, 0xef, 0xa8, 0x6d, 0xc2, + 0x64, 0x32, 0xf6, 0x94, 0x4e, 0x32, 0xbd, 0x6a, 0x87, 0x80, 0xa8, 0x35, 0x06, 0xe1, 0x2c, 0xe0, + 0xc4, 0xed, 0xc5, 0xce, 0x1a, 0xad, 0x41, 0xb5, 0x90, 0x14, 0x69, 0x49, 0x43, 0x1f, 0xa0, 0xaf, + 0xd3, 0xde, 0xf4, 0xb6, 0x17, 0x7d, 0x8b, 0xbe, 0x4d, 0x67, 0x77, 0xc5, 0x97, 0x8d, 0xd3, 0xff, + 0x95, 0xd1, 0xef, 0xfc, 0xf6, 0x7c, 0x9f, 0xb3, 0x6b, 0x38, 0x0c, 0xfd, 0x29, 0x67, 0x61, 0x18, + 0x0c, 0x2f, 0xd4, 0xaf, 0xf3, 0x20, 0xf4, 0xb9, 0x8f, 0xb2, 0x0b, 0xbc, 0x92, 0x0d, 0x83, 0xa1, + 0x42, 0xf5, 0xff, 0x6c, 0x41, 0xf1, 0x9a, 0xce, 0x26, 0xcc, 0xe3, 0x98, 0x7d, 0x9d, 0xb2, 0x88, + 0x23, 0x04, 0x29, 0x9b, 0x45, 0xbc, 0x9c, 0x38, 0x4b, 0x54, 0xf3, 0x58, 0xfe, 0x46, 0x1a, 0x24, + 0xe9, 0x84, 0x97, 0xb7, 0xce, 0x12, 0xd5, 0x24, 0x16, 0x3f, 0xd1, 0x2b, 0xc8, 0x07, 0xea, 0x1c, + 0x19, 0xd3, 0x68, 0x5c, 0x4e, 0x4a, 0x76, 0x2e, 0xc6, 0x2e, 0x69, 0x34, 0x46, 0x55, 0xd0, 0xee, + 0x1d, 0x8f, 0xba, 0x64, 0xe8, 0xf2, 0x6f, 0xc4, 0x66, 0x2e, 0xa7, 0xe5, 0xd4, 0x59, 0xa2, 0xba, + 0x8d, 0x8b, 0x12, 0x6f, 0xb8, 0xfc, 0x5b, 0x53, 0xa0, 0xe8, 0x0d, 0x94, 0xe6, 0xca, 0x42, 0xe5, + 0x45, 0x79, 0xfb, 0x2c, 0x51, 0xcd, 0xe2, 0x62, 0xb0, 0xee, 0xdb, 0x1b, 0x28, 0x71, 0x67, 0xc2, + 0xfc, 0x29, 0x27, 0x11, 0x1b, 0xfa, 0x9e, 0x1d, 0x95, 0x77, 0x94, 0xc6, 0x18, 0xee, 0x29, 0x14, + 0xe9, 0x50, 0xb8, 0x67, 0x8c, 0xb8, 0xce, 0xc4, 0xe1, 0x24, 0xa2, 0xbc, 0x9c, 0x96, 0xae, 0xe7, + 0xee, 0x19, 0x6b, 0x0b, 0xac, 0x47, 0xb9, 0xf0, 0xcf, 0x9f, 0xf2, 0x91, 0xef, 0x78, 0x23, 0x32, + 0x1c, 0x53, 0x8f, 0x38, 0x76, 0x39, 0x73, 0x96, 0xa8, 0xa6, 0x70, 0x71, 0x8e, 0x37, 0xc6, 0xd4, + 0x33, 0x6d, 0x74, 0x0a, 0x20, 0x63, 0x90, 0xea, 0xca, 0x59, 0x69, 0x31, 0x2b, 0x10, 0xa9, 0x4b, + 0xff, 0x0b, 0x94, 0x16, 0x39, 0x8c, 0x02, 0xdf, 0x8b, 0x18, 0x3a, 0x82, 0x4c, 0x40, 0x67, 0x2a, + 0x35, 0x2a, 0x91, 0xe9, 0x80, 0xce, 0x64, 0x5a, 0x8e, 0x21, 0x1b, 0x84, 0x8c, 0x38, 0x13, 0x3a, + 0x62, 0x32, 0xa3, 0x79, 0x9c, 0x09, 0x42, 0x66, 0x8a, 0x6f, 0xf4, 0x13, 0xcc, 0x53, 0x48, 0x58, + 0x18, 0xca, 0xac, 0x66, 0x31, 0xc4, 0x90, 0x11, 0x86, 0xfa, 0xef, 0xa1, 0x84, 0x45, 0x21, 0x5b, + 0x8c, 0xfd, 0xa8, 0x60, 0x2f, 0x20, 0x4d, 0x27, 0x2a, 0x72, 0x55, 0xb4, 0x1d, 0x3a, 0x11, 0x41, + 0xeb, 0x36, 0x68, 0xcb, 0xf3, 0xb1, 0xb3, 0x55, 0xd0, 0x44, 0x73, 0x88, 0x3c, 0x88, 0xa4, 0x4d, + 0xc4, 0xa9, 0x84, 0x3c, 0x55, 0x8c, 0xf1, 0x16, 0x63, 0x9d, 0x88, 0x72, 0xf4, 0x5a, 0xe5, 0x9f, + 0xb8, 0xfe, 0xf0, 0x41, 0x54, 0x94, 0xce, 0x62, 0xf5, 0x05, 0x01, 0xb7, 0xfd, 0xe1, 0x43, 0x53, + 0x80, 0xfa, 0x9f, 0x01, 0xf5, 0x98, 0x67, 0xf7, 0x7d, 0x69, 0x6b, 0xee, 0xe8, 0xe3, 0x9e, 0x49, + 0x3c, 0xed, 0x19, 0x1d, 0xb6, 0x65, 0x9f, 0x4a, 0xb5, 0xb9, 0x5a, 0xfe, 0xdc, 0xf5, 0x44, 0xb3, + 0x2a, 0x35, 0x4a, 0xa4, 0x13, 0xd8, 0x5b, 0x53, 0x1e, 0x47, 0x51, 0x01, 0x91, 0x46, 0x95, 0xd6, + 0xc4, 0x22, 0xad, 0xf2, 0x1b, 0xbd, 0x83, 0xf4, 0x3d, 0x75, 0xdc, 0x69, 0x38, 0x57, 0x8c, 0xce, + 0x17, 0xe3, 0x70, 0xde, 0x52, 0x12, 0x3c, 0xa7, 0xe8, 0x7f, 0x4f, 0x43, 0x3a, 0x06, 0x51, 0x0d, + 0x52, 0x43, 0xdf, 0x56, 0x1a, 0x8b, 0xb5, 0x97, 0x4f, 0x8f, 0xcd, 0xff, 0x36, 0x7c, 0x9b, 0x61, + 0xc9, 0x45, 0x35, 0x38, 0x88, 0x55, 0x91, 0xc8, 0x9f, 0x86, 0x43, 0x46, 0x82, 0xe9, 0xdd, 0x03, + 0x9b, 0xc5, 0xd5, 0xde, 0x8b, 0x85, 0x3d, 0x29, 0xbb, 0x96, 0x22, 0xf4, 0x07, 0x28, 0x8a, 0x1e, + 0xf4, 0x98, 0x4b, 0xa6, 0x81, 0x4d, 0x39, 0x93, 0xb5, 0xcf, 0xd5, 0xca, 0x2b, 0x16, 0x1b, 0x8a, + 0x30, 0x90, 0x72, 0x5c, 0x18, 0xae, 0x7e, 0x8a, 0xb6, 0x1a, 0x73, 0x77, 0xa8, 0xaa, 0x97, 0x92, + 0x6d, 0x9c, 0x11, 0x80, 0xac, 0x9b, 0x0e, 0x05, 0xdf, 0x73, 0x7c, 0x8f, 0x44, 0x63, 0x4a, 0x6a, + 0xef, 0x3f, 0xc8, 0xf1, 0xca, 0xe3, 0x9c, 0x04, 0x7b, 0x63, 0x5a, 0x7b, 0xff, 0x41, 0xb4, 0x9e, + 0x6c, 0x72, 0xf6, 0x3d, 0x70, 0xc2, 0x99, 0x9c, 0xab, 0x02, 0x96, 0x7d, 0x6f, 0x48, 0x04, 0xed, + 0xc3, 0xf6, 0xbd, 0x4b, 0x47, 0x91, 0x9c, 0xa5, 0x02, 0x56, 0x1f, 0xfa, 0x7f, 0x53, 0x90, 0x5b, + 0x49, 0x01, 0xca, 0x43, 0x06, 0x1b, 0x3d, 0x03, 0xdf, 0x18, 0x4d, 0xed, 0x17, 0xa8, 0x0c, 0xfb, + 0x03, 0xeb, 0xca, 0xea, 0x7e, 0xb6, 0xc8, 0x75, 0xfd, 0xb6, 0x63, 0x58, 0x7d, 0x72, 0x59, 0xef, + 0x5d, 0x6a, 0x09, 0x74, 0x02, 0x65, 0xd3, 0x6a, 0x74, 0x31, 0x36, 0x1a, 0xfd, 0x85, 0xac, 0xde, + 0xe9, 0x0e, 0xac, 0xbe, 0xb6, 0x85, 0x7e, 0x82, 0xe3, 0x96, 0x69, 0xd5, 0xdb, 0x64, 0xc9, 0x69, + 0xb4, 0xfb, 0x37, 0xc4, 0xf8, 0x72, 0x6d, 0xe2, 0x5b, 0x2d, 0xb9, 0x89, 0x70, 0xd9, 0x6f, 0x37, + 0xe6, 0x1a, 0x52, 0xe8, 0x08, 0x0e, 0x14, 0x41, 0x1d, 0x21, 0xfd, 0x6e, 0x97, 0xf4, 0xba, 0x5d, + 0x4b, 0xdb, 0x46, 0xbb, 0x50, 0x30, 0xad, 0x9b, 0x7a, 0xdb, 0x6c, 0x12, 0x6c, 0xd4, 0xdb, 0x1d, + 0x6d, 0x07, 0xed, 0x41, 0xe9, 0x31, 0x2f, 0x2d, 0x54, 0xcc, 0x79, 0x5d, 0xcb, 0xec, 0x5a, 0xe4, + 0xc6, 0xc0, 0x3d, 0xb3, 0x6b, 0x69, 0x19, 0x74, 0x08, 0x68, 0x5d, 0x74, 0xd9, 0xa9, 0x37, 0xb4, + 0x2c, 0x3a, 0x80, 0xdd, 0x75, 0xfc, 0xca, 0xb8, 0xd5, 0x40, 0xa4, 0x41, 0x39, 0x46, 0x3e, 0x1a, + 0xed, 0xee, 0x67, 0xd2, 0x31, 0x2d, 0xb3, 0x33, 0xe8, 0x68, 0x39, 0xb4, 0x0f, 0x5a, 0xcb, 0x30, + 0x88, 0x69, 0xf5, 0x06, 0xad, 0x96, 0xd9, 0x30, 0x0d, 0xab, 0xaf, 0xe5, 0x95, 0xe5, 0x4d, 0x81, + 0x17, 0xc4, 0x81, 0xc6, 0x65, 0xdd, 0xb2, 0x8c, 0x36, 0x69, 0x9a, 0xbd, 0xfa, 0xc7, 0xb6, 0xd1, + 0xd4, 0x8a, 0xe8, 0x14, 0x8e, 0xfa, 0x46, 0xe7, 0xba, 0x8b, 0xeb, 0xf8, 0x96, 0xcc, 0xe5, 0xad, + 0xba, 0xd9, 0x1e, 0x60, 0x43, 0x2b, 0xa1, 0x57, 0x70, 0x8a, 0x8d, 0x4f, 0x03, 0x13, 0x1b, 0x4d, + 0x62, 0x75, 0x9b, 0x06, 0x69, 0x19, 0xf5, 0xfe, 0x00, 0x1b, 0xa4, 0x63, 0xf6, 0x7a, 0xa6, 0xf5, + 0x47, 0x4d, 0x43, 0xbf, 0x82, 0xb3, 0x05, 0x65, 0xa1, 0xe0, 0x11, 0x6b, 0x57, 0xc4, 0x37, 0xaf, + 0xa7, 0x65, 0x7c, 0xe9, 0x93, 0x6b, 0xc3, 0xc0, 0x1a, 0x42, 0x15, 0x38, 0x5c, 0x9a, 0x57, 0x06, + 0x62, 0xdb, 0x7b, 0x42, 0x76, 0x6d, 0xe0, 0x4e, 0xdd, 0x12, 0x05, 0x5e, 0x93, 0xed, 0x0b, 0xb7, + 0x97, 0xb2, 0xc7, 0x6e, 0x1f, 0xe8, 0xff, 0x48, 0x42, 0x61, 0xad, 0xe9, 0xd1, 0x09, 0x64, 0x23, + 0x67, 0xe4, 0x51, 0x2e, 0x46, 0x59, 0x4d, 0xf9, 0x12, 0x90, 0x7b, 0x7a, 0x4c, 0x1d, 0x4f, 0xad, + 0x17, 0x35, 0x6d, 0x59, 0x89, 0xc8, 0xe5, 0xf2, 0x02, 0xd2, 0xf3, 0x3d, 0x9f, 0x94, 0x03, 0xb2, + 0x33, 0x54, 0xfb, 0xfd, 0x04, 0xb2, 0x62, 0x7f, 0x45, 0x9c, 0x4e, 0x02, 0x39, 0x3b, 0x05, 0xbc, + 0x04, 0xd0, 0x2f, 0xa1, 0x30, 0x61, 0x51, 0x44, 0x47, 0x8c, 0xa8, 0xfe, 0x07, 0xc9, 0xc8, 0xc7, + 0x60, 0x4b, 0x60, 0x82, 0x34, 0x9f, 0x5f, 0x45, 0xda, 0x56, 0xa4, 0x18, 0x54, 0xa4, 0xc7, 0xeb, + 0x93, 0xd3, 0x78, 0xcc, 0x56, 0xd7, 0x27, 0xa7, 0xe8, 0x2d, 0xec, 0xaa, 0x59, 0x76, 0x3c, 0x67, + 0x32, 0x9d, 0xa8, 0x99, 0x4e, 0x4b, 0x97, 0x4b, 0x72, 0xa6, 0x15, 0x2e, 0x47, 0xfb, 0x08, 0x32, + 0x77, 0x34, 0x62, 0x62, 0x73, 0xcb, 0xdb, 0xab, 0x80, 0xd3, 0xe2, 0xbb, 0xc5, 0xe4, 0x25, 0x24, + 0xf6, 0x79, 0x28, 0xb6, 0x49, 0x56, 0x89, 0xee, 0x19, 0xc3, 0x22, 0x8f, 0x0b, 0x0b, 0xf4, 0xfb, + 0xd2, 0x42, 0x6e, 0xc5, 0x82, 0xc2, 0xa5, 0x85, 0xb7, 0xb0, 0xcb, 0xbe, 0xf3, 0x90, 0x12, 0x3f, + 0xa0, 0x5f, 0xa7, 0x8c, 0xd8, 0x94, 0xd3, 0x72, 0x5e, 0x26, 0xb7, 0x24, 0x05, 0x5d, 0x89, 0x37, + 0x29, 0xa7, 0xfa, 0x09, 0x54, 0x30, 0x8b, 0x18, 0xef, 0x38, 0x51, 0xe4, 0xf8, 0x5e, 0xc3, 0xf7, + 0x78, 0xe8, 0xbb, 0xf1, 0x05, 0xa0, 0x9f, 0xc2, 0xf1, 0x46, 0xa9, 0xda, 0xe0, 0xe2, 0xf0, 0xa7, + 0x29, 0x0b, 0x67, 0x9b, 0x0f, 0x5f, 0xc1, 0xf1, 0x46, 0x69, 0xbc, 0xfe, 0xdf, 0xc1, 0xb6, 0xe7, + 0xdb, 0x2c, 0x2a, 0x27, 0xce, 0x92, 0xd5, 0x5c, 0xed, 0x70, 0x65, 0x6f, 0x5a, 0xbe, 0xcd, 0x2e, + 0x9d, 0x88, 0xfb, 0xe1, 0x0c, 0x2b, 0x92, 0xfe, 0xef, 0x04, 0xe4, 0x56, 0x60, 0x74, 0x08, 0x3b, + 0xf1, 0x8e, 0x56, 0x4d, 0x15, 0x7f, 0xa1, 0xd7, 0x50, 0x74, 0x69, 0xc4, 0x89, 0x58, 0xd9, 0x44, + 0x14, 0x29, 0xbe, 0xef, 0x1e, 0xa1, 0xe8, 0x77, 0xf0, 0xc2, 0xe7, 0x63, 0x16, 0xaa, 0x87, 0x44, + 0x34, 0x1d, 0x0e, 0x59, 0x14, 0x91, 0x20, 0xf4, 0xef, 0x64, 0xab, 0x6d, 0xe1, 0xe7, 0xc4, 0xe8, + 0x3d, 0x64, 0xe2, 0x1e, 0x89, 0xca, 0x29, 0xe9, 0xfa, 0xd1, 0xd3, 0x95, 0x3f, 0xf7, 0x7e, 0x41, + 0xd5, 0xff, 0x99, 0x80, 0xe2, 0xba, 0x10, 0xbd, 0x94, 0xdd, 0x2f, 0x5b, 0xd0, 0xb1, 0x65, 0x1c, + 0x29, 0xbc, 0x82, 0xfc, 0xec, 0x58, 0x6a, 0xb0, 0x3f, 0x71, 0x3c, 0x12, 0x30, 0x8f, 0xba, 0xce, + 0xdf, 0x18, 0x99, 0x3f, 0x24, 0x92, 0x92, 0xbd, 0x51, 0x86, 0x74, 0xc8, 0xaf, 0x05, 0x9d, 0x92, + 0x41, 0xaf, 0x61, 0xb5, 0x7f, 0x25, 0x61, 0x47, 0x5e, 0xd9, 0x21, 0x6a, 0x42, 0x4e, 0x5c, 0xe1, + 0xf1, 0xab, 0x09, 0xad, 0x46, 0xbc, 0xfe, 0x1a, 0xad, 0x54, 0x36, 0x89, 0xe2, 0x92, 0x5f, 0x81, + 0x66, 0x44, 0xdc, 0x99, 0x88, 0xdb, 0x30, 0x7e, 0xd3, 0xa0, 0x55, 0xfe, 0xa3, 0x87, 0x52, 0xe5, + 0x78, 0xa3, 0x2c, 0x56, 0xd6, 0x56, 0x2e, 0xc5, 0xaf, 0x0a, 0x74, 0xba, 0xc2, 0x7d, 0xfa, 0x94, + 0xa9, 0xbc, 0x7c, 0x4e, 0x1c, 0x6b, 0xb3, 0x61, 0x6f, 0x43, 0xa7, 0xa3, 0x5f, 0xaf, 0x7a, 0xf0, + 0xec, 0x9c, 0x54, 0x5e, 0xff, 0x3f, 0xda, 0xd2, 0xca, 0x86, 0x91, 0x58, 0xb3, 0xf2, 0xfc, 0x40, + 0xad, 0x59, 0xf9, 0xc1, 0x64, 0x7d, 0xfc, 0xcd, 0x9f, 0x2e, 0x46, 0x0e, 0x1f, 0x4f, 0xef, 0xce, + 0x87, 0xfe, 0xe4, 0xc2, 0x75, 0x46, 0x63, 0xee, 0x39, 0xde, 0xc8, 0x63, 0xfc, 0xaf, 0x7e, 0xf8, + 0x70, 0xe1, 0x7a, 0xf6, 0x85, 0x7c, 0xa5, 0x5d, 0x2c, 0xd4, 0xdd, 0xed, 0xc8, 0xff, 0x2e, 0x7e, + 0xfb, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x15, 0x95, 0x7d, 0xcd, 0x8d, 0x0c, 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 f65a8c11e..f80f54c39 100644 --- a/lnrpc/routerrpc/router.proto +++ b/lnrpc/routerrpc/router.proto @@ -7,41 +7,57 @@ package routerrpc; option go_package = "github.com/lightningnetwork/lnd/lnrpc/routerrpc"; message PaymentRequest { + /// The identity pubkey of the payment recipient + bytes dest = 1; + + /// Number of satoshis to send. + int64 amt = 2; + + /// The hash to use within the payment's HTLC + bytes payment_hash = 3; + /** - A serialized BOLT-11 payment request that contains all information - required to dispatch the payment. If the pay req is invalid, or expired, - an error will be returned. + The CLTV delta from the current height that should be used to set the + timelock for the final hop. */ - string pay_req = 1; + int32 final_cltv_delta = 4; /** - An absolute limit on the highest fee we should pay when looking for a route - to the destination. Routes with fees higher than this will be ignored, if - there are no routes with a fee below this amount, an error will be - returned. + A bare-bones invoice for a payment within the Lightning Network. With the + details of the invoice, the sender has all the data necessary to send a + payment to the recipient. The amount in the payment request may be zero. In + that case it is required to set the amt field as well. If no payment request + is specified, the following fields are required: dest, amt and payment_hash. */ - int64 fee_limit_sat = 2; - - /** - An absolute limit on the cumulative CLTV value along the route for this - payment. Routes with total CLTV values higher than this will be ignored, - if there are no routes with a CLTV value below this amount, an error will - be returned. - */ - int32 cltv_limit = 3; + string payment_request = 5; /** An upper limit on the amount of time we should spend when attempting to fulfill the payment. This is expressed in seconds. If we cannot make a successful payment within this time frame, an error will be returned. + This field must be non-zero. */ - int32 timeout_seconds = 4; + int32 timeout_seconds = 6; + + /** + The maximum number of satoshis that will be paid as a fee of the payment. + If this field is left to the default value of 0, only zero-fee routes will + be considered. This usually means single hop routes connecting directly to + the destination. To send the payment without a fee limit, use max int here. + */ + int64 fee_limit_sat = 7; /** The channel id of the channel that must be taken to the first hop. If zero, any channel may be used. */ - int64 outgoing_channel_id = 5; + uint64 outgoing_chan_id = 8; + + /** + An optional maximum total time lock for the route. If zero, there is no + maximum enforced. + */ + int32 cltv_limit = 9; } message PaymentResponse { diff --git a/lnrpc/routerrpc/router_backend.go b/lnrpc/routerrpc/router_backend.go index 9e399e8fc..f1eb61f42 100644 --- a/lnrpc/routerrpc/router_backend.go +++ b/lnrpc/routerrpc/router_backend.go @@ -4,12 +4,15 @@ import ( "encoding/hex" "errors" "fmt" + "time" + "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcutil" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing" "github.com/lightningnetwork/lnd/routing/route" + "github.com/lightningnetwork/lnd/zpay32" context "golang.org/x/net/context" ) @@ -38,6 +41,12 @@ type RouterBackend struct { finalExpiry ...uint16) (*route.Route, error) MissionControl *routing.MissionControl + + // ActiveNetParams are the network parameters of the primary network + // that the route is operating on. This is necessary so we can ensure + // that we receive payment requests that send to destinations on our + // network. + ActiveNetParams *chaincfg.Params } // QueryRoutes attempts to query the daemons' Channel Router for a possible @@ -336,3 +345,158 @@ func (r *RouterBackend) UnmarshallRoute(rpcroute *lnrpc.Route) ( return route, nil } + +// extractIntentFromSendRequest attempts to parse the SendRequest details +// required to dispatch a client from the information presented by an RPC +// client. +func (r *RouterBackend) extractIntentFromSendRequest(rpcPayReq *PaymentRequest) ( + *routing.LightningPayment, error) { + + payIntent := &routing.LightningPayment{} + + // Pass along an outgoing channel restriction if specified. + if rpcPayReq.OutgoingChanId != 0 { + payIntent.OutgoingChannelID = &rpcPayReq.OutgoingChanId + } + + // Take cltv limit from request if set. + if rpcPayReq.CltvLimit != 0 { + cltvLimit := uint32(rpcPayReq.CltvLimit) + payIntent.CltvLimit = &cltvLimit + } + + // Take fee limit from request. + payIntent.FeeLimit = lnwire.NewMSatFromSatoshis( + btcutil.Amount(rpcPayReq.FeeLimitSat), + ) + + // Set payment attempt timeout. + if rpcPayReq.TimeoutSeconds == 0 { + return nil, errors.New("timeout_seconds must be specified") + } + + payIntent.PayAttemptTimeout = time.Second * + time.Duration(rpcPayReq.TimeoutSeconds) + + // If the payment request field isn't blank, then the details of the + // invoice are encoded entirely within the encoded payReq. So we'll + // attempt to decode it, populating the payment accordingly. + if rpcPayReq.PaymentRequest != "" { + switch { + + case len(rpcPayReq.Dest) > 0: + return nil, errors.New("dest and payment_request " + + "cannot appear together") + + case len(rpcPayReq.PaymentHash) > 0: + return nil, errors.New("dest and payment_hash " + + "cannot appear together") + + case rpcPayReq.FinalCltvDelta != 0: + return nil, errors.New("dest and final_cltv_delta " + + "cannot appear together") + } + + payReq, err := zpay32.Decode( + rpcPayReq.PaymentRequest, r.ActiveNetParams, + ) + if err != nil { + return nil, err + } + + // Next, we'll ensure that this payreq hasn't already expired. + err = ValidatePayReqExpiry(payReq) + if err != nil { + return nil, err + } + + // If the amount was not included in the invoice, then we let + // the payee specify the amount of satoshis they wish to send. + // We override the amount to pay with the amount provided from + // the payment request. + if payReq.MilliSat == nil { + if rpcPayReq.Amt == 0 { + return nil, errors.New("amount must be " + + "specified when paying a zero amount " + + "invoice") + } + + payIntent.Amount = lnwire.NewMSatFromSatoshis( + btcutil.Amount(rpcPayReq.Amt), + ) + } else { + if rpcPayReq.Amt != 0 { + return nil, errors.New("amount must not be " + + "specified when paying a non-zero " + + " amount invoice") + } + + payIntent.Amount = *payReq.MilliSat + } + + copy(payIntent.PaymentHash[:], payReq.PaymentHash[:]) + destKey := payReq.Destination.SerializeCompressed() + copy(payIntent.Target[:], destKey) + + payIntent.FinalCLTVDelta = uint16(payReq.MinFinalCLTVExpiry()) + payIntent.RouteHints = payReq.RouteHints + } else { + // Otherwise, If the payment request field was not specified + // (and a custom route wasn't specified), construct the payment + // from the other fields. + + // Payment destination. + if len(rpcPayReq.Dest) != 33 { + return nil, errors.New("invalid key length") + + } + pubBytes := rpcPayReq.Dest + copy(payIntent.Target[:], pubBytes) + + // Final payment CLTV delta. + if rpcPayReq.FinalCltvDelta != 0 { + payIntent.FinalCLTVDelta = + uint16(rpcPayReq.FinalCltvDelta) + } else { + payIntent.FinalCLTVDelta = zpay32.DefaultFinalCLTVDelta + } + + // Amount. + if rpcPayReq.Amt == 0 { + return nil, errors.New("amount must be specified") + } + + payIntent.Amount = lnwire.NewMSatFromSatoshis( + btcutil.Amount(rpcPayReq.Amt), + ) + + // Payment hash. + copy(payIntent.PaymentHash[:], rpcPayReq.PaymentHash) + } + + // Currently, within the bootstrap phase of the network, we limit the + // largest payment size allotted to (2^32) - 1 mSAT or 4.29 million + // satoshis. + if payIntent.Amount > r.MaxPaymentMSat { + // In this case, we'll send an error to the caller, but + // continue our loop for the next payment. + return payIntent, fmt.Errorf("payment of %v is too large, "+ + "max payment allowed is %v", payIntent.Amount, + r.MaxPaymentMSat) + + } + + return payIntent, nil +} + +// ValidatePayReqExpiry checks if the passed payment request has expired. In +// the case it has expired, an error will be returned. +func ValidatePayReqExpiry(payReq *zpay32.Invoice) error { + expiry := payReq.Expiry() + validUntil := payReq.Timestamp.Add(expiry) + if time.Now().After(validUntil) { + return fmt.Errorf("invoice expired. Valid until %v", validUntil) + } + + return nil +} diff --git a/lnrpc/routerrpc/router_server.go b/lnrpc/routerrpc/router_server.go index 3a5ad2764..5047fc4e6 100644 --- a/lnrpc/routerrpc/router_server.go +++ b/lnrpc/routerrpc/router_server.go @@ -9,7 +9,6 @@ import ( "io/ioutil" "os" "path/filepath" - "time" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/lntypes" @@ -19,7 +18,6 @@ import ( "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing" "github.com/lightningnetwork/lnd/routing/route" - "github.com/lightningnetwork/lnd/zpay32" "google.golang.org/grpc" "gopkg.in/macaroon-bakery.v2/bakery" ) @@ -190,56 +188,18 @@ func (s *Server) RegisterWithRootServer(grpcServer *grpc.Server) error { func (s *Server) SendPayment(ctx context.Context, req *PaymentRequest) (*PaymentResponse, error) { - switch { - // If the payment request isn't populated, then we won't be able to - // even attempt a payment. - case req.PayReq == "": - return nil, fmt.Errorf("a valid payment request MUST be specified") - } - - // Now that we know the payment request is present, we'll attempt to - // decode it in order to parse out all the parameters for the route. - payReq, err := zpay32.Decode(req.PayReq, s.cfg.ActiveNetParams) + payment, err := s.cfg.RouterBackend.extractIntentFromSendRequest(req) if err != nil { return nil, err } - // Atm, this service does not support invoices that don't have their - // value fully specified. - if payReq.MilliSat == nil { - return nil, fmt.Errorf("zero value invoices are not supported") - } - - var destination route.Vertex - copy(destination[:], payReq.Destination.SerializeCompressed()) - - // Now that all the information we need has been parsed, we'll map this - // proto request into a proper request that our backing router can - // understand. - finalDelta := uint16(payReq.MinFinalCLTVExpiry()) - payment := routing.LightningPayment{ - Target: destination, - Amount: *payReq.MilliSat, - FeeLimit: lnwire.MilliSatoshi(req.FeeLimitSat), - PaymentHash: *payReq.PaymentHash, - FinalCLTVDelta: finalDelta, - PayAttemptTimeout: time.Second * time.Duration(req.TimeoutSeconds), - RouteHints: payReq.RouteHints, - } - - // Pin to an outgoing channel if specified. - if req.OutgoingChannelId != 0 { - chanID := uint64(req.OutgoingChannelId) - payment.OutgoingChannelID = &chanID - } - - preImage, _, err := s.cfg.Router.SendPayment(&payment) + preImage, _, err := s.cfg.Router.SendPayment(payment) if err != nil { return nil, err } return &PaymentResponse{ - PayHash: (*payReq.PaymentHash)[:], + PayHash: payment.PaymentHash[:], PreImage: preImage[:], }, nil } diff --git a/rpcserver.go b/rpcserver.go index 5258c623a..d5fb47d62 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -474,8 +474,9 @@ func newRPCServer(s *server, macService *macaroons.Service, return info.NodeKey1Bytes, info.NodeKey2Bytes, nil }, - FindRoute: s.chanRouter.FindRoute, - MissionControl: s.missionControl, + FindRoute: s.chanRouter.FindRoute, + MissionControl: s.missionControl, + ActiveNetParams: activeNetParams.Params, } var ( @@ -2736,18 +2737,6 @@ func (r *rpcServer) SubscribeChannelEvents(req *lnrpc.ChannelEventSubscription, } } -// validatePayReqExpiry checks if the passed payment request has expired. In -// the case it has expired, an error will be returned. -func validatePayReqExpiry(payReq *zpay32.Invoice) error { - expiry := payReq.Expiry() - validUntil := payReq.Timestamp.Add(expiry) - if time.Now().After(validUntil) { - return fmt.Errorf("invoice expired. Valid until %v", validUntil) - } - - return nil -} - // paymentStream enables different types of payment streams, such as: // lnrpc.Lightning_SendPaymentServer and lnrpc.Lightning_SendToRouteServer to // execute sendPayment. We use this struct as a sort of bridge to enable code @@ -2930,7 +2919,7 @@ func extractPaymentIntent(rpcPayReq *rpcPaymentRequest) (rpcPaymentIntent, error } // Next, we'll ensure that this payreq hasn't already expired. - err = validatePayReqExpiry(payReq) + err = routerrpc.ValidatePayReqExpiry(payReq) if err != nil { return payIntent, err } diff --git a/subrpcserver_config.go b/subrpcserver_config.go index 7dc116cc8..d99faeab6 100644 --- a/subrpcserver_config.go +++ b/subrpcserver_config.go @@ -191,9 +191,6 @@ func (s *subRPCServerConfigs) PopulateDependencies(cc *chainControl, subCfgValue.FieldByName("NetworkDir").Set( reflect.ValueOf(networkDir), ) - subCfgValue.FieldByName("ActiveNetParams").Set( - reflect.ValueOf(activeNetParams), - ) subCfgValue.FieldByName("MacService").Set( reflect.ValueOf(macService), )