added config.toml example values to different config setups, added TxArrivalWaitRaw string for toml and hcl value inputs

This commit is contained in:
Alex 2023-02-14 22:03:42 -08:00
parent d56370b910
commit 070b13efbd
11 changed files with 19 additions and 7 deletions

View file

@ -19,12 +19,13 @@ ethstats = "" # Reporting URL of a ethstats service (nodename:sec
"32000000" = "0x875500011e5eecc0c554f95d07b31cf59df4ca2505f4dbbfffa7d4e4da917c68"
[p2p]
maxpeers = 50 # Maximum number of network peers (network disabled if set to 0)
maxpendpeers = 50 # Maximum number of pending connection attempts
bind = "0.0.0.0" # Network binding address
port = 30303 # Network listening port
nodiscover = false # Disables the peer discovery mechanism (manual peer addition)
nat = "any" # NAT port mapping mechanism (any|none|upnp|pmp|extip:<IP>)
maxpeers = 50 # Maximum number of network peers (network disabled if set to 0)
maxpendpeers = 50 # Maximum number of pending connection attempts
bind = "0.0.0.0" # Network binding address
port = 30303 # Network listening port
nodiscover = false # Disables the peer discovery mechanism (manual peer addition)
nat = "any" # NAT port mapping mechanism (any|none|upnp|pmp|extip:<IP>)
txarrivalwait = "500ms" # Maximum duration to wait before requesting an announced transaction
[p2p.discovery]
v5disc = false # Enables the experimental RLPx V5 (Topic Discovery) mechanism
bootnodes = [] # Comma separated enode URLs for P2P discovery bootstrap

View file

@ -62,6 +62,7 @@ func (c *DumpconfigCommand) Run(args []string) int {
userConfig.Gpo.IgnorePriceRaw = userConfig.Gpo.IgnorePrice.String()
userConfig.Cache.RejournalRaw = userConfig.Cache.Rejournal.String()
userConfig.Cache.TrieTimeoutRaw = userConfig.Cache.TrieTimeout.String()
userConfig.P2P.TxArrivalWaitRaw = userConfig.P2P.TxArrivalWait.String()
if err := toml.NewEncoder(os.Stdout).Encode(userConfig); err != nil {
c.UI.Error(err.Error())

View file

@ -134,7 +134,8 @@ type P2PConfig struct {
// TxArrivalWait sets the maximum duration the transaction fetcher will wait for
// an announced transaction to arrive before explicitly requesting it
TxArrivalWait time.Duration `hcl:"txarrivalwait,optional" toml:"txarrivalwait,optional"`
TxArrivalWait time.Duration `hcl:"-,optional" toml:"-"`
TxArrivalWaitRaw string `hcl:"txarrivalwait,optional" toml:"txarrivalwait,optional"`
}
type P2PDiscovery struct {
@ -636,6 +637,7 @@ func (c *Config) fillTimeDurations() error {
{"txpool.rejournal", &c.TxPool.Rejournal, &c.TxPool.RejournalRaw},
{"cache.rejournal", &c.Cache.Rejournal, &c.Cache.RejournalRaw},
{"cache.timeout", &c.Cache.TrieTimeout, &c.Cache.TrieTimeoutRaw},
{"p2p.txarrivalwait", &c.P2P.TxArrivalWait, &c.P2P.TxArrivalWaitRaw},
}
for _, x := range tds {

View file

@ -18,6 +18,7 @@ gcmode = "archive"
# bind = "0.0.0.0"
# nodiscover = false
# nat = "any"
# txarrivalwait = "500ms"
# [p2p.discovery]
# v5disc = false
# bootnodes = []

View file

@ -18,6 +18,7 @@ syncmode = "full"
# bind = "0.0.0.0"
# nodiscover = false
# nat = "any"
# txarrivalwait = "500ms"
# [p2p.discovery]
# v5disc = false
# bootnodes = []

View file

@ -20,6 +20,7 @@ syncmode = "full"
# maxpendpeers = 50
# bind = "0.0.0.0"
# nat = "any"
# txarrivalwait = "500ms"
# [p2p.discovery]
# v5disc = false
# bootnodes = []

View file

@ -20,6 +20,7 @@ syncmode = "full"
# bind = "0.0.0.0"
# nodiscover = false
# nat = "any"
# txarrivalwait = "500ms"
# [p2p.discovery]
# v5disc = false
# bootnodes = []

View file

@ -18,6 +18,7 @@ gcmode = "archive"
# bind = "0.0.0.0"
# nodiscover = false
# nat = "any"
# txarrivalwait = "500ms"
# [p2p.discovery]
# v5disc = false
# bootnodes = []

View file

@ -18,6 +18,7 @@ syncmode = "full"
# bind = "0.0.0.0"
# nodiscover = false
# nat = "any"
# txarrivalwait = "500ms"
# [p2p.discovery]
# v5disc = false
# bootnodes = []

View file

@ -20,6 +20,7 @@ syncmode = "full"
# maxpendpeers = 50
# bind = "0.0.0.0"
# nat = "any"
# txarrivalwait = "500ms"
# [p2p.discovery]
# v5disc = false
# bootnodes = []

View file

@ -20,6 +20,7 @@ syncmode = "full"
# bind = "0.0.0.0"
# nodiscover = false
# nat = "any"
# txarrivalwait = "500ms"
# [p2p.discovery]
# v5disc = false
# bootnodes = []