Message validation optimization

epochStart/bootstrap/factory/epochStartInterceptorsContainerFactory.go

@@ -6,6 +6,7 @@ import (
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/multiversx/mx-chain-core-go/data/typeConverters"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
@@ -16,6 +17,7 @@ import (
 	"github.com/multiversx/mx-chain-go/process"
 	"github.com/multiversx/mx-chain-go/process/factory/interceptorscontainer"
 	"github.com/multiversx/mx-chain-go/sharding"
+	"github.com/multiversx/mx-chain-go/storage"
 	"github.com/multiversx/mx-chain-go/storage/cache"
 	"github.com/multiversx/mx-chain-go/update"
 )
@@ -108,6 +110,7 @@ func NewEpochStartInterceptorsContainer(args ArgsEpochStartInterceptorContainer)
 		FullArchivePeerShardMapper:   fullArchivePeerShardMapper,
 		HardforkTrigger:              hardforkTrigger,
 		NodeOperationMode:            args.NodeOperationMode,
+		ProcessedMessagesCacheMap:    make(map[string]storage.Cacher),
 	}
 
 	interceptorsContainerFactory, err := interceptorscontainer.NewMetaInterceptorsContainerFactory(containerFactoryArgs)

epochStart/bootstrap/process.go

@@ -14,6 +14,8 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/data/typeConverters/uint64ByteSlice"
+	logger "github.com/multiversx/mx-chain-logger-go"
+
 	"github.com/multiversx/mx-chain-go/common"
 	disabledCommon "github.com/multiversx/mx-chain-go/common/disabled"
 	"github.com/multiversx/mx-chain-go/common/ordering"
@@ -52,7 +54,6 @@ import (
 	"github.com/multiversx/mx-chain-go/trie/storageMarker"
 	"github.com/multiversx/mx-chain-go/update"
 	updateSync "github.com/multiversx/mx-chain-go/update/sync"
-	logger "github.com/multiversx/mx-chain-logger-go"
 )
 
 var log = logger.GetOrCreate("epochStart/bootstrap")
