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

cmd/lncli: add basic AMP support for CLI

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2021-05-06 09:19:58 -07:00 committed by Conner Fromknecht
parent ef392dcd0c
commit d2c25124ed
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/lncli/cmd_pay.go
View File

@ -87,6 +87,12 @@ var (
"payment splitting is required to attempt a payment, " + "payment splitting is required to attempt a payment, " +
"specified in milli-satoshis", "specified in milli-satoshis",
} }
ampFlag = cli.BoolFlag{
Name: "amp",
Usage: "if set to true, then AMP will be used to complete the " +
"payment",
}
) )
// paymentFlags returns common flags for sendpayment and payinvoice. // paymentFlags returns common flags for sendpayment and payinvoice.
@ -131,7 +137,7 @@ func paymentFlags() []cli.Flag {
Usage: "allow sending a circular payment to self", Usage: "allow sending a circular payment to self",
}, },
dataFlag, inflightUpdatesFlag, maxPartsFlag, jsonFlag, dataFlag, inflightUpdatesFlag, maxPartsFlag, jsonFlag,
maxShardSizeSatFlag, maxShardSizeMsatFlag, maxShardSizeSatFlag, maxShardSizeMsatFlag, ampFlag,
} }
} }
@ -287,11 +293,16 @@ func sendPayment(ctx *cli.Context) error {
Dest: destNode, Dest: destNode,
Amt: amount, Amt: amount,
DestCustomRecords: make(map[uint64][]byte), DestCustomRecords: make(map[uint64][]byte),
Amp: ctx.Bool(ampFlag.Name),
} }
var rHash []byte var rHash []byte
if ctx.Bool("keysend") { switch {
case ctx.Bool("keysend") && ctx.Bool(ampFlag.Name):
return errors.New("either keysend or amp may be set, but not both")
case ctx.Bool("keysend"):
if ctx.IsSet("payment_hash") { if ctx.IsSet("payment_hash") {
return errors.New("cannot set payment hash when using " + return errors.New("cannot set payment hash when using " +
"keysend") "keysend")
@ -308,7 +319,7 @@ func sendPayment(ctx *cli.Context) error {
hash := preimage.Hash() hash := preimage.Hash()
rHash = hash[:] rHash = hash[:]
} else { case !ctx.Bool(ampFlag.Name):
switch { switch {
case ctx.IsSet("payment_hash"): case ctx.IsSet("payment_hash"):
rHash, err = hex.DecodeString(ctx.String("payment_hash")) rHash, err = hex.DecodeString(ctx.String("payment_hash"))
@ -323,7 +334,7 @@ func sendPayment(ctx *cli.Context) error {
if err != nil { if err != nil {
return err return err
} }
if len(rHash) != 32 { if !req.Amp && len(rHash) != 32 {
return fmt.Errorf("payment hash must be exactly 32 "+ return fmt.Errorf("payment hash must be exactly 32 "+
"bytes, is instead %v", len(rHash)) "bytes, is instead %v", len(rHash))
} }