From a8b4c226b14a887b13c9016a709e16306590aa31 Mon Sep 17 00:00:00 2001 From: Manav Darji Date: Fri, 3 Feb 2023 15:33:30 +0530 Subject: [PATCH] Revert "chg : trieTimeout from 60 to 10 mins (#692)" This reverts commit 241843c7e7bb18e64d2e157fd6fbbd665f6ce9d9. --- builder/files/config.toml | 2 +- docs/cli/example_config.toml | 2 +- internal/cli/server/config.go | 2 +- packaging/templates/mainnet-v1/archive/config.toml | 2 +- packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml | 2 +- packaging/templates/mainnet-v1/sentry/validator/bor/config.toml | 2 +- packaging/templates/mainnet-v1/without-sentry/bor/config.toml | 2 +- packaging/templates/testnet-v4/archive/config.toml | 2 +- packaging/templates/testnet-v4/sentry/sentry/bor/config.toml | 2 +- packaging/templates/testnet-v4/sentry/validator/bor/config.toml | 2 +- packaging/templates/testnet-v4/without-sentry/bor/config.toml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/builder/files/config.toml b/builder/files/config.toml index aa6ca0f208..f577706f7b 100644 --- a/builder/files/config.toml +++ b/builder/files/config.toml @@ -129,7 +129,7 @@ syncmode = "full" # preimages = false # txlookuplimit = 2350000 # triesinmemory = 128 - # timeout = "10m0s" + # timeout = "1h0m0s" [accounts] # allow-insecure-unlock = true diff --git a/docs/cli/example_config.toml b/docs/cli/example_config.toml index 2a768e6bd2..6bf58a8361 100644 --- a/docs/cli/example_config.toml +++ b/docs/cli/example_config.toml @@ -132,7 +132,7 @@ ethstats = "" # Reporting URL of a ethstats service (nodename:sec 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) triesinmemory = 128 # Number of block states (tries) to keep in memory - timeout = "10m0s" # Time after which the Merkle Patricia Trie is stored to disc from memory + timeout = "1h0m0s" # Time after which the Merkle Patricia Trie is stored to disc from memory [accounts] unlock = [] # Comma separated list of accounts to unlock diff --git a/internal/cli/server/config.go b/internal/cli/server/config.go index e61364b075..ac4e9c8d53 100644 --- a/internal/cli/server/config.go +++ b/internal/cli/server/config.go @@ -565,7 +565,7 @@ func DefaultConfig() *Config { Preimages: false, TxLookupLimit: 2350000, TriesInMemory: 128, - TrieTimeout: 10 * time.Minute, + TrieTimeout: 60 * time.Minute, }, Accounts: &AccountsConfig{ Unlock: []string{}, diff --git a/packaging/templates/mainnet-v1/archive/config.toml b/packaging/templates/mainnet-v1/archive/config.toml index 181502a92e..8e98736196 100644 --- a/packaging/templates/mainnet-v1/archive/config.toml +++ b/packaging/templates/mainnet-v1/archive/config.toml @@ -120,7 +120,7 @@ gcmode = "archive" # noprefetch = false # preimages = false # txlookuplimit = 2350000 - # timeout = "10m0s" + # timeout = "1h0m0s" # [accounts] # unlock = [] diff --git a/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml b/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml index ecb38b4609..853b2ed313 100644 --- a/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml +++ b/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml @@ -120,7 +120,7 @@ syncmode = "full" # noprefetch = false # preimages = false # txlookuplimit = 2350000 - # timeout = "10m0s" + # timeout = "1h0m0s" # [accounts] # unlock = [] diff --git a/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml b/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml index 508df5f6b9..284445113c 100644 --- a/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml +++ b/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml @@ -122,7 +122,7 @@ syncmode = "full" # noprefetch = false # preimages = false # txlookuplimit = 2350000 - # timeout = "10m0s" + # timeout = "1h0m0s" [accounts] allow-insecure-unlock = true diff --git a/packaging/templates/mainnet-v1/without-sentry/bor/config.toml b/packaging/templates/mainnet-v1/without-sentry/bor/config.toml index 3fa20ef121..22361b64bc 100644 --- a/packaging/templates/mainnet-v1/without-sentry/bor/config.toml +++ b/packaging/templates/mainnet-v1/without-sentry/bor/config.toml @@ -122,7 +122,7 @@ syncmode = "full" # noprefetch = false # preimages = false # txlookuplimit = 2350000 -# timeout = "10m0s" +# timeout = "1h0m0s" [accounts] allow-insecure-unlock = true diff --git a/packaging/templates/testnet-v4/archive/config.toml b/packaging/templates/testnet-v4/archive/config.toml index 110be1a14c..992aff0c68 100644 --- a/packaging/templates/testnet-v4/archive/config.toml +++ b/packaging/templates/testnet-v4/archive/config.toml @@ -120,7 +120,7 @@ gcmode = "archive" # noprefetch = false # preimages = false # txlookuplimit = 2350000 - # timeout = "10m0s" + # timeout = "1h0m0s" # [accounts] # unlock = [] diff --git a/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml b/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml index 8814be618f..1a335a42a3 100644 --- a/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml +++ b/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml @@ -120,7 +120,7 @@ syncmode = "full" # noprefetch = false # preimages = false # txlookuplimit = 2350000 - # timeout = "10m0s" + # timeout = "1h0m0s" # [accounts] # unlock = [] diff --git a/packaging/templates/testnet-v4/sentry/validator/bor/config.toml b/packaging/templates/testnet-v4/sentry/validator/bor/config.toml index 69b6c1214e..798375364e 100644 --- a/packaging/templates/testnet-v4/sentry/validator/bor/config.toml +++ b/packaging/templates/testnet-v4/sentry/validator/bor/config.toml @@ -122,7 +122,7 @@ syncmode = "full" # noprefetch = false # preimages = false # txlookuplimit = 2350000 - # timeout = "10m0s" + # timeout = "1h0m0s" [accounts] allow-insecure-unlock = true diff --git a/packaging/templates/testnet-v4/without-sentry/bor/config.toml b/packaging/templates/testnet-v4/without-sentry/bor/config.toml index bc3b5c0723..47a3053b58 100644 --- a/packaging/templates/testnet-v4/without-sentry/bor/config.toml +++ b/packaging/templates/testnet-v4/without-sentry/bor/config.toml @@ -122,7 +122,7 @@ syncmode = "full" # noprefetch = false # preimages = false # txlookuplimit = 2350000 -# timeout = "10m0s" +# timeout = "1h0m0s" [accounts] allow-insecure-unlock = true