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

Merge pull request #5002 from akovalenko/master

Browse Source 
lncli addinvoice: allow specifying msat with --amt_msat
This commit is contained in:
Conner Fromknecht 2021-03-17 10:03:56 -07:00 committed by GitHub
commit e2690918a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/lncli/cmd_invoice.go
View File

@ -37,6 +37,10 @@ var addInvoiceCommand = cli.Command{
Name: "amt", Name: "amt",
Usage: "the amt of satoshis in this invoice", Usage: "the amt of satoshis in this invoice",
}, },
cli.Int64Flag{
Name: "amt_msat",
Usage: "the amt of millisatoshis in this invoice",
},
cli.StringFlag{ cli.StringFlag{
Name: "description_hash", Name: "description_hash",
Usage: "SHA-256 hash of the description of the payment. " + Usage: "SHA-256 hash of the description of the payment. " +
@ -71,6 +75,7 @@ func addInvoice(ctx *cli.Context) error {
preimage []byte preimage []byte
descHash []byte descHash []byte
amt int64 amt int64
amtMsat int64
err error err error
) )
ctxc := getContext() ctxc := getContext()
@ -79,10 +84,9 @@ func addInvoice(ctx *cli.Context) error {
args := ctx.Args() args := ctx.Args()
switch { amt = ctx.Int64("amt")
case ctx.IsSet("amt"): amtMsat = ctx.Int64("amt_msat")
amt = ctx.Int64("amt") if !ctx.IsSet("amt") && !ctx.IsSet("amt_msat") && args.Present() {
case args.Present():
amt, err = strconv.ParseInt(args.First(), 10, 64) amt, err = strconv.ParseInt(args.First(), 10, 64)
args = args.Tail() args = args.Tail()
if err != nil { if err != nil {
@ -110,6 +114,7 @@ func addInvoice(ctx *cli.Context) error {
Memo: ctx.String("memo"), Memo: ctx.String("memo"),
RPreimage: preimage, RPreimage: preimage,
Value: amt, Value: amt,
ValueMsat: amtMsat,
DescriptionHash: descHash, DescriptionHash: descHash,
FallbackAddr: ctx.String("fallback_addr"), FallbackAddr: ctx.String("fallback_addr"),
Expiry: ctx.Int64("expiry"), Expiry: ctx.Int64("expiry"),