diff --git a/binaryVersion b/binaryVersion index a44b782..f237cd3 100644 --- a/binaryVersion +++ b/binaryVersion @@ -1 +1 @@ -tags/v2.0.4 +trigger-recovery-hardening \ No newline at end of file diff --git a/config.toml b/config.toml index 7fa86e7..3a08c4e 100644 --- a/config.toml +++ b/config.toml @@ -58,7 +58,8 @@ EpochChangeGracePeriodByEpoch = [ # ProcessConfigsByEpoch represents the configuration of process configuration parameters by epoch ProcessConfigsByEpoch = [ { EnableEpoch = 0, MaxMetaNoncesBehind = 15, MaxMetaNoncesBehindForGlobalStuck = 30, MaxShardNoncesBehind = 15 }, - { EnableEpoch = 6439, MaxMetaNoncesBehind = 75, MaxMetaNoncesBehindForGlobalStuck = 120, MaxShardNoncesBehind = 75 }, + { EnableEpoch = 6438, MaxMetaNoncesBehind = 5, MaxMetaNoncesBehindForGlobalStuck = 8, MaxShardNoncesBehind = 5 }, + { EnableEpoch = 6439, MaxMetaNoncesBehind = 15, MaxMetaNoncesBehindForGlobalStuck = 30, MaxShardNoncesBehind = 15 }, ] ConsensusConfigsByRound = [ @@ -579,7 +580,7 @@ ConsensusConfigsByEpoch = [ # Ahead-of-Time transaction selection - pre-selects transactions before consensus round Enabled = true CacheSize = 10 # Number of pre-selection results to cache - SelectionTimeoutMs = 150 # Max time for AOT selection in milliseconds + SelectionTimeoutMs = 100 # Max time for AOT selection in milliseconds [TrieNodesChunksDataPool] Name = "TrieNodesDataPool" @@ -782,8 +783,8 @@ ConsensusConfigsByEpoch = [ Threshold = 10 #if consensus size will exceed this value, then Factor = 1.0 #increase the base value with [factor*consensus size] [Antiflood.ConfigsByRound.FastReacting.BlackList] - ThresholdNumMessagesPerInterval = 100000 - ThresholdSizePerInterval = 123886080 #120MB/s + ThresholdNumMessagesPerInterval = 10000 + ThresholdSizePerInterval = 83886080 #80MB/s NumFloodingRounds = 10 PeerBanDurationInSeconds = 300 @@ -797,8 +798,8 @@ ConsensusConfigsByEpoch = [ Threshold = 10 #if consensus size will exceed this value, then Factor = 0.0 #increase the base value with [factor*consensus size] [Antiflood.ConfigsByRound.SlowReacting.BlackList] - ThresholdNumMessagesPerInterval = 1000000 - ThresholdSizePerInterval = 607487360 # 600MB/interval + ThresholdNumMessagesPerInterval = 100000 + ThresholdSizePerInterval = 377487360 # 360MB/interval NumFloodingRounds = 2 PeerBanDurationInSeconds = 3600 @@ -806,21 +807,21 @@ ConsensusConfigsByEpoch = [ IntervalInSeconds = 1 ReservedPercent = 0.0 [Antiflood.ConfigsByRound.OutOfSpecs.PeerMaxInput] - BaseMessagesPerInterval = 200000 - TotalSizePerInterval = 1048576000 # 1000MB/interval + BaseMessagesPerInterval = 20000 + TotalSizePerInterval = 104857600 # 100MB/interval [Antiflood.ConfigsByRound.OutOfSpecs.PeerMaxInput.IncreaseFactor] Threshold = 0 #if consensus size will exceed this value, then Factor = 0.0 #increase the base value with [factor*consensus size] [Antiflood.ConfigsByRound.OutOfSpecs.BlackList] - ThresholdNumMessagesPerInterval = 360000 - ThresholdSizePerInterval = 185829120 # 180MB/interval + ThresholdNumMessagesPerInterval = 36000 + ThresholdSizePerInterval = 125829120 # 120MB/interval NumFloodingRounds = 2 PeerBanDurationInSeconds = 3600 [Antiflood.ConfigsByRound.PeerMaxOutput] [Antiflood.ConfigsByRound.PeerMaxOutput.PeerMaxInput] - BaseMessagesPerInterval = 150000 - TotalSizePerInterval = 309715200 #30MB/s + BaseMessagesPerInterval = 1500 + TotalSizePerInterval = 20971520 #20MB/s [Antiflood.ConfigsByRound.Cache] Name = "Antiflood" diff --git a/scripts/run-observer.sh b/scripts/run-observer.sh index d8b55ef..32ce9bf 100755 --- a/scripts/run-observer.sh +++ b/scripts/run-observer.sh @@ -69,6 +69,11 @@ check_nonce_grows() { CONTAINER_ID=$(docker ps -q --filter ancestor=${IMAGE_NAME}) if [ -z "${CONTAINER_ID}" ]; then echo "node is not running" + LAST_CONTAINER_ID=$(docker ps -aq --filter ancestor=${IMAGE_NAME} | head -n 1) + if [ -n "${LAST_CONTAINER_ID}" ]; then + echo "last lines from docker log:" + docker logs --tail 50 "${LAST_CONTAINER_ID}" + fi exit 1 fi