diff --git a/builder/files/config.toml b/builder/files/config.toml index 7957c3075d..2de1aaead5 100644 --- a/builder/files/config.toml +++ b/builder/files/config.toml @@ -150,8 +150,6 @@ syncmode = "full" # snapshot = 10 # database = 50 # trie = 15 - # journal = "triecache" - # rejournal = "1h0m0s" # noprefetch = false # preimages = false # txlookuplimit = 2350000 diff --git a/docs/cli/example_config.toml b/docs/cli/example_config.toml index be49a1da9e..00a86e73cb 100644 --- a/docs/cli/example_config.toml +++ b/docs/cli/example_config.toml @@ -155,8 +155,6 @@ devfakeauthor = false # Run miner without validator set authorization snapshot = 10 # Percentage of cache memory allowance to use for snapshot caching (default = 10% full mode, 20% archive mode) database = 50 # Percentage of cache memory allowance to use for database io trie = 15 # Percentage of cache memory allowance to use for trie caching (default = 15% full mode, 30% archive mode) - journal = "triecache" # Disk journal directory for trie cache to survive node restarts - rejournal = "1h0m0s" # Time interval to regenerate the trie cache journal noprefetch = false # Disable heuristic state prefetch during block import (less CPU and disk IO, more time waiting for data) preimages = false # Enable recording the SHA3/keccak preimages of trie keys txlookuplimit = 2350000 # Number of recent blocks to maintain transactions index for (default = about 56 days, 0 = entire chain) diff --git a/internal/cli/dumpconfig.go b/internal/cli/dumpconfig.go index c735f040fa..f01adef628 100644 --- a/internal/cli/dumpconfig.go +++ b/internal/cli/dumpconfig.go @@ -64,7 +64,6 @@ func (c *DumpconfigCommand) Run(args []string) int { userConfig.Sealer.RecommitRaw = userConfig.Sealer.Recommit.String() userConfig.Gpo.MaxPriceRaw = userConfig.Gpo.MaxPrice.String() 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() diff --git a/internal/cli/server/config.go b/internal/cli/server/config.go index 563df7ab4e..bc7b4624d4 100644 --- a/internal/cli/server/config.go +++ b/internal/cli/server/config.go @@ -526,13 +526,6 @@ type CacheConfig struct { // PercTrie is percentage of cache used for the trie PercTrie uint64 `hcl:"trie,optional" toml:"trie,optional"` - // Journal is the disk journal directory for trie cache to survive node restarts - Journal string `hcl:"journal,optional" toml:"journal,optional"` - - // Rejournal is the time interval to regenerate the journal for clean cache - Rejournal time.Duration `hcl:"-,optional" toml:"-"` - RejournalRaw string `hcl:"rejournal,optional" toml:"rejournal,optional"` - // NoPrefetch is used to disable prefetch of tries NoPrefetch bool `hcl:"noprefetch,optional" toml:"noprefetch,optional"` @@ -742,8 +735,6 @@ func DefaultConfig() *Config { PercTrie: 15, PercGc: 25, PercSnapshot: 10, - Journal: "triecache", - Rejournal: 60 * time.Minute, NoPrefetch: false, Preimages: false, TxLookupLimit: 2350000, @@ -840,7 +831,6 @@ func (c *Config) fillTimeDurations() error { {"jsonrpc.http.ep-requesttimeout", &c.JsonRPC.Http.ExecutionPoolRequestTimeout, &c.JsonRPC.Http.ExecutionPoolRequestTimeoutRaw}, {"txpool.lifetime", &c.TxPool.LifeTime, &c.TxPool.LifeTimeRaw}, {"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}, } diff --git a/internal/cli/server/flags.go b/internal/cli/server/flags.go index 35150d5a48..16a75b27d8 100644 --- a/internal/cli/server/flags.go +++ b/internal/cli/server/flags.go @@ -389,20 +389,6 @@ func (c *Command) Flags(config *Config) *flagset.Flagset { Default: c.cliConfig.Cache.PercTrie, Group: "Cache", }) - f.StringFlag(&flagset.StringFlag{ - Name: "cache.trie.journal", - Usage: "Disk journal directory for trie cache to survive node restarts", - Value: &c.cliConfig.Cache.Journal, - Default: c.cliConfig.Cache.Journal, - Group: "Cache", - }) - f.DurationFlag(&flagset.DurationFlag{ - Name: "cache.trie.rejournal", - Usage: "Time interval to regenerate the trie cache journal", - Value: &c.cliConfig.Cache.Rejournal, - Default: c.cliConfig.Cache.Rejournal, - Group: "Cache", - }) f.Uint64Flag(&flagset.Uint64Flag{ Name: "cache.gc", Usage: "Percentage of cache memory allowance to use for trie pruning", diff --git a/packaging/templates/mainnet-v1/archive/config.toml b/packaging/templates/mainnet-v1/archive/config.toml index 813dc5cf82..213ea023cc 100644 --- a/packaging/templates/mainnet-v1/archive/config.toml +++ b/packaging/templates/mainnet-v1/archive/config.toml @@ -144,8 +144,6 @@ gcmode = "archive" snapshot = 20 # database = 50 trie = 30 - # journal = "triecache" - # rejournal = "1h0m0s" # noprefetch = false # preimages = false # txlookuplimit = 2350000 diff --git a/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml b/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml index 92af98e03c..e87e287e46 100644 --- a/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml +++ b/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml @@ -144,8 +144,6 @@ syncmode = "full" # snapshot = 10 # database = 50 # trie = 15 - # journal = "triecache" - # rejournal = "1h0m0s" # noprefetch = false # preimages = false # txlookuplimit = 2350000 diff --git a/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml b/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml index f31a87a01b..cafdf08989 100644 --- a/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml +++ b/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml @@ -146,8 +146,6 @@ syncmode = "full" # snapshot = 10 # database = 50 # trie = 15 - # journal = "triecache" - # rejournal = "1h0m0s" # noprefetch = false # preimages = false # txlookuplimit = 2350000 diff --git a/packaging/templates/mainnet-v1/without-sentry/bor/config.toml b/packaging/templates/mainnet-v1/without-sentry/bor/config.toml index 72eb7d7dac..2c6a423812 100644 --- a/packaging/templates/mainnet-v1/without-sentry/bor/config.toml +++ b/packaging/templates/mainnet-v1/without-sentry/bor/config.toml @@ -146,8 +146,6 @@ syncmode = "full" # snapshot = 10 # database = 50 # trie = 15 -# journal = "triecache" -# rejournal = "1h0m0s" # noprefetch = false # preimages = false # txlookuplimit = 2350000 diff --git a/packaging/templates/testnet-v4/archive/config.toml b/packaging/templates/testnet-v4/archive/config.toml index 84b88cca77..d7690576b8 100644 --- a/packaging/templates/testnet-v4/archive/config.toml +++ b/packaging/templates/testnet-v4/archive/config.toml @@ -144,8 +144,6 @@ gcmode = "archive" snapshot = 20 # database = 50 trie = 30 - # journal = "triecache" - # rejournal = "1h0m0s" # noprefetch = false # preimages = false # txlookuplimit = 2350000 diff --git a/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml b/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml index 303ef31b88..9f5c58da44 100644 --- a/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml +++ b/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml @@ -144,8 +144,6 @@ syncmode = "full" # snapshot = 10 # database = 50 # trie = 15 - # journal = "triecache" - # rejournal = "1h0m0s" # noprefetch = false # preimages = false # txlookuplimit = 2350000 diff --git a/packaging/templates/testnet-v4/sentry/validator/bor/config.toml b/packaging/templates/testnet-v4/sentry/validator/bor/config.toml index 3dc9b24a29..56e8aec4a8 100644 --- a/packaging/templates/testnet-v4/sentry/validator/bor/config.toml +++ b/packaging/templates/testnet-v4/sentry/validator/bor/config.toml @@ -146,8 +146,6 @@ syncmode = "full" # snapshot = 10 # database = 50 # trie = 15 - # journal = "triecache" - # rejournal = "1h0m0s" # noprefetch = false # preimages = false # txlookuplimit = 2350000 diff --git a/packaging/templates/testnet-v4/without-sentry/bor/config.toml b/packaging/templates/testnet-v4/without-sentry/bor/config.toml index edf2af4b39..539313ccb2 100644 --- a/packaging/templates/testnet-v4/without-sentry/bor/config.toml +++ b/packaging/templates/testnet-v4/without-sentry/bor/config.toml @@ -146,8 +146,6 @@ syncmode = "full" # snapshot = 10 # database = 50 # trie = 15 -# journal = "triecache" -# rejournal = "1h0m0s" # noprefetch = false # preimages = false # txlookuplimit = 2350000