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

cmd/lncli: show all utxos in listunspent when no args passed

Browse Source
This commit is contained in:
Conner Fromknecht 2019-02-11 13:02:35 -08:00
parent 34e36e9daa
commit fd6fb80816
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
cmd/lncli/commands.go
View File

@ -257,14 +257,17 @@ var listUnspentCommand = cli.Command{
Name: "listunspent", Name: "listunspent",
Category: "On-chain", Category: "On-chain",
Usage: "List utxos available for spending.", Usage: "List utxos available for spending.",
ArgsUsage: "min-confs max-confs", ArgsUsage: "[min-confs [max-confs]] [--unconfirmed_only]",
Description: ` Description: `
For each spendable utxo currently in the wallet, with at least min_confs For each spendable utxo currently in the wallet, with at least min_confs
confirmations, and at most max_confs confirmations, lists the txid, index, confirmations, and at most max_confs confirmations, lists the txid,
amount, address, address type, scriptPubkey and number of confirmations. index, amount, address, address type, scriptPubkey and number of
Use --min_confs=0 to include unconfirmed coins. To list all coins confirmations. Use --min_confs=0 to include unconfirmed coins. To list
with at least min_confs confirmations, omit the second argument or flag all coins with at least min_confs confirmations, omit the second
'--max_confs'. argument or flag '--max_confs'. To list all confirmed and unconfirmed
coins, no arguments are required. To see only unconfirmed coins, use
'--unconfirmed_only' with '--min_confs' and '--max_confs' set to zero or
not present.
`, `,
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.Int64Flag{ cli.Int64Flag{
@ -275,6 +278,15 @@ var listUnspentCommand = cli.Command{
Name: "max_confs", Name: "max_confs",
Usage: "the maximum number of confirmations for a utxo", Usage: "the maximum number of confirmations for a utxo",
}, },
cli.BoolFlag{
Name: "unconfirmed_only",
Usage: "when min_confs and max_confs are zero, " +
"setting false implicitly overrides max_confs " +
"to be MaxInt32, otherwise max_confs remains " +
"zero. An error is returned if the value is " +
"true and both min_confs and max_confs are " +
"non-zero. (defualt: false)",
},
}, },
Action: actionDecorator(listUnspent), Action: actionDecorator(listUnspent),
} }
@ -287,11 +299,6 @@ func listUnspent(ctx *cli.Context) error {
) )
args := ctx.Args() args := ctx.Args()
if ctx.NArg() == 0 && ctx.NumFlags() == 0 {
cli.ShowCommandHelp(ctx, "listunspent")
return nil
}
if ctx.IsSet("max_confs") && !ctx.IsSet("min_confs") { if ctx.IsSet("max_confs") && !ctx.IsSet("min_confs") {
return fmt.Errorf("max_confs cannot be set without " + return fmt.Errorf("max_confs cannot be set without " +
"min_confs being set") "min_confs being set")
@ -307,8 +314,6 @@ func listUnspent(ctx *cli.Context) error {
return nil return nil
} }
args = args.Tail() args = args.Tail()
default:
return fmt.Errorf("minimum confirmations argument missing")
} }
switch { switch {
@ -321,15 +326,21 @@ func listUnspent(ctx *cli.Context) error {
return nil return nil
} }
args = args.Tail() args = args.Tail()
default:
// No maxconfs was specified; we use max as flag;
// the default for ctx.Int64 (0) is *not* appropriate here.
maxConfirms = math.MaxInt32
} }
if minConfirms < 0 || maxConfirms < minConfirms { unconfirmedOnly := ctx.Bool("unconfirmed_only")
return fmt.Errorf("maximum confirmations must be greater or " +
"equal to minimum confirmations") // Force minConfirms and maxConfirms to be zero if unconfirmedOnly is
// true.
if unconfirmedOnly && (minConfirms != 0 || maxConfirms != 0) {
cli.ShowCommandHelp(ctx, "listunspent")
return nil
}
// When unconfirmedOnly is inactive, we will override maxConfirms to be
// a MaxInt32 to return all confirmed and unconfirmed utxos.
if maxConfirms == 0 && !unconfirmedOnly {
maxConfirms = math.MaxInt32
} }
ctxb := context.Background() ctxb := context.Background()