akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rpcserver: include routing hints when sending payments

Browse Source
This commit is contained in:
Wilmer Paulino 2018-03-28 00:53:00 -04:00
parent d1a717ba88
commit 4e90691bf3
No known key found for this signature in database
GPG Key ID: 6DF57B9F9514972F
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcserver.go
View File

@ -1704,12 +1704,13 @@ func validatePayReqExpiry(payReq *zpay32.Invoice) error {
// Lightning Network with a single persistent connection. // Lightning Network with a single persistent connection.
func (r *rpcServer) SendPayment(paymentStream lnrpc.Lightning_SendPaymentServer) error { func (r *rpcServer) SendPayment(paymentStream lnrpc.Lightning_SendPaymentServer) error {
// For each payment we need to know the msat amount, the destination // For each payment we need to know the msat amount, the destination
// public key, and the payment hash. // public key, the payment hash, and the optional route hints.
type payment struct { type payment struct {
msat lnwire.MilliSatoshi msat lnwire.MilliSatoshi
dest []byte dest []byte
pHash []byte pHash []byte
cltvDelta uint16 cltvDelta uint16
routeHints [][]routing.HopHint
} }
payChan := make(chan *payment) payChan := make(chan *payment)
errChan := make(chan error, 1) errChan := make(chan error, 1)
@ -1821,6 +1822,7 @@ func (r *rpcServer) SendPayment(paymentStream lnrpc.Lightning_SendPaymentServer)
p.pHash = payReq.PaymentHash[:] p.pHash = payReq.PaymentHash[:]
p.cltvDelta = uint16(payReq.MinFinalCLTVExpiry()) p.cltvDelta = uint16(payReq.MinFinalCLTVExpiry())
p.routeHints = payReq.RouteHints
} else { } else {
// If the payment request field was not // If the payment request field was not
// specified, construct the payment from // specified, construct the payment from
@ -1904,6 +1906,7 @@ func (r *rpcServer) SendPayment(paymentStream lnrpc.Lightning_SendPaymentServer)
Target: destNode, Target: destNode,
Amount: p.msat, Amount: p.msat,
PaymentHash: rHash, PaymentHash: rHash,
RouteHints: p.routeHints,
} }
if p.cltvDelta != 0 { if p.cltvDelta != 0 {
payment.FinalCLTVDelta = &p.cltvDelta payment.FinalCLTVDelta = &p.cltvDelta
@ -1965,6 +1968,7 @@ func (r *rpcServer) SendPaymentSync(ctx context.Context,
amtMSat lnwire.MilliSatoshi amtMSat lnwire.MilliSatoshi
rHash [32]byte rHash [32]byte
cltvDelta uint16 cltvDelta uint16
routeHints [][]routing.HopHint
) )
// If the proto request has an encoded payment request, then we we'll // If the proto request has an encoded payment request, then we we'll
@ -1997,6 +2001,7 @@ func (r *rpcServer) SendPaymentSync(ctx context.Context,
rHash = *payReq.PaymentHash rHash = *payReq.PaymentHash
cltvDelta = uint16(payReq.MinFinalCLTVExpiry()) cltvDelta = uint16(payReq.MinFinalCLTVExpiry())
routeHints = payReq.RouteHints
// Otherwise, the payment conditions have been manually // Otherwise, the payment conditions have been manually
// specified in the proto. // specified in the proto.
@ -2047,6 +2052,7 @@ func (r *rpcServer) SendPaymentSync(ctx context.Context,
Target: destPub, Target: destPub,
Amount: amtMSat, Amount: amtMSat,
PaymentHash: rHash, PaymentHash: rHash,
RouteHints: routeHints,
} }
if cltvDelta != 0 { if cltvDelta != 0 {
payment.FinalCLTVDelta = &cltvDelta payment.FinalCLTVDelta = &cltvDelta