diff --git a/cmd/lncli/commands.go b/cmd/lncli/commands.go index 61fbca82a..d7a81bd40 100644 --- a/cmd/lncli/commands.go +++ b/cmd/lncli/commands.go @@ -669,7 +669,9 @@ var closeChannelCommand = cli.Command{ Name: "conf_target", Usage: "(optional) the number of blocks that the " + "transaction *should* confirm in, will be " + - "used for fee estimation", + "used for fee estimation. If not set, " + + "then the conf-target value set in the main " + + "lnd config will be used.", }, cli.Int64Flag{ Name: "sat_per_byte", diff --git a/rpcserver.go b/rpcserver.go index d8883351a..d1acfb775 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -2317,6 +2317,13 @@ func (r *rpcServer) CloseChannel(in *lnrpc.CloseChannelRequest, "is offline (try force closing it instead): %v", err) } + // If conf-target is not set then use the conf-target used for + // co-op closes that are initiated by the remote peer. + targetConf := uint32(in.TargetConf) + if targetConf == 0 { + targetConf = r.cfg.CoopCloseTargetConfs + } + // Based on the passed fee related parameters, we'll determine // an appropriate fee rate for the cooperative closure // transaction. @@ -2325,7 +2332,7 @@ func (r *rpcServer) CloseChannel(in *lnrpc.CloseChannelRequest, ).FeePerKWeight() feeRate, err := sweep.DetermineFeePerKw( r.server.cc.FeeEstimator, sweep.FeePreference{ - ConfTarget: uint32(in.TargetConf), + ConfTarget: targetConf, FeeRate: satPerKw, }, ) diff --git a/sample-lnd.conf b/sample-lnd.conf index 9cddfcb5e..5a94a3af0 100644 --- a/sample-lnd.conf +++ b/sample-lnd.conf @@ -254,7 +254,9 @@ ; The target number of blocks in which a cooperative close initiated by a remote ; peer should be confirmed. This target is used to estimate the starting fee -; rate that will be used during fee negotiation with the peer. +; rate that will be used during fee negotiation with the peer. This target is +; is also used for cooperative closes initiated locally if the --conf_target +; for the channel closure is not set. ; coop-close-target-confs=10 ; The default max_htlc applied when opening or accepting channels. This value