lncfg: add new PrunedNodeMaxPeers config option/flag

This commit is contained in:
Wilmer Paulino 2021-03-26 15:49:24 -07:00
parent 82fe5d9bba
commit 56c536583f
No known key found for this signature in database
GPG Key ID: 6DF57B9F9514972F
4 changed files with 27 additions and 13 deletions

View File

@ -397,6 +397,7 @@ func NewChainControl(cfg *Config) (*ChainControl, error) {
ZMQTxHost: bitcoindMode.ZMQPubRawTx, ZMQTxHost: bitcoindMode.ZMQPubRawTx,
ZMQReadDeadline: 5 * time.Second, ZMQReadDeadline: 5 * time.Second,
Dialer: cfg.Dialer, Dialer: cfg.Dialer,
PrunedModeMaxPeers: bitcoindMode.PrunedNodeMaxPeers,
}) })
if err != nil { if err != nil {
return nil, err return nil, err

View File

@ -183,6 +183,8 @@ var (
defaultBitcoindEstimateMode = "CONSERVATIVE" defaultBitcoindEstimateMode = "CONSERVATIVE"
bitcoindEstimateModes = [2]string{"ECONOMICAL", defaultBitcoindEstimateMode} bitcoindEstimateModes = [2]string{"ECONOMICAL", defaultBitcoindEstimateMode}
defaultPrunedNodeMaxPeers = 4
defaultSphinxDbName = "sphinxreplay.db" defaultSphinxDbName = "sphinxreplay.db"
) )
@ -392,9 +394,10 @@ func DefaultConfig() Config {
RPCCert: defaultBtcdRPCCertFile, RPCCert: defaultBtcdRPCCertFile,
}, },
BitcoindMode: &lncfg.Bitcoind{ BitcoindMode: &lncfg.Bitcoind{
Dir: defaultBitcoindDir, Dir: defaultBitcoindDir,
RPCHost: defaultRPCHost, RPCHost: defaultRPCHost,
EstimateMode: defaultBitcoindEstimateMode, EstimateMode: defaultBitcoindEstimateMode,
PrunedNodeMaxPeers: defaultPrunedNodeMaxPeers,
}, },
Litecoin: &lncfg.Chain{ Litecoin: &lncfg.Chain{
MinHTLCIn: chainreg.DefaultLitecoinMinHTLCInMSat, MinHTLCIn: chainreg.DefaultLitecoinMinHTLCInMSat,
@ -411,9 +414,10 @@ func DefaultConfig() Config {
RPCCert: defaultLtcdRPCCertFile, RPCCert: defaultLtcdRPCCertFile,
}, },
LitecoindMode: &lncfg.Bitcoind{ LitecoindMode: &lncfg.Bitcoind{
Dir: defaultLitecoindDir, Dir: defaultLitecoindDir,
RPCHost: defaultRPCHost, RPCHost: defaultRPCHost,
EstimateMode: defaultBitcoindEstimateMode, EstimateMode: defaultBitcoindEstimateMode,
PrunedNodeMaxPeers: defaultPrunedNodeMaxPeers,
}, },
NeutrinoMode: &lncfg.Neutrino{ NeutrinoMode: &lncfg.Neutrino{
UserAgentName: neutrino.UserAgentName, UserAgentName: neutrino.UserAgentName,

View File

@ -3,11 +3,12 @@ package lncfg
// Bitcoind holds the configuration options for the daemon's connection to // Bitcoind holds the configuration options for the daemon's connection to
// bitcoind. // bitcoind.
type Bitcoind struct { type Bitcoind struct {
Dir string `long:"dir" description:"The base directory that contains the node's data, logs, configuration file, etc."` Dir string `long:"dir" description:"The base directory that contains the node's data, logs, configuration file, etc."`
RPCHost string `long:"rpchost" description:"The daemon's rpc listening address. If a port is omitted, then the default port for the selected chain parameters will be used."` RPCHost string `long:"rpchost" description:"The daemon's rpc listening address. If a port is omitted, then the default port for the selected chain parameters will be used."`
RPCUser string `long:"rpcuser" description:"Username for RPC connections"` RPCUser string `long:"rpcuser" description:"Username for RPC connections"`
RPCPass string `long:"rpcpass" default-mask:"-" description:"Password for RPC connections"` RPCPass string `long:"rpcpass" default-mask:"-" description:"Password for RPC connections"`
ZMQPubRawBlock string `long:"zmqpubrawblock" description:"The address listening for ZMQ connections to deliver raw block notifications"` ZMQPubRawBlock string `long:"zmqpubrawblock" description:"The address listening for ZMQ connections to deliver raw block notifications"`
ZMQPubRawTx string `long:"zmqpubrawtx" description:"The address listening for ZMQ connections to deliver raw transaction notifications"` ZMQPubRawTx string `long:"zmqpubrawtx" description:"The address listening for ZMQ connections to deliver raw transaction notifications"`
EstimateMode string `long:"estimatemode" description:"The fee estimate mode. Must be either ECONOMICAL or CONSERVATIVE."` EstimateMode string `long:"estimatemode" description:"The fee estimate mode. Must be either ECONOMICAL or CONSERVATIVE."`
PrunedNodeMaxPeers int `long:"pruned-node-max-peers" description:"The maximum number of peers lnd will choose from the backend node to retrieve pruned blocks from. This only applies to pruned nodes."`
} }

View File

@ -536,6 +536,10 @@ bitcoin.node=btcd
; If unset, the default value is "CONSERVATIVE". ; If unset, the default value is "CONSERVATIVE".
; bitcoind.estimatemode=CONSERVATIVE ; bitcoind.estimatemode=CONSERVATIVE
; The maximum number of peers lnd will choose from the backend node to retrieve
; pruned blocks from. This only applies to pruned nodes.
; bitcoind.pruned-node-max-peers=4
[neutrino] [neutrino]
; Connect only to the specified peers at startup. This creates a persistent ; Connect only to the specified peers at startup. This creates a persistent
@ -706,6 +710,10 @@ litecoin.node=ltcd
; If unset, the default value is "CONSERVATIVE". ; If unset, the default value is "CONSERVATIVE".
; litecoind.estimatemode=CONSERVATIVE ; litecoind.estimatemode=CONSERVATIVE
; The maximum number of peers lnd will choose from the backend node to retrieve
; pruned blocks from. This only applies to pruned nodes.
; litecoind.pruned-node-max-peers=4
[autopilot] [autopilot]
; If the autopilot agent should be active or not. The autopilot agent will ; If the autopilot agent should be active or not. The autopilot agent will