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

rpc: use default if conf-target is not set

Browse Source 
This commit uses the new coop-close-target-confs value as the default to
use for a nodes self initiated channel closures if the conf-target flag
for the channel closure is not set. The defaults for both these options
is 6 so this shouldnt change current behaviour.
This commit is contained in:
Elle Mouton 2021-03-03 10:44:42 +02:00
parent 3b412ce50f
commit 9e9c48fcdd
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/lncli/commands.go
View File

@ -669,7 +669,9 @@ var closeChannelCommand = cli.Command{
Name: "conf_target", Name: "conf_target",
Usage: "(optional) the number of blocks that the " + Usage: "(optional) the number of blocks that the " +
"transaction *should* confirm in, will be " + "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{ cli.Int64Flag{
Name: "sat_per_byte", Name: "sat_per_byte",

9
rpcserver.go
View File

@ -2317,6 +2317,13 @@ func (r *rpcServer) CloseChannel(in *lnrpc.CloseChannelRequest,
"is offline (try force closing it instead): %v", err) "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 // Based on the passed fee related parameters, we'll determine
// an appropriate fee rate for the cooperative closure // an appropriate fee rate for the cooperative closure
// transaction. // transaction.
@ -2325,7 +2332,7 @@ func (r *rpcServer) CloseChannel(in *lnrpc.CloseChannelRequest,
).FeePerKWeight() ).FeePerKWeight()
feeRate, err := sweep.DetermineFeePerKw( feeRate, err := sweep.DetermineFeePerKw(
r.server.cc.FeeEstimator, sweep.FeePreference{ r.server.cc.FeeEstimator, sweep.FeePreference{
ConfTarget: uint32(in.TargetConf), ConfTarget: targetConf,
FeeRate: satPerKw, FeeRate: satPerKw,
}, },
) )

4
sample-lnd.conf
View File

@ -254,7 +254,9 @@
; The target number of blocks in which a cooperative close initiated by a remote ; 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 ; 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 ; coop-close-target-confs=10
; The default max_htlc applied when opening or accepting channels. This value ; The default max_htlc applied when opening or accepting channels. This value