mirror of
https://github.com/lightningnetwork/lnd.git
synced 2025-06-14 02:41:47 +02:00
Merge pull request #8685 from ziggie1984/fix-bumpfee-immediate
fix lncli bumpfee flag parsing
This commit is contained in:
commit
dcd8e16376
@ -272,10 +272,24 @@ func bumpFee(ctx *cli.Context) error {
|
|||||||
client, cleanUp := getWalletClient(ctx)
|
client, cleanUp := getWalletClient(ctx)
|
||||||
defer cleanUp()
|
defer cleanUp()
|
||||||
|
|
||||||
|
// Parse immediate flag (force flag was deprecated).
|
||||||
|
immediate := false
|
||||||
|
switch {
|
||||||
|
case ctx.IsSet("immediate") && ctx.IsSet("force"):
|
||||||
|
return fmt.Errorf("cannot set immediate and force flag at " +
|
||||||
|
"the same time")
|
||||||
|
|
||||||
|
case ctx.Bool("immediate"):
|
||||||
|
immediate = true
|
||||||
|
|
||||||
|
case ctx.Bool("force"):
|
||||||
|
immediate = true
|
||||||
|
}
|
||||||
|
|
||||||
resp, err := client.BumpFee(ctxc, &walletrpc.BumpFeeRequest{
|
resp, err := client.BumpFee(ctxc, &walletrpc.BumpFeeRequest{
|
||||||
Outpoint: protoOutPoint,
|
Outpoint: protoOutPoint,
|
||||||
TargetConf: uint32(ctx.Uint64("conf_target")),
|
TargetConf: uint32(ctx.Uint64("conf_target")),
|
||||||
Immediate: ctx.Bool("force"),
|
Immediate: immediate,
|
||||||
Budget: ctx.Uint64("budget"),
|
Budget: ctx.Uint64("budget"),
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -127,6 +127,9 @@
|
|||||||
utxos which are unconfirmed and originated from the sweeper subsystem are not
|
utxos which are unconfirmed and originated from the sweeper subsystem are not
|
||||||
selected because they bear the risk of being replaced (BIP 125 RBF).
|
selected because they bear the risk of being replaced (BIP 125 RBF).
|
||||||
|
|
||||||
|
* [Fixed](https://github.com/lightningnetwork/lnd/pull/8685) lncli "bumpfee"
|
||||||
|
parsing of the immediate/force flag.
|
||||||
|
|
||||||
# New Features
|
# New Features
|
||||||
## Functional Enhancements
|
## Functional Enhancements
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user