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

# Conflicts:
#	economics.toml

Author: sstanculeanu

api.toml

@@ -131,6 +131,9 @@
         # /network/enable-epochs will return metrics related to activation epochs
         { Name = "/enable-epochs", Open = true },
 
+        # /network/enable-epochs-v2 will return metrics related to activation epochs in the same format as in toml
+        { Name = "/enable-epochs-v2", Open = true },
+
         # /network/esdts will return all the issued esdts on the protocol
         { Name = "/esdts", Open = true },
 
@@ -232,7 +235,7 @@
         { Name = "/scrs-by-tx-hash/:txhash", Open = true },
 
         # transaction/pool/simulate-selection will simulate a selection, and it will return each selected transaction with the requested fields
-        { Name = "/pool/simulate-selection", Open = true},
+        { Name = "/pool/simulate-selection", Open = true}, # TODO[Sorin]: this should be false
 
         # transaction/pool/:address/virtual-nonce will return the virtual nonce of the account
         { Name = "/pool/:address/virtual-nonce", Open = true},

config.toml

@@ -27,11 +27,6 @@
     # GenesisMaxNumberOfShards represents the maximum number of shards to be created at genesis (excluding metaChain shard)
     GenesisMaxNumberOfShards  = 3
 
-    # 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
-
     # SyncProcessTimeInMillis is the value in milliseconds used when processing blocks while synchronizing blocks
     SyncProcessTimeInMillis = 12000
 
