Merge branch 'feat/testnet-fixes' into miniblock-inclusion-checks

Author: ssd04

cmd/node/config/config.toml

@@ -1158,6 +1158,7 @@
     NumCrossShardPeers  = 2
     NumTotalPeers       = 3 # NumCrossShardPeers + num intra shard
     NumFullHistoryPeers = 3
+    RequestProofByNonceDelayMs = 100 # delay proof requests by nonce to allow the header to be received first
 
 [HeartbeatV2]
     PeerAuthenticationTimeBetweenSendsInSec          = 600   # 10min TODO: change this for mainnet/devnet/testnet

cmd/node/config/enableEpochs.toml

@@ -372,6 +372,13 @@
     # RelayedTransactionsV1V2DisableEpoch represents the epoch when relayed transactions v1 and v2 are disabled
     RelayedTransactionsV1V2DisableEpoch = 1
 
+    # FullShardDataValidationEnableEpoch represents the epoch when NumPendingMiniBlocks and LastIncludedMetaNonce
+    # in meta ShardData are enforced during verification; before it, these two fields are skipped.
+    FullShardDataValidationEnableEpoch = 1
+
+    # ConsumedGasInEconomicsFixEnableEpoch represents the epoch when consumed gas in accumulated economics is fixed
+    ConsumedGasInEconomicsFixEnableEpoch = 1
+
     # BLSMultiSignerEnableEpoch represents the activation epoch for different types of BLS multi-signers
     BLSMultiSignerEnableEpoch = [
         { EnableEpoch = 0, Type = "no-KOSK" },

common/constants.go

@@ -812,6 +812,9 @@ const (
 	// MetricRelayedTransactionsV1V2DisableEpoch represents the epoch when relayed transactions v1 and v2 are disabled
 	MetricRelayedTransactionsV1V2DisableEpoch = "erd_relayed_transactions_v1_v2_disable_epoch"
 
+	// MetricConsumedGasInEconomicsFixEnableEpoch represents the epoch when consumed gas for accumulated fees is fixed
+	MetricConsumedGasInEconomicsFixEnableEpoch = "erd_consumed_gas_in_economics_fix_enable_epoch"
+
 	// MetricTailInflationEnableEpoch represents the epoch when tail inflation is enabled
 	MetricTailInflationEnableEpoch = "erd_tail_inflation_enable_epoch"
 
@@ -1331,6 +1334,8 @@ const (
 	AutomaticActivationOfNodesDisableFlag               core.EnableEpochFlag = "AutomaticActivationOfNodesDisableFlag"
 	FixGetBalanceFlag                                   core.EnableEpochFlag = "FixGetBalanceFlag"
 	RelayedTransactionsV1V2DisableFlag                  core.EnableEpochFlag = "RelayedTransactionsV1V2DisableFlag"
+	FullShardDataValidationFlag                         core.EnableEpochFlag = "FullShardDataValidationFlag"
+	ConsumedGasInEconomicsFlag                          core.EnableEpochFlag = "ConsumedGasInEconomicsFlag"
 	// all new flags must be added to createAllFlagsMap method, as part of enableEpochsHandler allFlagsDefined
 )
 

common/enablers/enableEpochsHandler.go

@@ -1002,6 +1002,20 @@ func (handler *enableEpochsHandler) createAllFlagsMap() {
 			activationEpoch:     handler.enableEpochsConfig.RelayedTransactionsV1V2DisableEpoch,
 			activationEpochName: "RelayedTransactionsV1V2DisableEpoch",
 		},
+		common.FullShardDataValidationFlag: {
+			isActiveInEpoch: func(epoch uint32) bool {
+				return epoch >= handler.enableEpochsConfig.FullShardDataValidationEnableEpoch
+			},
+			activationEpoch:     handler.enableEpochsConfig.FullShardDataValidationEnableEpoch,
+			activationEpochName: "FullShardDataValidationEnableEpoch",
+		},
+		common.ConsumedGasInEconomicsFlag: {
+			isActiveInEpoch: func(epoch uint32) bool {
+				return epoch >= handler.enableEpochsConfig.ConsumedGasInEconomicsFixEnableEpoch
+			},
+			activationEpoch:     handler.enableEpochsConfig.ConsumedGasInEconomicsFixEnableEpoch,
+			activationEpochName: "ConsumedGasInEconomicsFixEnableEpoch",
+		},
 	}
 }
 

