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

Merge pull request #1885 from tsarpaul/master

Browse Source 
cmd/lncli: Fixed conflicting payinvoice amount output
This commit is contained in:
Olaoluwa Osuntokun 2018-09-13 19:14:08 -07:00 committed by GitHub
commit a3b75faa02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/lncli/commands.go
View File

@ -1741,7 +1741,7 @@ func retrieveFeeLimit(ctx *cli.Context) (*lnrpc.FeeLimit, error) {
return nil, nil return nil, nil
} }
func confirmPayReq(client lnrpc.LightningClient, payReq string) error { func confirmPayReq(ctx *cli.Context, client lnrpc.LightningClient, payReq string) error {
ctxb := context.Background() ctxb := context.Background()
req := &lnrpc.PayReqString{PayReq: payReq} req := &lnrpc.PayReqString{PayReq: payReq}
@ -1750,8 +1750,19 @@ func confirmPayReq(client lnrpc.LightningClient, payReq string) error {
return err return err
} }
// If the amount was not included in the invoice, then we let
// the payee specify the amount of satoshis they wish to send.
amt := resp.GetNumSatoshis()
if amt == 0 {
amt = ctx.Int64("amt")
if amt == 0 {
return fmt.Errorf("amount must be specified when " +
"paying a zero amount invoice")
}
}
fmt.Printf("Description: %v\n", resp.GetDescription()) fmt.Printf("Description: %v\n", resp.GetDescription())
fmt.Printf("Amount (in satoshis): %v\n", resp.GetNumSatoshis()) fmt.Printf("Amount (in satoshis): %v\n", amt)
fmt.Printf("Destination: %v\n", resp.GetDestination()) fmt.Printf("Destination: %v\n", resp.GetDestination())
confirm := promptForConfirmation("Confirm payment (yes/no): ") confirm := promptForConfirmation("Confirm payment (yes/no): ")
@ -1783,7 +1794,7 @@ func sendPayment(ctx *cli.Context) error {
// details of the payment are encoded within the request. // details of the payment are encoded within the request.
if ctx.IsSet("pay_req") { if ctx.IsSet("pay_req") {
if !ctx.Bool("force") { if !ctx.Bool("force") {
err = confirmPayReq(client, ctx.String("pay_req")) err = confirmPayReq(ctx, client, ctx.String("pay_req"))
if err != nil { if err != nil {
return err return err
} }
@ -1960,7 +1971,7 @@ func payInvoice(ctx *cli.Context) error {
} }
if !ctx.Bool("force") { if !ctx.Bool("force") {
err = confirmPayReq(client, payReq) err = confirmPayReq(ctx, client, payReq)
if err != nil { if err != nil {
return err return err
} }
@ -1971,7 +1982,6 @@ func payInvoice(ctx *cli.Context) error {
Amt: ctx.Int64("amt"), Amt: ctx.Int64("amt"),
FeeLimit: feeLimit, FeeLimit: feeLimit,
} }
return sendPaymentRequest(client, req) return sendPaymentRequest(client, req)
} }