Merge branch 'release-v2.0.0.0' of https://github.com/multiversx/mx-chain-mainnet-config into release-v2.0.0.0-bon

# Conflicts:
#	config.toml

Author: sstanculeanu

config.toml

@@ -59,39 +59,35 @@ ProcessConfigsByEpoch = [
     { EnableEpoch = 2032, MaxMetaNoncesBehind = 75, MaxMetaNoncesBehindForGlobalStuck = 120, MaxShardNoncesBehind = 75 },
 ]
 
-# ProcessConfigsByRound represents the configuration of process configuration parameters by round
-[[ProcessConfigsByRound]]
-    EnableRound = 0
-    MaxRoundsWithoutNewBlockReceived = 10
-    MaxRoundsWithoutCommittedBlock = 10
-    RoundModulusTriggerWhenSyncIsStuck = 20
-    MaxSyncWithErrorsAllowed = 10
-    MaxRoundsToKeepUnprocessedMiniBlocks = 300
-    MaxRoundsToKeepUnprocessedTransactions = 300
-    NumFloodingRoundsFastReacting = 10
-    NumFloodingRoundsSlowReacting = 2
-    NumFloodingRoundsOutOfSpecs = 2
+ProcessConfigsByRound = [
+    {
+    EnableRound = 0,
+    MaxRoundsWithoutNewBlockReceived = 10,
+    MaxRoundsWithoutCommittedBlock = 10,
+    RoundModulusTriggerWhenSyncIsStuck = 20,
+    MaxSyncWithErrorsAllowed = 10,
+    MaxRoundsToKeepUnprocessedMiniBlocks = 300,
+    MaxRoundsToKeepUnprocessedTransactions = 300,
     # MaxConsecutiveRoundsOfRatingDecrease represents the max number of consecutive rounds in which a block is not proposed
     # on a shard and the validators' rating could be decreased. If, for instance, a shard gets stuck for more rounds
     # than this value, then the validators rating decrease should stop so they won't get jailed
-    MaxConsecutiveRoundsOfRatingDecrease = 600
+    MaxConsecutiveRoundsOfRatingDecrease = 600,
     # MaxRoundsOfInactivityAccepted defines the number of rounds missed by a main or higher level backup machine before
     # the current machine will take over and propose/sign blocks. Used in both single-key and multi-key modes.
     MaxRoundsOfInactivityAccepted = 3
-
-[[ProcessConfigsByRound]]
-    EnableRound = 29145300
-    MaxRoundsWithoutNewBlockReceived = 100
-    MaxRoundsWithoutCommittedBlock = 100
-    RoundModulusTriggerWhenSyncIsStuck = 200
-    MaxSyncWithErrorsAllowed = 100
-    MaxRoundsToKeepUnprocessedMiniBlocks = 3000
-    MaxRoundsToKeepUnprocessedTransactions = 3000
-    NumFloodingRoundsFastReacting = 100
-    NumFloodingRoundsSlowReacting = 20
-    NumFloodingRoundsOutOfSpecs = 20
-    MaxConsecutiveRoundsOfRatingDecrease = 6000
+    },
+    {
+    EnableRound = 29145300,
+    MaxRoundsWithoutNewBlockReceived = 100,
+    MaxRoundsWithoutCommittedBlock = 100,
+    RoundModulusTriggerWhenSyncIsStuck = 200,
+    MaxSyncWithErrorsAllowed = 100,
+    MaxRoundsToKeepUnprocessedMiniBlocks = 3000,
+    MaxRoundsToKeepUnprocessedTransactions = 3000,
+    MaxConsecutiveRoundsOfRatingDecrease = 6000,
     MaxRoundsOfInactivityAccepted = 30
+    }
+]
 
 EpochStartConfigsByEpoch = [
     { EnableEpoch = 0, GracePeriodRounds = 25, ExtraDelayForRequestBlockInfoInMilliseconds = 3000 },
@@ -522,7 +518,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
+    SelectionTimeoutMs = 150                                # Max time for AOT selection in milliseconds
 
 [TrieNodesChunksDataPool]
     Name = "TrieNodesDataPool"
@@ -634,10 +630,9 @@ ConsensusConfigsByEpoch = [
 
 [Antiflood]
     Enabled = true
-
     [[Antiflood.ConfigsByRound]]
         Round = 0
-        NumConcurrentResolverJobs = 50 # TODO: analyse for meta on bootstrap there was a constant used with value 10
+        NumConcurrentResolverJobs = 50
         NumConcurrentResolvingTrieNodesJobs = 3
 
         [Antiflood.ConfigsByRound.FastReacting]
@@ -650,9 +645,9 @@ 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 = 10000
-                ThresholdSizePerInterval = 12388608 #12MB/s
-                NumFloodingRounds = 100
+                ThresholdNumMessagesPerInterval = 1000
+                ThresholdSizePerInterval = 8388608 #8MB/s
+                NumFloodingRounds = 10
                 PeerBanDurationInSeconds = 300
 
         [Antiflood.ConfigsByRound.SlowReacting]
@@ -665,24 +660,24 @@ 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 = 100000
-                ThresholdSizePerInterval = 60748736 # 60MB/interval
-                NumFloodingRounds = 20
+                ThresholdNumMessagesPerInterval = 10000
+                ThresholdSizePerInterval = 37748736 # 36MB/interval
+                NumFloodingRounds = 2
                 PeerBanDurationInSeconds = 3600
 
         [Antiflood.ConfigsByRound.OutOfSpecs]
             IntervalInSeconds = 1
             ReservedPercent   = 0.0
             [Antiflood.ConfigsByRound.OutOfSpecs.PeerMaxInput]
-                BaseMessagesPerInterval = 20000
-                TotalSizePerInterval = 104857600 # 100MB/interval
+                BaseMessagesPerInterval = 2000
+                TotalSizePerInterval = 10485760 # 10MB/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 = 36000
-                ThresholdSizePerInterval = 18582912 # 18MB/interval
-                NumFloodingRounds = 20
+                ThresholdNumMessagesPerInterval = 3600
+                ThresholdSizePerInterval = 12582912 # 12MB/interval
+                NumFloodingRounds = 2
                 PeerBanDurationInSeconds = 3600
 
         [Antiflood.ConfigsByRound.PeerMaxOutput]
@@ -702,12 +697,11 @@ ConsensusConfigsByEpoch = [
         [Antiflood.ConfigsByRound.TxAccumulator]
             # MaxAllowedTimeInMilliseconds is used as a time frame in which the node gathers transactions.
             # After this period, collected transactions will be sent on the p2p topics
-            MaxAllowedTimeInMilliseconds = 80
+            MaxAllowedTimeInMilliseconds = 250
             # MaxDeviationTimeInMilliseconds represents the time in miliseconds that will cause the effectual time frame be
             # less than the specified max value. This is used to create desynchronizations between senders as to not
             # clutter the network exactly in the same moment
             MaxDeviationTimeInMilliseconds = 25
-            # Antiflood config ends here for Supernova
 
     [[Antiflood.ConfigsByRound]]
         Round = 29145300
@@ -718,60 +712,60 @@ ConsensusConfigsByEpoch = [
             IntervalInSeconds = 1
             ReservedPercent   = 20.0
             [Antiflood.ConfigsByRound.FastReacting.PeerMaxInput]
-                BaseMessagesPerInterval  = 2800
-                TotalSizePerInterval = 41943040 #4MB/s
+                BaseMessagesPerInterval  = 280
+                TotalSizePerInterval = 4194304 #4MB/s
                 [Antiflood.ConfigsByRound.FastReacting.PeerMaxInput.IncreaseFactor]
                     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 #12MB/s
-                NumFloodingRounds = 10
+                ThresholdNumMessagesPerInterval = 10000
+                ThresholdSizePerInterval = 12388608 #12MB/s
+                NumFloodingRounds = 100
                 PeerBanDurationInSeconds = 300
 
         [Antiflood.ConfigsByRound.SlowReacting]
             IntervalInSeconds = 30
             ReservedPercent   = 20.0
             [Antiflood.ConfigsByRound.SlowReacting.PeerMaxInput]
-                BaseMessagesPerInterval = 60000
-                TotalSizePerInterval = 188743680 # 18MB/interval
+                BaseMessagesPerInterval = 6000
+                TotalSizePerInterval = 18874368 # 18MB/interval
                 [Antiflood.ConfigsByRound.SlowReacting.PeerMaxInput.IncreaseFactor]
                     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 # 60MB/interval
-                NumFloodingRounds = 2
+                ThresholdNumMessagesPerInterval = 100000
+                ThresholdSizePerInterval = 60748736 # 60MB/interval
+                NumFloodingRounds = 20
                 PeerBanDurationInSeconds = 3600
 
         [Antiflood.ConfigsByRound.OutOfSpecs]
             IntervalInSeconds = 1
             ReservedPercent   = 0.0
             [Antiflood.ConfigsByRound.OutOfSpecs.PeerMaxInput]
-                BaseMessagesPerInterval = 200000
-                TotalSizePerInterval = 504857600 # 100MB/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 # 18MB/interval
-                NumFloodingRounds = 2
+                ThresholdNumMessagesPerInterval = 36000
+                ThresholdSizePerInterval = 18582912 # 18MB/interval
+                NumFloodingRounds = 20
                 PeerBanDurationInSeconds = 3600
 
         [Antiflood.ConfigsByRound.PeerMaxOutput]
             [Antiflood.ConfigsByRound.PeerMaxOutput.PeerMaxInput]
-                BaseMessagesPerInterval  = 150000
-                TotalSizePerInterval     = 309715200 #30MB/s
+                BaseMessagesPerInterval  = 150
+                TotalSizePerInterval     = 2097152 #2MB/s
 
         [Antiflood.ConfigsByRound.Cache]
             Name = "Antiflood"
-            Capacity = 70000
+            Capacity = 7000
             Type = "LRU"
         [Antiflood.ConfigsByRound.Topic]
-            DefaultMaxMessagesPerSec = 150000
-            MaxMessages = [{ Topic = "shardBlocks*", NumMessagesPerSec = 300 },
-                { Topic = "metachainBlocks", NumMessagesPerSec = 300 }]
+            DefaultMaxMessagesPerSec = 15000
+            MaxMessages = [{ Topic = "shardBlocks*", NumMessagesPerSec = 30 },
+                { Topic = "metachainBlocks", NumMessagesPerSec = 30 }]
 
         [Antiflood.ConfigsByRound.TxAccumulator]
             # MaxAllowedTimeInMilliseconds is used as a time frame in which the node gathers transactions.
@@ -781,7 +775,7 @@ ConsensusConfigsByEpoch = [
             # less than the specified max value. This is used to create desynchronizations between senders as to not
             # clutter the network exactly in the same moment
             MaxDeviationTimeInMilliseconds = 25
-
+    # Antiflood config ends here for Supernova
 
 [WebServerAntiflood]
     WebServerAntifloodEnabled = true
@@ -899,6 +893,7 @@ ConsensusConfigsByEpoch = [
 [BlockSizeThrottleConfig]
     MinSizeInBytes = 104857 # 104857 is 10% from 1MB
     MaxSizeInBytes = 943718 # 943718 is 90% from 1MB
+    MaxExecResSizeInBytes = 104857 # 104857 is 10% from 1MB
 
 [VirtualMachine]
     [VirtualMachine.Execution]
@@ -1191,6 +1186,10 @@ ConsensusConfigsByEpoch = [
     CacheSpanInSec = 30
     CacheExpiryInSec = 30
 
+[DirectSentTransactions]
+    CacheSpanInSec = 30
+    CacheExpiryInSec = 30
+
 [ExecutionResultInclusionEstimator]
     # Safety margin = 110 -> 110% -> 10% buffer
     SafetyMargin = 110