@@ -232,6 +227,8 @@ ConsensusConfigsByEpoch = [
         BatchDelaySeconds = 2
         MaxBatchSize = 100
         MaxOpenFiles = 10
+        ShardIDProviderType = "BinarySplit"
+        NumShards = 4
 
 [BootstrapStorage]
     [BootstrapStorage.Cache]
@@ -258,6 +255,8 @@ ConsensusConfigsByEpoch = [
         BatchDelaySeconds = 2
         MaxBatchSize = 100
         MaxOpenFiles = 10
+        ShardIDProviderType = "BinarySplit"
+        NumShards = 4
 
 [ProofsStorage]
     [ProofsStorage.Cache]
@@ -297,6 +296,8 @@ ConsensusConfigsByEpoch = [
         BatchDelaySeconds = 2
         MaxBatchSize = 30000
         MaxOpenFiles = 10
+        ShardIDProviderType = "BinarySplit"
+        NumShards = 4
 
 [UnsignedTransactionStorage]
     [UnsignedTransactionStorage.Cache]
@@ -502,7 +503,7 @@ ConsensusConfigsByEpoch = [
 [TxDataPool]
     Name = "TxDataPool"
     Capacity = 600000
-    SizePerSender = 5000
+    SizePerSender = 5001
     SizeInBytes = 419430400 #400MB
     SizeInBytesPerSender = 12288000 #12MB
     Type = "TxCache"
@@ -514,7 +515,6 @@ ConsensusConfigsByEpoch = [
 
 [TxCacheSelection]
     SelectionMaxNumTxs = 30000
-    SelectionLoopMaximumDuration = 250 # milliseconds
     SelectionLoopDurationCheckInterval = 10 # chunk (of transactions) size
     SelectionGasBandwidthIncreasePercent = 400
     SelectionGasBandwidthIncreaseScheduledPercent = 260
@@ -1007,6 +1007,8 @@ ConsensusConfigsByEpoch = [
         BatchDelaySeconds = 2
         MaxBatchSize = 20000
         MaxOpenFiles = 10
+        ShardIDProviderType = "BinarySplit"
+        NumShards = 4
     [DbLookupExtensions.EpochByHashStorageConfig.Cache]
         Name = "DbLookupExtensions.EpochByHashStorage"
         Capacity = 20000
@@ -1017,6 +1019,8 @@ ConsensusConfigsByEpoch = [
         BatchDelaySeconds = 2
         MaxBatchSize = 20000
         MaxOpenFiles = 10
+        ShardIDProviderType = "BinarySplit"
+        NumShards = 4
     [DbLookupExtensions.ResultsHashesByTxHashStorageConfig.Cache]
         Name = "DbLookupExtensions.ResultsHashesByTxHashStorage"
         Capacity = 20000
@@ -1092,11 +1096,6 @@ ConsensusConfigsByEpoch = [
         Type = "SizeLRU"
         SizeInBytes = 314572800 #300MB
 
-[Redundancy]
-    # 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 = 10
-
 [InterceptedDataVerifier]
     EnableCaching = true
     CacheSpanInSec = 30

economics.toml

@@ -83,7 +83,7 @@
         {EnableEpoch = 460, MaxGasLimitPerBlock = "1500000000", MaxGasLimitPerMiniBlock = "600000000", MaxGasLimitPerMetaBlock = "15000000000", MaxGasLimitPerMetaMiniBlock = "600000000", MaxGasLimitPerTx = "600000000", MinGasLimit = "50000", ExtraGasLimitGuardedTx  = "50000", MaxGasHigherFactorAccepted = "10"},
         {EnableEpoch = 613, MaxGasLimitPerBlock = "1500000000", MaxGasLimitPerMiniBlock = "250000000", MaxGasLimitPerMetaBlock = "15000000000", MaxGasLimitPerMetaMiniBlock = "250000000", MaxGasLimitPerTx = "600000000", MinGasLimit = "50000", ExtraGasLimitGuardedTx  = "50000", MaxGasHigherFactorAccepted = "10"},
         {EnableEpoch = 1820, MaxGasLimitPerBlock = "1500000000", MaxGasLimitPerMiniBlock = "250000000", MaxGasLimitPerMetaBlock = "15000000000", MaxGasLimitPerMetaMiniBlock = "250000000", MaxGasLimitPerTx = "600000000", MinGasLimit = "50000", ExtraGasLimitGuardedTx  = "50000", MaxGasHigherFactorAccepted = "2"},
-        {EnableEpoch = 2005, MaxGasLimitPerBlock = "600000000", MaxGasLimitPerMiniBlock = "250000000", MaxGasLimitPerMetaBlock = "6000000000", MaxGasLimitPerMetaMiniBlock = "250000000", MaxGasLimitPerTx = "600000000", MinGasLimit = "50000", ExtraGasLimitGuardedTx  = "50000", MaxGasHigherFactorAccepted = "2"},
+        {EnableEpoch = 2005, MaxGasLimitPerBlock = "600000000", MaxGasLimitPerMiniBlock = "250000000", MaxGasLimitPerMetaBlock = "12000000000", MaxGasLimitPerMetaMiniBlock = "250000000", MaxGasLimitPerTx = "600000000", MinGasLimit = "50000", ExtraGasLimitGuardedTx  = "50000", MaxGasHigherFactorAccepted = "2"},
     ]
     MinGasPrice             = "1000000000" #will yield min tx fee of 0.00005 eGLD
     GasPriceModifier        = 0.01

enableEpochs.toml

@@ -160,9 +160,6 @@
     # StorageAPICostOptimizationEnableEpoch represents the epoch when new storage helper functions are enabled and cost is reduced in Wasm VM
     StorageAPICostOptimizationEnableEpoch = 613
 
-    # TransformToMultiShardCreateEnableEpoch represents the epoch when the new function on esdt system sc is enabled to transfer create role into multishard
-    TransformToMultiShardCreateEnableEpoch = 613
-
     # ESDTRegisterAndSetAllRolesEnableEpoch represents the epoch when new function to register tickerID and set all roles is enabled
     ESDTRegisterAndSetAllRolesEnableEpoch = 613
 

external.toml

@@ -12,8 +12,8 @@
     Username          = ""
     Password          = ""
     # EnabledIndexes represents a slice of indexes that will be enabled for indexing. Full list is:
-    # ["rating", "transactions", "blocks", "validators", "miniblocks", "rounds", "accounts", "accountshistory", "receipts", "scresults", "accountsesdt", "accountsesdthistory", "epochinfo", "scdeploys", "tokens", "tags", "logs", "delegators", "operations", "esdts", "events"]
-    EnabledIndexes    = ["rating", "transactions", "blocks", "validators", "miniblocks", "rounds", "accounts", "accountshistory", "receipts", "scresults", "accountsesdt", "accountsesdthistory", "epochinfo", "scdeploys", "tokens", "tags", "logs", "delegators", "operations", "esdts", "events"]
+    # ["rating", "transactions", "blocks", "validators", "miniblocks", "rounds", "accounts", "accountshistory", "receipts", "scresults", "accountsesdt", "accountsesdthistory", "epochinfo", "scdeploys", "tokens", "tags", "logs", "delegators", "operations", "esdts", "events", "executionresults"]
+    EnabledIndexes    = ["rating", "transactions", "blocks", "validators", "miniblocks", "rounds", "accounts", "accountshistory", "receipts", "scresults", "accountsesdt", "accountsesdthistory", "epochinfo", "scdeploys", "tokens", "tags", "logs", "delegators", "operations", "esdts", "events", "executionresults"]
 
 # EventNotifierConnector defines settings needed to configure and launch the event notifier component
 # HTTP event notifier connector integration will be DEPRECATED in the following iterations

proxyVersion

@@ -1 +1 @@
-tags/v1.3.3
+rc/supernova

systemSmartContractsConfig.toml

@@ -3,7 +3,7 @@
     MinStakeValue = "100000000000000000000" #100 eGLD
     MinUnstakeTokensValue = "10000000000000000000" #10eGLD
     UnBondPeriod      = 144000  # period as number of rounds
-UnBondPeriodSupernova = 1440000 # period as number of rounds
+    UnBondPeriodSupernova = 1440000 # period as number of rounds
     UnBondPeriodInEpochs = 10
     MinStepValue = "100000000000000000000"
     NumRoundsWithoutBleed = 100