common/enablers/enableEpochsHandler_test.go

@@ -136,7 +136,9 @@ func createEnableEpochsConfig() config.EnableEpochs {
 		BarnardOpcodesEnableEpoch:                                116,
 		AutomaticActivationOfNodesDisableEpoch:                   117,
 		RelayedTransactionsV1V2DisableEpoch:                      118,
-		SupernovaEnableEpoch:                                     119,
+		FullShardDataValidationEnableEpoch:                       119,
+		ConsumedGasInEconomicsFixEnableEpoch:                     120,
+		SupernovaEnableEpoch:                                     121,
 	}
 }
 
@@ -344,6 +346,7 @@ func TestEnableEpochsHandler_IsFlagEnabled(t *testing.T) {
 	require.True(t, handler.IsFlagEnabled(common.AndromedaFlag))
 	require.True(t, handler.IsFlagEnabled(common.DynamicESDTFlag))
 	require.True(t, handler.IsFlagEnabled(common.RelayedTransactionsV1V2DisableFlag))
+	require.True(t, handler.IsFlagEnabled(common.FullShardDataValidationFlag))
 	require.True(t, handler.IsFlagEnabled(common.SupernovaFlag))
 }
 
@@ -481,6 +484,8 @@ func TestEnableEpochsHandler_GetActivationEpoch(t *testing.T) {
 	require.Equal(t, cfg.AutomaticActivationOfNodesDisableEpoch, handler.GetActivationEpoch(common.AutomaticActivationOfNodesDisableFlag))
 	require.Equal(t, cfg.FixGetBalanceEnableEpoch, handler.GetActivationEpoch(common.FixGetBalanceFlag))
 	require.Equal(t, cfg.RelayedTransactionsV1V2DisableEpoch, handler.GetActivationEpoch(common.RelayedTransactionsV1V2DisableFlag))
+	require.Equal(t, cfg.FullShardDataValidationEnableEpoch, handler.GetActivationEpoch(common.FullShardDataValidationFlag))
+	require.Equal(t, cfg.ConsumedGasInEconomicsFixEnableEpoch, handler.GetActivationEpoch(common.ConsumedGasInEconomicsFlag))
 	require.Equal(t, cfg.SupernovaEnableEpoch, handler.GetActivationEpoch(common.SupernovaFlag))
 }
 

config/config.go

