Merge pull request #6163 from multiversx/merge_master_into_rc17next1_…

…2024.05.14

Merge master into rc17next1 2024.05.14

cmd/node/config/enableEpochs.toml

@@ -285,25 +285,25 @@
     FixGasRemainingForSaveKeyValueBuiltinFunctionEnableEpoch = 1
 
     # CurrentRandomnessOnSortingEnableEpoch represents the epoch when the current randomness on sorting is enabled
-    CurrentRandomnessOnSortingEnableEpoch = 4
+    CurrentRandomnessOnSortingEnableEpoch = 1
 
     # StakeLimitsEnableEpoch represents the epoch when stake limits on validators are enabled
     # Should have the same value as StakingV4Step1EnableEpoch that triggers the automatic unstake operations for the queue nodes
-    StakeLimitsEnableEpoch = 4
+    StakeLimitsEnableEpoch = 1
 
     # StakingV4Step1EnableEpoch represents the epoch when staking v4 is initialized. This is the epoch in which
     # all nodes from staking queue are moved in the auction list
-    StakingV4Step1EnableEpoch = 4
+    StakingV4Step1EnableEpoch = 1
 
     # StakingV4Step2EnableEpoch represents the epoch when staking v4 is enabled. Should have a greater value than StakingV4Step1EnableEpoch.
     # From this epoch, all shuffled out nodes are moved to auction nodes. No auction nodes selection is done yet.
-    StakingV4Step2EnableEpoch = 5
+    StakingV4Step2EnableEpoch = 2
 
     # StakingV4Step3EnableEpoch represents the epoch in which selected nodes from auction will be distributed to waiting list
-    StakingV4Step3EnableEpoch = 6
+    StakingV4Step3EnableEpoch = 3
 
     # AlwaysMergeContextsInEEIEnableEpoch represents the epoch in which the EEI will always merge the contexts
-    AlwaysMergeContextsInEEIEnableEpoch = 4
+    AlwaysMergeContextsInEEIEnableEpoch = 1
 
     # DynamicESDTEnableEpoch represents the epoch when dynamic NFT feature is enabled
     DynamicESDTEnableEpoch = 4
@@ -328,7 +328,7 @@
         # - Enable epoch = StakingV4Step3EnableEpoch
         # - NodesToShufflePerShard = same as previous entry in MaxNodesChangeEnableEpoch
         # - MaxNumNodes = (MaxNumNodesFromPreviousEpochEnable - (numOfShards+1)*NodesToShufflePerShard)
-        { EpochEnable = 6, MaxNumNodes = 56, NodesToShufflePerShard = 2 },
+        { EpochEnable = 3, MaxNumNodes = 56, NodesToShufflePerShard = 2 },
     ]
 
 [GasSchedule]

cmd/node/config/systemSmartContractsConfig.toml

@@ -10,7 +10,7 @@
     BleedPercentagePerRound = 0.00001
     MaxNumberOfNodesForStake = 64
     UnJailValue = "2500000000000000000" #0.1% of genesis node price
-    ActivateBLSPubKeyMessageVerification = false
+    ActivateBLSPubKeyMessageVerification = true
     StakeLimitPercentage = 1.0 #fraction of value 1 - 100%, for the time being no stake limit
     NodeLimitPercentage = 0.1 #fraction of value 0.1 - 10%
 
@@ -35,7 +35,7 @@
 
 [DelegationManagerSystemSCConfig]
     MinCreationDeposit = "1250000000000000000000" #1.25K eGLD
-    MinStakeAmount = "10000000000000000000" #10 eGLD
+    MinStakeAmount = "1000000000000000000" #1 eGLD
     ConfigChangeAddress = "erd1vxy22x0fj4zv6hktmydg8vpfh6euv02cz4yg0aaws6rrad5a5awqgqky80" #should use a multisign contract instead of a wallet address
 
 [DelegationSystemSCConfig]