Merge pull request #6023 from multiversx/merge.1.7.1-esdtv2-6-mar

Merge.1.7.1 esdtv2 6 mar
multiversx · Mar 6, 2024 · d62daea · d62daea
2 parents 0753e2c + 9e4f704
commit d62daea
Show file tree

Hide file tree

Showing 85 changed files with 9,162 additions and 277 deletions.
diff --git a/cmd/node/config/config.toml b/cmd/node/config/config.toml
@@ -629,6 +629,7 @@
 
     MinNumConnectedPeersToStart       = 2
     MinNumOfPeersToConsiderBlockValid = 2
+    ExtraDelayForRequestBlockInfoInMilliseconds = 3000
 
 # ResourceStats, if enabled, will output in a folder called "stats"
 # resource statistics. For example: number of active go routines, memory allocation, number of GC sweeps, etc.

diff --git a/cmd/node/config/enableEpochs.toml b/cmd/node/config/enableEpochs.toml
@@ -258,7 +258,7 @@
     AutoBalanceDataTriesEnableEpoch = 1
 
     # MigrateDataTrieEnableEpoch represents the epoch when the data tries migration is enabled
-    MigrateDataTrieEnableEpoch = 2
+    MigrateDataTrieEnableEpoch = 1
 
     # KeepExecOrderOnCreatedSCRsEnableEpoch represents the epoch when the execution order of created SCRs is ensured
     KeepExecOrderOnCreatedSCRsEnableEpoch = 1
@@ -304,8 +304,8 @@
 
     # MaxNodesChangeEnableEpoch holds configuration for changing the maximum number of nodes and the enabling epoch
     MaxNodesChangeEnableEpoch = [
-        { EpochEnable = 0, MaxNumNodes = 36, NodesToShufflePerShard = 4 },
-        { EpochEnable = 1, MaxNumNodes = 56, NodesToShufflePerShard = 2 }
+        { EpochEnable = 0, MaxNumNodes = 48, NodesToShufflePerShard = 4 }, # 4 shuffled out keys / shard will not be reached normally
+        { EpochEnable = 1, MaxNumNodes = 64, NodesToShufflePerShard = 2 }
     ]
 
 [GasSchedule]

diff --git a/cmd/node/config/fullArchiveP2P.toml b/cmd/node/config/fullArchiveP2P.toml
@@ -48,9 +48,12 @@
     # RefreshIntervalInSec represents the time in seconds between querying for new peers
     RefreshIntervalInSec = 10
 
-    # ProtocolID represents the protocol that this node will advertize to other peers
-    # To connect to other nodes, those nodes should have the same ProtocolID string
-    ProtocolID = "/erd/kad/1.0.0"
+    # ProtocolIDs represents the protocols that this node will advertise to other peers
+    # To connect to other nodes, those nodes should have at least one common protocol string
+    ProtocolIDs = [
+        "/erd/kad/1.0.0",
+        "mvx-full-archive",
+    ]
 
     # InitialPeerList represents the list of strings of some known nodes that will bootstrap this node
     # The address will be in a self-describing addressing format.
@@ -71,10 +74,10 @@
 
 [Sharding]
     # The targeted number of peer connections
-    TargetPeerCount = 36
+    TargetPeerCount = 41
     MaxIntraShardValidators = 7
     MaxCrossShardValidators = 15
-    MaxIntraShardObservers = 2
+    MaxIntraShardObservers = 7
     MaxCrossShardObservers = 3
     MaxSeeders = 2