From 64601a9bbeefe004c821573d6398e507a73d98ca Mon Sep 17 00:00:00 2001 From: ziggie Date: Wed, 24 Apr 2024 16:49:14 +0100 Subject: [PATCH 1/2] wallet lncli: fix bumpfee parsing bug. --- cmd/lncli/walletrpc_active.go | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/cmd/lncli/walletrpc_active.go b/cmd/lncli/walletrpc_active.go index e9e5cc575..a79fc0065 100644 --- a/cmd/lncli/walletrpc_active.go +++ b/cmd/lncli/walletrpc_active.go @@ -272,10 +272,24 @@ func bumpFee(ctx *cli.Context) error { client, cleanUp := getWalletClient(ctx) 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{ Outpoint: protoOutPoint, TargetConf: uint32(ctx.Uint64("conf_target")), - Immediate: ctx.Bool("force"), + Immediate: immediate, Budget: ctx.Uint64("budget"), }) if err != nil { From 0ea45efe28b69315616edacc4a1faede908432f3 Mon Sep 17 00:00:00 2001 From: ziggie Date: Wed, 24 Apr 2024 16:51:34 +0100 Subject: [PATCH 2/2] docs: add release-notes. --- docs/release-notes/release-notes-0.18.0.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/release-notes/release-notes-0.18.0.md b/docs/release-notes/release-notes-0.18.0.md index f59ae179b..2add279b4 100644 --- a/docs/release-notes/release-notes-0.18.0.md +++ b/docs/release-notes/release-notes-0.18.0.md @@ -127,6 +127,9 @@ utxos which are unconfirmed and originated from the sweeper subsystem are not 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 ## Functional Enhancements