Merge branch 'feat/supernova-async-exec' into fix-race-execution

Author: AdoAdoAdo

cmd/node/config/config.toml

@@ -64,8 +64,30 @@
     ]
 
     ProcessConfigsByRound = [
-        { EnableRound = 0, MaxRoundsWithoutNewBlockReceived = 10, MaxRoundsWithoutCommittedBlock = 10, RoundModulusTriggerWhenSyncIsStuck = 20, MaxSyncWithErrorsAllowed = 10, MaxRoundsToKeepUnprocessedMiniBlocks = 300,   MaxRoundsToKeepUnprocessedTransactions = 300},
-        { EnableRound = 440, MaxRoundsWithoutNewBlockReceived = 100, MaxRoundsWithoutCommittedBlock = 100, RoundModulusTriggerWhenSyncIsStuck = 200, MaxSyncWithErrorsAllowed = 100, MaxRoundsToKeepUnprocessedMiniBlocks = 3000,   MaxRoundsToKeepUnprocessedTransactions = 3000  },
+        {
+        EnableRound = 0,
+        MaxRoundsWithoutNewBlockReceived = 10,
+        MaxRoundsWithoutCommittedBlock = 10,
+        RoundModulusTriggerWhenSyncIsStuck = 20,
+        MaxSyncWithErrorsAllowed = 10,
+        MaxRoundsToKeepUnprocessedMiniBlocks = 300,
+        MaxRoundsToKeepUnprocessedTransactions = 300,
+        NumFloodingRoundsFastReacting = 10,
+        NumFloodingRoundsSlowReacting = 2,
+        NumFloodingRoundsOutOfSpecs = 2
+        },
+        {
+        EnableRound = 440,
+        MaxRoundsWithoutNewBlockReceived = 100,
+        MaxRoundsWithoutCommittedBlock = 100,
+        RoundModulusTriggerWhenSyncIsStuck = 200,
+        MaxSyncWithErrorsAllowed = 100,
+        MaxRoundsToKeepUnprocessedMiniBlocks = 3000,
+        MaxRoundsToKeepUnprocessedTransactions = 3000,
+        NumFloodingRoundsFastReacting = 100,
+        NumFloodingRoundsSlowReacting = 20,
+        NumFloodingRoundsOutOfSpecs = 20
+        }
     ]
 
     EpochStartConfigsByEpoch = [
@@ -610,7 +632,6 @@
         [Antiflood.FastReacting.BlackList]
             ThresholdNumMessagesPerInterval = 1000
             ThresholdSizePerInterval = 8388608 #8MB/s
-            NumFloodingRounds = 10
             PeerBanDurationInSeconds = 300
 
     [Antiflood.SlowReacting]
@@ -625,7 +646,6 @@
         [Antiflood.SlowReacting.BlackList]
             ThresholdNumMessagesPerInterval = 10000
             ThresholdSizePerInterval = 37748736 # 36MB/interval
-            NumFloodingRounds = 2
             PeerBanDurationInSeconds = 3600
 
     [Antiflood.OutOfSpecs]
@@ -640,7 +660,6 @@
         [Antiflood.OutOfSpecs.BlackList]
             ThresholdNumMessagesPerInterval = 3600
             ThresholdSizePerInterval = 12582912 # 12MB/interval
-            NumFloodingRounds = 2
             PeerBanDurationInSeconds = 3600
 
     [Antiflood.PeerMaxOutput]

common/configs/commonConfigs.go

@@ -18,7 +18,7 @@ const (
 var ErrEmptyCommonConfigsByEpoch = errors.New("empty common configs by epoch")
 
 // ErrEmptyCommonConfigsByRound signals that an empty common configs by round has been provided
-var ErrEmptyCommonConfigsByRound = errors.New("empty common configs by epoch")
+var ErrEmptyCommonConfigsByRound = errors.New("empty common configs by round")
 
 type commonConfigs struct {
 	orderedEpochStartConfigByEpoch []config.EpochStartConfigByEpoch
@@ -140,7 +140,7 @@ func checkConsensusConfigsByEpoch(configsByEpoch []config.ConsensusConfigByEpoch
 	return nil
 }
 
-// GetMaxMetaNoncesBehind returns the max meta nonces behind by epoch
+// GetGracePeriodRoundsByEpoch returns the grace period rounds by epoch
 func (cc *commonConfigs) GetGracePeriodRoundsByEpoch(epoch uint32) uint32 {
 	for i := len(cc.orderedEpochStartConfigByEpoch) - 1; i >= 0; i-- {
 		if cc.orderedEpochStartConfigByEpoch[i].EnableEpoch <= epoch {
@@ -151,7 +151,7 @@ func (cc *commonConfigs) GetGracePeriodRoundsByEpoch(epoch uint32) uint32 {
 	return defaultGracePeriodRounds // this should not happen
 }
 
-// GetExtraDelayForRequestBlockInfoInMs returns the max meta nonces behind by epoch
+// GetExtraDelayForRequestBlockInfoInMs returns the extra delay for request block info by epoch
 func (cc *commonConfigs) GetExtraDelayForRequestBlockInfoInMs(epoch uint32) uint32 {
 	for i := len(cc.orderedEpochStartConfigByEpoch) - 1; i >= 0; i-- {
 		if cc.orderedEpochStartConfigByEpoch[i].EnableEpoch <= epoch {

common/configs/commonConfigs_test.go

@@ -14,15 +14,15 @@ func TestNewCommonConfigsHandler(t *testing.T) {
 	t.Run("should return error for empty config by epoch", func(t *testing.T) {
 		t.Parallel()
 
-		pce, err := configs.NewCommonConfigsHandler(nil, nil, nil)
+		pce, err := configs.NewCommonConfigsHandler(nil, []config.EpochStartConfigByRound{}, []config.ConsensusConfigByEpoch{})
 		require.Nil(t, pce)
 		require.Equal(t, configs.ErrEmptyCommonConfigsByEpoch, err)
 	})
 
 	t.Run("should return error for empty config by round", func(t *testing.T) {
 		t.Parallel()
 
-		pce, err := configs.NewCommonConfigsHandler([]config.EpochStartConfigByEpoch{}, nil, nil)
+		pce, err := configs.NewCommonConfigsHandler([]config.EpochStartConfigByEpoch{{EnableEpoch: 0}}, nil, []config.ConsensusConfigByEpoch{{EnableEpoch: 0}})
 		require.Nil(t, pce)
 		require.Equal(t, configs.ErrEmptyCommonConfigsByRound, err)
 	})

common/configs/consts.go

@@ -0,0 +1,21 @@
+package configs
+
+const (
+	minRoundsToKeepUnprocessedData = uint64(1)
+	minFloodingRounds              = 2
+)
+
+const (
+	defaultMaxMetaNoncesBehind                    = 15
+	defaultMaxMetaNoncesBehindForGlobalStuck      = 30
+	defaultMaxShardNoncesBehind                   = 15
+	defaultMaxRoundsWithoutNewBlockReceived       = 10
+	defaultMaxRoundsWithoutCommittedBlock         = 10
+	defaultRoundModulusTriggerWhenSyncIsStuck     = 20
+	defaultMaxSyncWithErrorsAllowed               = 20
+	defaultMaxRoundsToKeepUnprocessedMiniBlocks   = 3000
+	defaultMaxRoundsToKeepUnprocessedTransactions = 3000
+	defaultNumFloodingRoundsFastReacting          = 20
+	defaultNumFloodingRoundsSlowReacting          = 20
+	defaultNumFloodingRoundsOutOfSpecs            = 20
+)

common/configs/dto/dto.go

@@ -0,0 +1,13 @@
+package dto
+
+// ConfigVariable defines a config variable name
+type ConfigVariable string
+
+const (
+	// NumFloodingRoundsFastReacting defines variable name for NumFloodingRoundsFastReacting
+	NumFloodingRoundsFastReacting ConfigVariable = "NumFloodingRoundsFastReacting"
+	// NumFloodingRoundsSlowReacting defines variable name for NumFloodingRoundsSlowReacting
+	NumFloodingRoundsSlowReacting ConfigVariable = "NumFloodingRoundsSlowReacting"
+	// NumFloodingRoundsOutOfSpecs defines variable name for NumFloodingRoundsOutOfSpecs
+	NumFloodingRoundsOutOfSpecs ConfigVariable = "NumFloodingRoundsOutOfSpecs"
+)

common/configs/errors.go

@@ -0,0 +1,21 @@
+package configs
+
+import "errors"
+
+// ErrEmptyProcessConfigsByEpoch signals that an empty process configs by epoch has been provided
+var ErrEmptyProcessConfigsByEpoch = errors.New("empty process configs by epoch")
+
+// ErrEmptyProcessConfigsByRound signals that an empty process configs by round has been provided
+var ErrEmptyProcessConfigsByRound = errors.New("empty process configs by round")
+
+// ErrDuplicatedEpochConfig signals that a duplicated config section has been provided
+var ErrDuplicatedEpochConfig = errors.New("duplicated epoch config")
+
+// ErrDuplicatedRoundConfig signals that a duplicated config section has been provided
+var ErrDuplicatedRoundConfig = errors.New("duplicated round config")
+
+// ErrMissingEpochZeroConfig signals that epoch zero configuration is missing
+var ErrMissingEpochZeroConfig = errors.New("missing configuration for epoch 0")
+
+// ErrMissingRoundZeroConfig signals that base round configuration is missing
+var ErrMissingRoundZeroConfig = errors.New("missing base configuration for round")

common/configs/processConfigs.go

@@ -1,57 +1,42 @@
 package configs
 
 import (
-	"errors"
 	"fmt"
 	"sort"
 
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-go/common/configs/dto"
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/process"
+	logger "github.com/multiversx/mx-chain-logger-go"
 )
 
-const minRoundsToKeepUnprocessedData = uint64(1)
-
-const (
-	defaultMaxMetaNoncesBehind                    = 15
-	defaultMaxMetaNoncesBehindForGlobalStuck      = 30
-	defaultMaxShardNoncesBehind                   = 15
-	defaultMaxRoundsWithoutNewBlockReceived       = 10
-	defaultMaxRoundsWithoutCommittedBlock         = 10
-	defaultRoundModulusTriggerWhenSyncIsStuck     = 20
-	defaultMaxSyncWithErrorsAllowed               = 20
-	defaultMaxRoundsToKeepUnprocessedMiniBlocks   = 3000
-	defaultMaxRoundsToKeepUnprocessedTransactions = 3000
-)
-
-// ErrEmptyProcessConfigsByEpoch signals that an empty process configs by epoch has been provided
-var ErrEmptyProcessConfigsByEpoch = errors.New("empty process configs by epoch")
-
-// ErrEmptyProcessConfigsByRound signals that an empty process configs by round has been provided
-var ErrEmptyProcessConfigsByRound = errors.New("empty process configs by round")
-
-// ErrDuplicatedEpochConfig signals that a duplicated config section has been provided
-var ErrDuplicatedEpochConfig = errors.New("duplicated epoch config")
-
-// ErrDuplicatedRoundConfig signals that a duplicated config section has been provided
-var ErrDuplicatedRoundConfig = errors.New("duplicated round config")
-
-// ErrMissingEpochZeroConfig signals that epoch zero configuration is missing
-var ErrMissingEpochZeroConfig = errors.New("missing configuration for epoch 0")
+var log = logger.GetOrCreate("processConfigs")
 
-// ErrMissingRoundZeroConfig signals that base round configuration is missing
-var ErrMissingRoundZeroConfig = errors.New("missing base configuration for round")
+type configByRoundSelector[T any] func(config.ProcessConfigByRound) T
+type configVariableHandler struct {
+	valueSelector configByRoundSelector[uint64]
+	defaultValue  uint64
+}
 
 // processConfigsByEpoch holds the process configuration for epoch changes
 type processConfigsByEpoch struct {
 	orderedConfigByEpoch []config.ProcessConfigByEpoch
 	orderedConfigByRound []config.ProcessConfigByRound
+	roundNotifier        process.RoundNotifier
+	variablesMap         map[dto.ConfigVariable]configVariableHandler
 }
 
 // NewProcessConfigsHandler creates a new process configs by epoch component
 func NewProcessConfigsHandler(
 	configsByEpoch []config.ProcessConfigByEpoch,
 	configsByRound []config.ProcessConfigByRound,
+	roundNotifier process.RoundNotifier,
 ) (*processConfigsByEpoch, error) {
+	if check.IfNil(roundNotifier) {
+		return nil, fmt.Errorf("%w in NewProcessConfigsHandler", process.ErrNilRoundNotifier)
+	}
+
 	err := checkConfigsByEpoch(configsByEpoch)
 	if err != nil {
 		return nil, err
@@ -65,6 +50,8 @@ func NewProcessConfigsHandler(
 	pce := &processConfigsByEpoch{
 		orderedConfigByEpoch: make([]config.ProcessConfigByEpoch, len(configsByEpoch)),
 		orderedConfigByRound: make([]config.ProcessConfigByRound, len(configsByRound)),
+		roundNotifier:        roundNotifier,
+		variablesMap:         initCfgVarMap(),
 	}
 
 	// sort the config values in ascending order
@@ -142,10 +129,24 @@ func checkRoundConfigValues(cfg config.ProcessConfigByRound) error {
 		return fmt.Errorf("%w for MaxRoundsToKeepUnprocessedMiniBlocks, received %d, min expected %d",
 			process.ErrInvalidValue, cfg.MaxRoundsToKeepUnprocessedMiniBlocks, minRoundsToKeepUnprocessedData)
 	}
+	if cfg.NumFloodingRoundsFastReacting < minFloodingRounds {
+		return fmt.Errorf("%w for NumFloodingRoundsFastReacting, received %d, min expected %d",
+			process.ErrInvalidValue, cfg.NumFloodingRoundsFastReacting, minFloodingRounds)
+	}
+	if cfg.NumFloodingRoundsSlowReacting < minFloodingRounds {
+		return fmt.Errorf("%w for NumFloodingRoundsSlowReacting, received %d, min expected %d",
+			process.ErrInvalidValue, cfg.NumFloodingRoundsSlowReacting, minFloodingRounds)
+	}
+	if cfg.NumFloodingRoundsOutOfSpecs < minFloodingRounds {
+		return fmt.Errorf("%w for NumFloodingRoundsOutOfSpecs, received %d, min expected %d",
+			process.ErrInvalidValue, cfg.NumFloodingRoundsOutOfSpecs, minFloodingRounds)
+	}
 
 	return nil
 }
 
+// TODO: We should probably get rid of all these functions and use only GetValue func, similar to how enableEpochsHandler works
+
 // GetMaxMetaNoncesBehindByEpoch returns the max meta nonces behind by epoch
 func (pce *processConfigsByEpoch) GetMaxMetaNoncesBehindByEpoch(epoch uint32) uint32 {
 	for i := len(pce.orderedConfigByEpoch) - 1; i >= 0; i-- {
@@ -182,7 +183,7 @@ func (pce *processConfigsByEpoch) GetMaxShardNoncesBehindByEpoch(epoch uint32) u
 func getConfigValueByRound[T any](
 	configs []config.ProcessConfigByRound,
 	round uint64,
-	selector func(config.ProcessConfigByRound) T,
+	selector configByRoundSelector[T],
 	defaultValue T,
 ) T {
 	for i := len(configs) - 1; i >= 0; i-- {
@@ -266,6 +267,29 @@ func (pce *processConfigsByEpoch) GetMaxRoundsToKeepUnprocessedTransactions(roun
 	)
 }
 
+// GetValue returns the value of the provided variable for the current round
+func (pce *processConfigsByEpoch) GetValue(variable dto.ConfigVariable) uint64 {
+	return pce.getValueByRound(variable, pce.roundNotifier.CurrentRound())
+}
+
+func (pce *processConfigsByEpoch) getValueByRound(
+	variable dto.ConfigVariable,
+	round uint64,
+) uint64 {
+	cfgVarHandler, ok := pce.variablesMap[variable]
+	if !ok {
+		log.Warn("processConfigsByEpoch.getValueByRound: variable not found in pce.variablesMap", "variable", variable)
+		return 0
+	}
+
+	return getConfigValueByRound(
+		pce.orderedConfigByRound,
+		round,
+		cfgVarHandler.valueSelector,
+		cfgVarHandler.defaultValue,
+	)
+}
+
 // IsInterfaceNil checks if the instance is nil
 func (pce *processConfigsByEpoch) IsInterfaceNil() bool {
 	return pce == nil