highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-09-03 20:46:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5102 from yyforyongyu/fix-send-cli

Browse Source 
lncli+lnrpc: add payment address to sendpayment
This commit is contained in:
Olaoluwa Osuntokun
2021-03-24 18:02:53 -07:00
committed by GitHub
parent a9afd86a5b 2dac77200b
commit b4b7f29724
5 changed files with 815 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cmd/lncli/cmd_pay.go
View File

@@ -147,14 +147,17 @@ var sendPaymentCommand = cli.Command{
If payment isn't manually specified, then only a payment request needs
to be passed using the --pay_req argument.
If the payment *is* manually specified, then all four alternative
arguments need to be specified in order to complete the payment:
* --dest=N
* --amt=A
* --final_cltv_delta=T
* --payment_hash=H
If the payment *is* manually specified, then the following arguments
need to be specified in order to complete the payment:
For invoice with keysend,
--dest=N --amt=A --final_cltv_delta=T --keysend
For invoice without payment address:
--dest=N --amt=A --payment_hash=H --final_cltv_delta=T
For invoice with payment address:
--dest=N --amt=A --payment_hash=H --final_cltv_delta=T --pay_addr=H
`,
ArgsUsage: "dest amt payment_hash final_cltv_delta | --pay_req=[payment request]",
ArgsUsage: "dest amt payment_hash final_cltv_delta pay_addr | --pay_req=[payment request]",
Flags: append(paymentFlags(),
cli.StringFlag{
Name: "dest, d",
@@ -173,6 +176,10 @@ var sendPaymentCommand = cli.Command{
Name: "final_cltv_delta",
Usage: "the number of blocks the last hop has to reveal the preimage",
},
cli.StringFlag{
Name: "pay_addr",
Usage: "the payment address of the generated invoice",
},
cli.BoolFlag{
Name: "keysend",
Usage: "will generate a pre-image and encode it in the sphinx packet, a dest must be set [experimental]",
@@ -330,9 +337,28 @@ func sendPayment(ctx *cli.Context) error {
if err != nil {
return err
}
args = args.Tail()
req.FinalCltvDelta = int32(delta)
}
var payAddr []byte
switch {
case ctx.IsSet("pay_addr"):
payAddr, err = hex.DecodeString(ctx.String("pay_addr"))
case args.Present():
payAddr, err = hex.DecodeString(args.First())
}
if err != nil {
return err
}
// payAddr may be not required if it's a legacy invoice.
if len(payAddr) != 0 && len(payAddr) != 32 {
return fmt.Errorf("payment addr must be exactly 32 "+
"bytes, is instead %v", len(payAddr))
}
req.PaymentAddr = payAddr
return sendPaymentRequest(ctx, req)
}