Merge pull request #8097 from markettes/fix-amount-field

Fix amount field

cmd/lncli/commands.go

@@ -373,11 +373,31 @@ func sendCoins(ctx *cli.Context) error {
 			"sweep all coins out of the wallet")
 	}
 
+	client, cleanUp := getClient(ctx)
+	defer cleanUp()
+	minConfs := int32(ctx.Uint64("min_confs"))
+
+	// In case that the user has specified the sweepall flag, we'll
+	// calculate the amount to send based on the current wallet balance.
+	displayAmt := amt
+	if ctx.Bool("sweepall") {
+		balanceResponse, err := client.WalletBalance(
+			ctxc, &lnrpc.WalletBalanceRequest{
+				MinConfs: minConfs,
+			},
+		)
+		if err != nil {
+			return fmt.Errorf("unable to retrieve wallet balance:"+
+				" %w", err)
+		}
+		displayAmt = balanceResponse.GetConfirmedBalance()
+	}
+
 	// Ask for confirmation if we're on an actual terminal and the output is
 	// not being redirected to another command. This prevents existing shell
 	// scripts from breaking.
 	if !ctx.Bool("force") && term.IsTerminal(int(os.Stdout.Fd())) {
-		fmt.Printf("Amount: %d\n", amt)
+		fmt.Printf("Amount: %d\n", displayAmt)
 		fmt.Printf("Destination address: %v\n", addr)
 
 		confirm := promptForConfirmation("Confirm payment (yes/no): ")
@@ -386,10 +406,6 @@ func sendCoins(ctx *cli.Context) error {
 		}
 	}
 
-	client, cleanUp := getClient(ctx)
-	defer cleanUp()
-
-	minConfs := int32(ctx.Uint64("min_confs"))
 	req := &lnrpc.SendCoinsRequest{
 		Addr:             addr,
 		Amount:           amt,

docs/release-notes/release-notes-0.18.0.md

@@ -21,6 +21,8 @@
 - [Contributors (Alphabetical Order)](#contributors-alphabetical-order)
 
 # Bug Fixes
+* [Fix a bug](https://github.com/lightningnetwork/lnd/pull/8097) where
+  `sendcoins` command with `--sweepall` flag would not show the correct amount.
 
 * [Fixed a potential case](https://github.com/lightningnetwork/lnd/pull/7824)
   that when sweeping inputs with locktime, an unexpected lower fee rate is
@@ -104,6 +106,9 @@
   error is defined as a routing error found in one of a MPP's HTLC attempts.
   If, however, there's only one HTLC attempt, when it's failed, this payment is
   considered failed, thus there's no such thing as temp error for a non-MPP.
+* Support for
+  [MinConf](https://github.com/lightningnetwork/lnd/pull/8097)(minimum number
+  of confirmations) has been added to the `WalletBalance` RPC call.
 
 ## lncli Updates
 
@@ -167,6 +172,7 @@
 * Carla Kirk-Cohen
 * Elle Mouton
 * Keagan McClelland
+* Marcos Fernandez Perez
 * Matt Morehouse
 * Slyghtning
 * Turtle

lnrpc/lightning.proto

@@ -2847,6 +2847,11 @@ message WalletBalanceRequest {
     // The wallet account the balance is shown for.
     // If this is not specified, the balance of the "default" account is shown.
     string account = 1;
+
+    // The minimum number of confirmations each one of your outputs used for the
+    // funding transaction must satisfy. If this is not specified, the default
+    // value of 1 is used.
+    int32 min_confs = 2;
 }
 
 message WalletBalanceResponse {

lnrpc/lightning.swagger.json

@@ -64,6 +64,14 @@
             "in": "query",
             "required": false,
             "type": "string"
+          },
+          {
+            "name": "min_confs",
+            "description": "The minimum number of confirmations each one of your outputs used for the\nfunding transaction must satisfy. If this is not specified, the default\nvalue of 1 is used.",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "format": "int32"
           }
         ],
         "tags": [

rpcserver.go

@@ -3292,8 +3292,11 @@ func (r *rpcServer) WalletBalance(ctx context.Context,
 		// Get confirmed balance, from txs that have >= 1 confirmations.
 		// TODO(halseth): get both unconfirmed and confirmed balance in
 		// one call, as this is racy.
+		if in.MinConfs <= 0 {
+			in.MinConfs = 1
+		}
 		confirmedBal, err := r.server.cc.Wallet.ConfirmedBalance(
-			1, account.AccountName,
+			in.MinConfs, account.AccountName,
 		)
 		if err != nil {
 			return nil, err