@@ -152,6 +153,8 @@ type epochStartBootstrap struct {
 	nodeType           core.NodeType
 	startEpoch         uint32
 	shuffledOut        bool
+
+	interceptedDataCache map[string]storage.Cacher
 }
 
 type baseDataInStorage struct {
@@ -190,6 +193,7 @@ type ArgsEpochStartBootstrap struct {
 	NodeProcessingMode              common.NodeProcessingMode
 	StateStatsHandler               common.StateStatisticsHandler
 	NodesCoordinatorRegistryFactory nodesCoordinator.NodesCoordinatorRegistryFactory
+	InterceptedDataCache            map[string]storage.Cacher
 }
 
 type dataToSync struct {
@@ -242,6 +246,7 @@ func NewEpochStartBootstrap(args ArgsEpochStartBootstrap) (*epochStartBootstrap,
 		stateStatsHandler:               args.StateStatsHandler,
 		startEpoch:                      args.GeneralConfig.EpochStartConfig.GenesisEpoch,
 		nodesCoordinatorRegistryFactory: args.NodesCoordinatorRegistryFactory,
+		interceptedDataCache:            args.InterceptedDataCache,
 	}
 
 	if epochStartProvider.prefsConfig.FullArchive {
@@ -563,6 +568,7 @@ func (e *epochStartBootstrap) prepareComponentsToSyncFromNetwork() error {
 		StartInEpochConfig:      epochStartConfig,
 		HeaderIntegrityVerifier: e.headerIntegrityVerifier,
 		MetaBlockProcessor:      metaBlockProcessor,
+		InterceptedDataCache:    e.interceptedDataCache,
 	}
 	e.epochStartMetaBlockSyncer, err = NewEpochStartMetaSyncer(argsEpochStartSyncer)
 	if err != nil {

epochStart/bootstrap/process_test.go

@@ -253,6 +253,7 @@ func createMockEpochStartBootstrapArgs(
 		},
 		TrieSyncStatisticsProvider: &testscommon.SizeSyncStatisticsHandlerStub{},
 		StateStatsHandler:          disabledStatistics.NewStateStatistics(),
+		InterceptedDataCache:       make(map[string]storage.Cacher),
 	}
 }
 

epochStart/bootstrap/storageProcess.go

@@ -11,6 +11,7 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/data/endProcess"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
@@ -187,6 +188,7 @@ func (sesb *storageEpochStartBootstrap) prepareComponentsToSync() error {
 		StartInEpochConfig:      sesb.generalConfig.EpochStartConfig,
 		HeaderIntegrityVerifier: sesb.headerIntegrityVerifier,
 		MetaBlockProcessor:      metablockProcessor,
+		InterceptedDataCache:    sesb.interceptedDataCache,
 	}
 
 	sesb.epochStartMetaBlockSyncer, err = NewEpochStartMetaSyncer(argsEpochStartSyncer)

epochStart/bootstrap/storageProcess_test.go

@@ -11,6 +11,8 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/data/endProcess"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
 	"github.com/multiversx/mx-chain-go/epochStart"
@@ -23,7 +25,6 @@ import (
 	dataRetrieverMock "github.com/multiversx/mx-chain-go/testscommon/dataRetriever"
 	"github.com/multiversx/mx-chain-go/testscommon/economicsmocks"
 	"github.com/multiversx/mx-chain-go/testscommon/genesisMocks"
-	"github.com/stretchr/testify/assert"
 )
 
 func createMockStorageEpochStartBootstrapArgs(
@@ -127,6 +128,7 @@ func TestStorageEpochStartBootstrap_BootstrapMetablockNotFound(t *testing.T) {
 	}
 	args.GeneralConfig = testscommon.GetGeneralConfig()
 	args.GeneralConfig.EpochStartConfig.RoundsPerEpoch = roundsPerEpoch
+	args.InterceptedDataCache = make(map[string]storage.Cacher)
 	sesb, _ := NewStorageEpochStartBootstrap(args)
 
 	params, err := sesb.Bootstrap()

epochStart/bootstrap/syncEpochStartMeta.go

@@ -8,6 +8,7 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/hashing"
 	"github.com/multiversx/mx-chain-core-go/marshal"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/epochStart"
@@ -17,17 +18,25 @@ import (
 	"github.com/multiversx/mx-chain-go/process/interceptors"
 	interceptorsFactory "github.com/multiversx/mx-chain-go/process/interceptors/factory"
 	"github.com/multiversx/mx-chain-go/sharding"
+	"github.com/multiversx/mx-chain-go/storage"
+	"github.com/multiversx/mx-chain-go/storage/cache"
+)
+
+const (
+	cacheDefaultSpan   = 30 * time.Second
+	cacheDefaultExpiry = 30 * time.Second
 )
 
 var _ epochStart.StartOfEpochMetaSyncer = (*epochStartMetaSyncer)(nil)
 
 type epochStartMetaSyncer struct {
-	requestHandler        RequestHandler
-	messenger             Messenger
-	marshalizer           marshal.Marshalizer
-	hasher                hashing.Hasher
-	singleDataInterceptor process.Interceptor
-	metaBlockProcessor    EpochStartMetaBlockInterceptorProcessor
+	requestHandler          RequestHandler
+	messenger               Messenger
+	marshalizer             marshal.Marshalizer
+	hasher                  hashing.Hasher
+	singleDataInterceptor   process.Interceptor
+	metaBlockProcessor      EpochStartMetaBlockInterceptorProcessor
+	interceptedDataCacheMap map[string]storage.Cacher
 }
 
 // ArgsNewEpochStartMetaSyncer -
@@ -43,6 +52,7 @@ type ArgsNewEpochStartMetaSyncer struct {
 	ArgsParser              process.ArgumentsParser
 	HeaderIntegrityVerifier process.HeaderIntegrityVerifier
 	MetaBlockProcessor      EpochStartMetaBlockInterceptorProcessor
+	InterceptedDataCache    map[string]storage.Cacher
 }
 
 // NewEpochStartMetaSyncer will return a new instance of epochStartMetaSyncer
@@ -64,11 +74,12 @@ func NewEpochStartMetaSyncer(args ArgsNewEpochStartMetaSyncer) (*epochStartMetaS
 	}
 
 	e := &epochStartMetaSyncer{
-		requestHandler:     args.RequestHandler,
-		messenger:          args.Messenger,
-		marshalizer:        args.CoreComponentsHolder.InternalMarshalizer(),
-		hasher:             args.CoreComponentsHolder.Hasher(),
-		metaBlockProcessor: args.MetaBlockProcessor,
+		requestHandler:          args.RequestHandler,
+		messenger:               args.Messenger,
+		marshalizer:             args.CoreComponentsHolder.InternalMarshalizer(),
+		hasher:                  args.CoreComponentsHolder.Hasher(),
+		metaBlockProcessor:      args.MetaBlockProcessor,
+		interceptedDataCacheMap: args.InterceptedDataCache,
 	}
 
 	argsInterceptedDataFactory := interceptorsFactory.ArgInterceptedDataFactory{
@@ -89,16 +100,22 @@ func NewEpochStartMetaSyncer(args ArgsNewEpochStartMetaSyncer) (*epochStartMetaS
 		return nil, err
 	}
 
+	interceptedDataVerifier, err := e.createCacheForInterceptor(factory.MetachainBlocksTopic)
+	if err != nil {
+		return nil, err
+	}
+
 	e.singleDataInterceptor, err = interceptors.NewSingleDataInterceptor(
 		interceptors.ArgSingleDataInterceptor{
-			Topic:                factory.MetachainBlocksTopic,
-			DataFactory:          interceptedMetaHdrDataFactory,
-			Processor:            args.MetaBlockProcessor,
-			Throttler:            disabled.NewThrottler(),
-			AntifloodHandler:     disabled.NewAntiFloodHandler(),
-			WhiteListRequest:     args.WhitelistHandler,
-			CurrentPeerId:        args.Messenger.ID(),
-			PreferredPeersHolder: disabled.NewPreferredPeersHolder(),
+			Topic:                   factory.MetachainBlocksTopic,
+			DataFactory:             interceptedMetaHdrDataFactory,
+			Processor:               args.MetaBlockProcessor,
+			Throttler:               disabled.NewThrottler(),
+			AntifloodHandler:        disabled.NewAntiFloodHandler(),
+			WhiteListRequest:        args.WhitelistHandler,
+			CurrentPeerId:           args.Messenger.ID(),
+			PreferredPeersHolder:    disabled.NewPreferredPeersHolder(),
+			InterceptedDataVerifier: interceptedDataVerifier,
 		},
 	)
 	if err != nil {
@@ -152,6 +169,20 @@ func (e *epochStartMetaSyncer) initTopicForEpochStartMetaBlockInterceptor() erro
 	return nil
 }
 
+func (e *epochStartMetaSyncer) createCacheForInterceptor(topic string) (process.InterceptedDataVerifier, error) {
+	internalCache, err := cache.NewTimeCacher(cache.ArgTimeCacher{
+		DefaultSpan: cacheDefaultSpan,
+		CacheExpiry: cacheDefaultExpiry,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	e.interceptedDataCacheMap[topic] = internalCache
+	verifier := interceptors.NewInterceptedDataVerifier(internalCache)
+	return verifier, nil
+}
+
 // IsInterfaceNil returns true if underlying object is nil
 func (e *epochStartMetaSyncer) IsInterfaceNil() bool {
 	return e == nil

epochStart/bootstrap/syncEpochStartMeta_test.go

@@ -9,17 +9,19 @@ import (
 	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/epochStart"
 	"github.com/multiversx/mx-chain-go/epochStart/mock"
 	"github.com/multiversx/mx-chain-go/p2p"
+	"github.com/multiversx/mx-chain-go/storage"
 	"github.com/multiversx/mx-chain-go/testscommon"
 	"github.com/multiversx/mx-chain-go/testscommon/cryptoMocks"
 	"github.com/multiversx/mx-chain-go/testscommon/economicsmocks"
 	"github.com/multiversx/mx-chain-go/testscommon/hashingMocks"
 	"github.com/multiversx/mx-chain-go/testscommon/p2pmocks"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestNewEpochStartMetaSyncer_NilsShouldError(t *testing.T) {
@@ -161,5 +163,6 @@ func getEpochStartSyncerArgs() ArgsNewEpochStartMetaSyncer {
 		},
 		HeaderIntegrityVerifier: &mock.HeaderIntegrityVerifierStub{},
 		MetaBlockProcessor:      &mock.EpochStartMetaBlockProcessorStub{},
+		InterceptedDataCache:    make(map[string]storage.Cacher),
 	}
 }

factory/bootstrap/bootstrapComponents.go

@@ -6,6 +6,8 @@ import (
 
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/core/check"
+	logger "github.com/multiversx/mx-chain-logger-go"
+
 	nodeFactory "github.com/multiversx/mx-chain-go/cmd/node/factory"
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/config"
@@ -24,23 +26,23 @@ import (
 	storageFactory "github.com/multiversx/mx-chain-go/storage/factory"
 	"github.com/multiversx/mx-chain-go/storage/latestData"
 	"github.com/multiversx/mx-chain-go/storage/storageunit"
-	logger "github.com/multiversx/mx-chain-logger-go"
 )
 
 var log = logger.GetOrCreate("factory")
 
 // BootstrapComponentsFactoryArgs holds the arguments needed to create a bootstrap components factory
 type BootstrapComponentsFactoryArgs struct {
-	Config               config.Config
-	RoundConfig          config.RoundConfig
-	PrefConfig           config.Preferences
-	ImportDbConfig       config.ImportDbConfig
-	FlagsConfig          config.ContextFlagsConfig
-	WorkingDir           string
-	CoreComponents       factory.CoreComponentsHolder
-	CryptoComponents     factory.CryptoComponentsHolder
-	NetworkComponents    factory.NetworkComponentsHolder
-	StatusCoreComponents factory.StatusCoreComponentsHolder
+	Config                  config.Config
+	RoundConfig             config.RoundConfig
+	PrefConfig              config.Preferences
+	ImportDbConfig          config.ImportDbConfig
+	FlagsConfig             config.ContextFlagsConfig
+	WorkingDir              string
+	CoreComponents          factory.CoreComponentsHolder
+	CryptoComponents        factory.CryptoComponentsHolder
+	NetworkComponents       factory.NetworkComponentsHolder
+	StatusCoreComponents    factory.StatusCoreComponentsHolder
+	InterceptedDataCacheMap map[string]storage.Cacher
 }
 
 type bootstrapComponentsFactory struct {