@@ -808,9 +808,10 @@ type TrieSyncConfig struct {
 
 // RequesterConfig represents the config options to be used when setting up the requester instances
 type RequesterConfig struct {
-	NumCrossShardPeers  uint32
-	NumTotalPeers       uint32
-	NumFullHistoryPeers uint32
+	NumCrossShardPeers         uint32
+	NumTotalPeers              uint32
+	NumFullHistoryPeers        uint32
+	RequestProofByNonceDelayMs uint32
 }
 
 // ChainParametersByEpochConfig holds chain parameters that are configurable based on epochs

config/epochConfig.go

@@ -135,6 +135,8 @@ type EnableEpochs struct {
 	FixGetBalanceEnableEpoch                                 uint32
 	AutomaticActivationOfNodesDisableEpoch                   uint32
 	RelayedTransactionsV1V2DisableEpoch                      uint32
+	FullShardDataValidationEnableEpoch                       uint32
+	ConsumedGasInEconomicsFixEnableEpoch                     uint32
 	BLSMultiSignerEnableEpoch                                []MultiSignerConfig
 }
 

config/tomlConfig_test.go

@@ -1307,8 +1307,11 @@ func TestEnableEpochConfig(t *testing.T) {
     # RelayedTransactionsV1V2DisableEpoch represents the epoch when relayed transactions v1 and v2 are disabled
     RelayedTransactionsV1V2DisableEpoch = 113
 
+    # ConsumedGasInEconomicsFixEnableEpoch represents the epoch when consumed gas in accumulated economics is fixed
+    ConsumedGasInEconomicsFixEnableEpoch = 114
+
     # SupernovaEnableEpoch represents the epoch when sub-second finality will be enabled
-    SupernovaEnableEpoch = 114
+    SupernovaEnableEpoch = 115
 
     # MaxNodesChangeEnableEpoch holds configuration for changing the maximum number of nodes and the enabling epoch
     MaxNodesChangeEnableEpoch = [
@@ -1442,7 +1445,8 @@ func TestEnableEpochConfig(t *testing.T) {
 			AutomaticActivationOfNodesDisableEpoch:                   111,
 			FixGetBalanceEnableEpoch:                                 112,
 			RelayedTransactionsV1V2DisableEpoch:                      113,
-			SupernovaEnableEpoch:                                     114,
+			ConsumedGasInEconomicsFixEnableEpoch:                     114,
+			SupernovaEnableEpoch:                                     115,
 			MaxNodesChangeEnableEpoch: []MaxNodesChangeConfig{
 				{
 					EpochEnable:            44,

consensus/spos/worker.go

@@ -608,6 +608,10 @@ func (wrk *Worker) doJobOnMessageWithHeader(cnsMsg *consensus.Message) error {
 		return fmt.Errorf("%w : received header from consensus topic is invalid",
 			err)
 	}
+	if wrk.enableEpochsHandler.IsFlagEnabledInEpoch(common.AndromedaFlag, header.GetEpoch()) {
+		return fmt.Errorf("%w : received header on consensus topic after andromeda",
+			ErrInvalidHeader)
+	}
 
 	var valStatsRootHash []byte
 	metaHeader, ok := header.(data.MetaHeaderHandler)

dataRetriever/requestHandlers/requestHandler.go

@@ -38,16 +38,17 @@ const uniqueEquivalentProofSuffix = "eqp"
 // TODO move the keys definitions that are whitelisted in core and use them in InterceptedData implementations, Identifiers() function
 
 type resolverRequestHandler struct {
-	mutEpoch              sync.RWMutex
-	epoch                 uint32
-	shardID               uint32
-	maxTxsToRequest       int
-	requestersFinder      dataRetriever.RequestersFinder
-	requestedItemsHandler dataRetriever.RequestedItemsHandler
-	whiteList             dataRetriever.WhiteListHandler
-	sweepTime             time.Time
-	requestInterval       time.Duration
-	mutSweepTime          sync.Mutex
+	mutEpoch                 sync.RWMutex
+	epoch                    uint32
+	shardID                  uint32
+	maxTxsToRequest          int
+	requestersFinder         dataRetriever.RequestersFinder
+	requestedItemsHandler    dataRetriever.RequestedItemsHandler
+	whiteList                dataRetriever.WhiteListHandler
+	sweepTime                time.Time
+	requestInterval          time.Duration
+	requestProofByNonceDelay time.Duration
+	mutSweepTime             sync.Mutex
 
 	trieHashesAccumulator map[string]struct{}
 	lastTrieRequestTime   time.Time
@@ -62,6 +63,7 @@ func NewResolverRequestHandler(
 	maxTxsToRequest int,
 	shardID uint32,
 	requestInterval time.Duration,
+	requestProofByNonceDelay time.Duration,
 ) (*resolverRequestHandler, error) {
 
 	if check.IfNil(finder) {
@@ -81,14 +83,15 @@ func NewResolverRequestHandler(
 	}
 
 	rrh := &resolverRequestHandler{
-		requestersFinder:      finder,
-		requestedItemsHandler: requestedItemsHandler,
-		epoch:                 uint32(0), // will be updated after creation of the request handler
-		shardID:               shardID,
-		maxTxsToRequest:       maxTxsToRequest,
-		whiteList:             whiteList,
-		requestInterval:       requestInterval,
-		trieHashesAccumulator: make(map[string]struct{}),
+		requestersFinder:         finder,
+		requestedItemsHandler:    requestedItemsHandler,
+		epoch:                    uint32(0), // will be updated after creation of the request handler
+		shardID:                  shardID,
+		maxTxsToRequest:          maxTxsToRequest,
+		whiteList:                whiteList,
+		requestInterval:          requestInterval,
+		requestProofByNonceDelay: requestProofByNonceDelay,
+		trieHashesAccumulator:    make(map[string]struct{}),
 	}
 
 	rrh.sweepTime = time.Now()
@@ -1002,46 +1005,50 @@ func (rrh *resolverRequestHandler) RequestEquivalentProofByNonce(headerShard uin
 
 // RequestEquivalentProofByNonceForEpoch asks for equivalent proof for the provided header nonce and epoch
 func (rrh *resolverRequestHandler) RequestEquivalentProofByNonceForEpoch(headerShard uint32, headerNonce uint64, epoch uint32) {
-	key := common.GetEquivalentProofNonceShardKey(headerNonce, headerShard)
-	if !rrh.testIfRequestIsNeeded([]byte(key), uniqueEquivalentProofSuffix) {
-		return
-	}
+	go func(requestEpoch uint32) {
+		key := common.GetEquivalentProofNonceShardKey(headerNonce, headerShard)
+		if !rrh.testIfRequestIsNeeded([]byte(key), uniqueEquivalentProofSuffix) {
+			return
+		}
 
-	log.Debug("requesting equivalent proof by nonce from network",
-		"headerNonce", headerNonce,
-		"headerShard", headerShard,
-		"epoch", epoch,
-	)
+		time.Sleep(rrh.requestProofByNonceDelay)
 
-	requester, err := rrh.getEquivalentProofsRequester(headerShard)
-	if err != nil {
-		log.Error("RequestEquivalentProofByNonceForEpoch.getEquivalentProofsRequester",
-			"error", err.Error(),
+		log.Debug("requesting equivalent proof by nonce from network",
 			"headerNonce", headerNonce,
+			"headerShard", headerShard,
+			"epoch", epoch,
 		)
-		return
-	}
 
-	proofsRequester, ok := requester.(EquivalentProofsRequester)
-	if !ok {
-		log.Warn("wrong assertion type when creating equivalent proofs requester")
-		return
-	}
+		requester, err := rrh.getEquivalentProofsRequester(headerShard)
+		if err != nil {
+			log.Error("RequestEquivalentProofByNonceForEpoch.getEquivalentProofsRequester",
+				"error", err.Error(),
+				"headerNonce", headerNonce,
+			)
+			return
+		}
 
-	rrh.whiteList.Add([][]byte{[]byte(key)})
+		proofsRequester, ok := requester.(EquivalentProofsRequester)
+		if !ok {
+			log.Warn("wrong assertion type when creating equivalent proofs requester")
+			return
+		}
 
-	err = proofsRequester.RequestDataFromNonce([]byte(key), epoch)
-	if err != nil {
-		log.Debug("RequestEquivalentProofByNonceForEpoch.RequestDataFromNonce",
-			"error", err.Error(),
-			"headerNonce", headerNonce,
-			"headerShard", headerShard,
-			"epoch", epoch,
-		)
-		return
-	}
+		rrh.whiteList.Add([][]byte{[]byte(key)})
+
+		err = proofsRequester.RequestDataFromNonce([]byte(key), epoch)
+		if err != nil {
+			log.Debug("RequestEquivalentProofByNonceForEpoch.RequestDataFromNonce",
+				"error", err.Error(),
+				"headerNonce", headerNonce,
+				"headerShard", headerShard,
+				"epoch", epoch,
+			)
+			return
+		}
 
-	rrh.addRequestedItems([][]byte{[]byte(key)}, uniqueEquivalentProofSuffix)
+		rrh.addRequestedItems([][]byte{[]byte(key)}, uniqueEquivalentProofSuffix)
+	}(epoch)
 }
 
 func (rrh *resolverRequestHandler) getEquivalentProofsRequester(headerShard uint32) (dataRetriever.Requester, error) {