From 236294622e390eb9430c31b3e43ffe06dfb4641a Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Mon, 11 Jan 2021 09:22:38 +0100 Subject: [PATCH] config+lncfg+sample-lnd.conf: fix feeurl documentation A new top level feeurl option was added recently to replace the neutrino.feeurl option. The new option was never added to the sample config file and the text was never updated to reflect that the option is required for neutrino on mainnet. We fix this and also add a valid mainnet example URL to the sample config file. --- config.go | 2 +- lncfg/neutrino.go | 2 +- sample-lnd.conf | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/config.go b/config.go index 831b17a0..dca5d591 100644 --- a/config.go +++ b/config.go @@ -238,7 +238,7 @@ type Config struct { MaxPendingChannels int `long:"maxpendingchannels" description:"The maximum number of incoming pending channels permitted per peer."` BackupFilePath string `long:"backupfilepath" description:"The target location of the channel backup file"` - FeeURL string `long:"feeurl" description:"Optional URL for external fee estimation. If no URL is specified, the method for fee estimation will depend on the chosen backend and network."` + FeeURL string `long:"feeurl" description:"Optional URL for external fee estimation. If no URL is specified, the method for fee estimation will depend on the chosen backend and network. Must be set for neutrino on mainnet."` Bitcoin *lncfg.Chain `group:"Bitcoin" namespace:"bitcoin"` BtcdMode *lncfg.Btcd `group:"btcd" namespace:"btcd"` diff --git a/lncfg/neutrino.go b/lncfg/neutrino.go index dc7bb581..c00f3a70 100644 --- a/lncfg/neutrino.go +++ b/lncfg/neutrino.go @@ -10,7 +10,7 @@ type Neutrino struct { MaxPeers int `long:"maxpeers" description:"Max number of inbound and outbound peers"` BanDuration time.Duration `long:"banduration" description:"How long to ban misbehaving peers. Valid time units are {s, m, h}. Minimum 1 second"` BanThreshold uint32 `long:"banthreshold" description:"Maximum allowed ban score before disconnecting and banning misbehaving peers."` - FeeURL string `long:"feeurl" description:"DEPRECATED: Optional URL for fee estimation. If a URL is not specified, static fees will be used for estimation."` + FeeURL string `long:"feeurl" description:"DEPRECATED: Use top level 'feeurl' option. Optional URL for fee estimation. If a URL is not specified, static fees will be used for estimation."` AssertFilterHeader string `long:"assertfilterheader" description:"Optional filter header in height:hash format to assert the state of neutrino's filter header chain on startup. If the assertion does not hold, then the filter header chain will be re-synced from the genesis block."` UserAgentName string `long:"useragentname" description:"Used to help identify ourselves to other bitcoin peers"` UserAgentVersion string `long:"useragentversion" description:"Used to help identify ourselves to other bitcoin peers"` diff --git a/sample-lnd.conf b/sample-lnd.conf index db84a01f..9bc9ce05 100644 --- a/sample-lnd.conf +++ b/sample-lnd.conf @@ -219,6 +219,11 @@ ; The target location of the channel backup file. ; backupfilepath=~/.lnd/data/chain/bitcoin/simnet/channel.backup +; Optional URL for external fee estimation. If no URL is specified, the method +; for fee estimation will depend on the chosen backend and network. Must be set +; for neutrino on mainnet. +; feeurl=https://nodes.lightning.computer/fees/v1/btc-fee-estimates.json + ; If true, then automatic network bootstrapping will not be attempted. This ; means that your node won't attempt to automatically seek out peers on the ; network. @@ -540,7 +545,8 @@ bitcoin.node=btcd ; NOTE: This value is currently unused. ; neutrino.banthreshold= -; Set a URL source for fee estimates. +; DEPRECATED: Use top level 'feeurl' option. Optional URL for fee estimation. If +; a URL is not specified, static fees will be used for estimation. ; neutrino.feeurl= ; Optional filter header in height:hash format to assert the state of neutrino's