Merge pull request #5988 from multiversx/fix-genesis-flags

Fix genesis flags

factory/processing/processComponents.go

@@ -240,6 +240,7 @@ func NewProcessComponentsFactory(args ProcessComponentsFactoryArgs) (*processCom
 		txExecutionOrderHandler: args.TxExecutionOrderHandler,
 		genesisNonce:            args.GenesisNonce,
 		genesisRound:            args.GenesisRound,
+		roundConfig:             args.RoundConfig,
 	}, nil
 }
 
@@ -889,8 +890,9 @@ func (pcf *processComponentsFactory) generateGenesisHeadersAndApplyInitialBalanc
 		HardForkConfig:          pcf.config.Hardfork,
 		TrieStorageManagers:     pcf.state.TrieStorageManagers(),
 		SystemSCConfig:          *pcf.systemSCConfig,
-		RoundConfig:             &pcf.roundConfig,
-		EpochConfig:             &pcf.epochConfig,
+		RoundConfig:             pcf.roundConfig,
+		EpochConfig:             pcf.epochConfig,
+		HeaderVersionConfigs:    pcf.config.Versions,
 		BlockSignKeyGen:         pcf.crypto.BlockSignKeyGen(),
 		HistoryRepository:       pcf.historyRepo,
 		GenesisNodePrice:        genesisNodePrice,

factory/processing/processComponents_test.go

@@ -81,6 +81,7 @@ func createMockProcessComponentsFactoryArgs() processComp.ProcessComponentsFacto
 	args := processComp.ProcessComponentsFactoryArgs{
 		Config:         testscommon.GetGeneralConfig(),
 		EpochConfig:    config.EpochConfig{},
+		RoundConfig:    testscommon.GetDefaultRoundsConfig(),
 		PrefConfigs:    config.Preferences{},
 		ImportDBConfig: config.ImportDbConfig{},
 		FlagsConfig: config.ContextFlagsConfig{

genesis/interface.go

@@ -84,7 +84,7 @@ type InitialSmartContractHandler interface {
 }
 
 // InitialSmartContractParser contains the parsed genesis initial smart contracts
-//json file and has some functionality regarding processed data
+// json file and has some functionality regarding processed data
 type InitialSmartContractParser interface {
 	InitialSmartContractsSplitOnOwnersShards(shardCoordinator sharding.Coordinator) (map[uint32][]InitialSmartContractHandler, error)
 	GetDeployedSCAddresses(scType string) (map[string]struct{}, error)
@@ -115,3 +115,9 @@ type DeployProcessor interface {
 	Deploy(sc InitialSmartContractHandler) ([][]byte, error)
 	IsInterfaceNil() bool
 }
+
+// VersionedHeaderFactory creates versioned headers
+type VersionedHeaderFactory interface {
+	Create(epoch uint32) data.HeaderHandler
+	IsInterfaceNil() bool
+}

genesis/process/argGenesisBlockCreator.go

@@ -63,15 +63,18 @@ type ArgsGenesisBlockCreator struct {
 	HardForkConfig          config.HardforkConfig
 	TrieStorageManagers     map[string]common.StorageManager
 	SystemSCConfig          config.SystemSmartContractsConfig
-	RoundConfig             *config.RoundConfig
-	EpochConfig             *config.EpochConfig
+	RoundConfig             config.RoundConfig
+	EpochConfig             config.EpochConfig
+	HeaderVersionConfigs    config.VersionsConfig
 	WorkingDir              string
 	BlockSignKeyGen         crypto.KeyGenerator
 	HistoryRepository       dblookupext.HistoryRepository
 	TxExecutionOrderHandler common.TxExecutionOrderHandler
 
 	GenesisNodePrice *big.Int
 	GenesisString    string
+
 	// created components
-	importHandler update.ImportHandler
+	importHandler          update.ImportHandler
+	versionedHeaderFactory genesis.VersionedHeaderFactory
 }

genesis/process/genesisBlockCreator.go

@@ -16,6 +16,7 @@ import (
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
 	"github.com/multiversx/mx-chain-go/dataRetriever/blockchain"
+	factoryBlock "github.com/multiversx/mx-chain-go/factory/block"
 	"github.com/multiversx/mx-chain-go/genesis"
 	"github.com/multiversx/mx-chain-go/genesis/process/disabled"
 	"github.com/multiversx/mx-chain-go/genesis/process/intermediate"
@@ -195,12 +196,6 @@ func checkArgumentsForBlockCreator(arg ArgsGenesisBlockCreator) error {
 	if arg.TrieStorageManagers == nil {
 		return genesis.ErrNilTrieStorageManager
 	}
-	if arg.EpochConfig == nil {
-		return genesis.ErrNilEpochConfig
-	}
-	if arg.RoundConfig == nil {
-		return genesis.ErrNilRoundConfig
-	}
 	if check.IfNil(arg.HistoryRepository) {
 		return process.ErrNilHistoryRepository
 	}
@@ -225,7 +220,7 @@ func mustDoGenesisProcess(arg ArgsGenesisBlockCreator) bool {
 }
 
 func (gbc *genesisBlockCreator) createEmptyGenesisBlocks() (map[uint32]data.HeaderHandler, error) {
-	err := gbc.computeDNSAddresses(createGenesisConfig())
+	err := gbc.computeDNSAddresses(createGenesisConfig(gbc.arg.EpochConfig.EnableEpochs))
 	if err != nil {
 		return nil, err
 	}
@@ -486,12 +481,17 @@ func (gbc *genesisBlockCreator) getNewArgForShard(shardID uint32) (ArgsGenesisBl
 	var err error
 
 	isCurrentShard := shardID == gbc.arg.ShardCoordinator.SelfId()
+	newArgument := gbc.arg // copy the arguments
+	newArgument.versionedHeaderFactory, err = gbc.createVersionedHeaderFactory()
+	if err != nil {
+		return ArgsGenesisBlockCreator{}, fmt.Errorf("'%w' while generating a VersionedHeaderFactory instance for shard %d",
+			err, shardID)
+	}
+
 	if isCurrentShard {
-		newArgument := gbc.arg // copy the arguments
 		newArgument.Data = newArgument.Data.Clone().(dataComponentsHandler)
 		return newArgument, nil
 	}
-	newArgument := gbc.arg // copy the arguments
 
 	argsAccCreator := factoryState.ArgsAccountCreator{
 		Hasher:              newArgument.Core.Hasher(),
@@ -530,6 +530,25 @@ func (gbc *genesisBlockCreator) getNewArgForShard(shardID uint32) (ArgsGenesisBl
 	return newArgument, err
 }
 
+func (gbc *genesisBlockCreator) createVersionedHeaderFactory() (genesis.VersionedHeaderFactory, error) {
+	cacheConfig := factory.GetCacherFromConfig(gbc.arg.HeaderVersionConfigs.Cache)
+	cache, err := storageunit.NewCache(cacheConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	headerVersionHandler, err := factoryBlock.NewHeaderVersionHandler(
+		gbc.arg.HeaderVersionConfigs.VersionsByEpochs,
+		gbc.arg.HeaderVersionConfigs.DefaultVersion,
+		cache,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	return factoryBlock.NewShardHeaderFactory(headerVersionHandler)
+}
+
 func (gbc *genesisBlockCreator) saveGenesisBlock(header data.HeaderHandler) error {
 	blockBuff, err := gbc.arg.Core.InternalMarshalizer().Marshal(header)
 	if err != nil {

genesis/process/genesisBlockCreator_test.go

@@ -13,6 +13,8 @@ import (
 	"testing"
 
 	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
@@ -165,23 +167,22 @@ func createMockArgument(
 		TrieStorageManagers: trieStorageManagers,
 		BlockSignKeyGen:     &mock.KeyGenMock{},
 		GenesisNodePrice:    nodePrice,
-		EpochConfig: &config.EpochConfig{
+		EpochConfig: config.EpochConfig{
 			EnableEpochs: config.EnableEpochs{
-				BuiltInFunctionsEnableEpoch:    0,
-				SCDeployEnableEpoch:            0,
-				RelayedTransactionsEnableEpoch: 0,
-				PenalizedTooMuchGasEnableEpoch: 0,
-			},
-		},
-		RoundConfig: &config.RoundConfig{
-			RoundActivations: map[string]config.ActivationRoundByName{
-				"DisableAsyncCallV1": {
-					Round: "18446744073709551615",
-				},
+				SCDeployEnableEpoch:               unreachableEpoch,
+				CleanUpInformativeSCRsEnableEpoch: unreachableEpoch,
+				SCProcessorV2EnableEpoch:          unreachableEpoch,
 			},
 		},
+		RoundConfig:             testscommon.GetDefaultRoundsConfig(),
+		HeaderVersionConfigs:    testscommon.GetDefaultHeaderVersionConfig(),
 		HistoryRepository:       &dblookupext.HistoryRepositoryStub{},
 		TxExecutionOrderHandler: &commonMocks.TxExecutionOrderHandlerStub{},
+		versionedHeaderFactory: &testscommon.VersionedHeaderFactoryStub{
+			CreateCalled: func(epoch uint32) data.HeaderHandler {
+				return &block.Header{}
+			},
+		},
 	}
 
 	arg.ShardCoordinator = &mock.ShardCoordinatorMock{
@@ -427,16 +428,6 @@ func TestNewGenesisBlockCreator(t *testing.T) {
 		require.True(t, errors.Is(err, genesis.ErrNilTrieStorageManager))
 		require.Nil(t, gbc)
 	})
-	t.Run("nil EpochConfig should error", func(t *testing.T) {
-		t.Parallel()
-
-		arg := createMockArgument(t, "testdata/genesisTest1.json", &mock.InitialNodesHandlerStub{}, big.NewInt(22000))
-		arg.EpochConfig = nil
-
-		gbc, err := NewGenesisBlockCreator(arg)
-		require.True(t, errors.Is(err, genesis.ErrNilEpochConfig))
-		require.Nil(t, gbc)
-	})
 	t.Run("invalid GenesisNodePrice should error", func(t *testing.T) {
 		t.Parallel()
 

genesis/process/metaGenesisBlockCreator.go

@@ -48,9 +48,6 @@ import (
 	"github.com/multiversx/mx-chain-vm-common-go/parsers"
 )
 
-const unreachableEpoch = ^uint32(0)
-const unreachableRound = ^uint64(0)
-
 // CreateMetaGenesisBlock will create a metachain genesis block
 func CreateMetaGenesisBlock(
 	arg ArgsGenesisBlockCreator,
@@ -70,7 +67,11 @@ func CreateMetaGenesisBlock(
 		DeployInitialScTxs: make([]data.TransactionHandler, 0),
 	}
 
-	processors, err := createProcessorsForMetaGenesisBlock(arg, createGenesisConfig(), createGenesisRoundConfig())
+	processors, err := createProcessorsForMetaGenesisBlock(
+		arg,
+		createGenesisConfig(arg.EpochConfig.EnableEpochs),
+		createGenesisRoundConfig(arg.RoundConfig),
+	)
 	if err != nil {
 		return nil, nil, nil, err
 	}
@@ -295,7 +296,7 @@ func saveGenesisMetaToStorage(
 	return nil
 }
 
-func createProcessorsForMetaGenesisBlock(arg ArgsGenesisBlockCreator, enableEpochsConfig config.EnableEpochs, roundConfig *config.RoundConfig) (*genesisProcessors, error) {
+func createProcessorsForMetaGenesisBlock(arg ArgsGenesisBlockCreator, enableEpochsConfig config.EnableEpochs, roundConfig config.RoundConfig) (*genesisProcessors, error) {
 	epochNotifier := forking.NewGenericEpochNotifier()
 	temporaryMetaHeader := &block.MetaBlock{
 		Epoch:     arg.StartEpochNum,
@@ -308,7 +309,7 @@ func createProcessorsForMetaGenesisBlock(arg ArgsGenesisBlockCreator, enableEpoc
 	epochNotifier.CheckEpoch(temporaryMetaHeader)
 
 	roundNotifier := forking.NewGenericRoundNotifier()
-	enableRoundsHandler, err := enablers.NewEnableRoundsHandler(*roundConfig, roundNotifier)
+	enableRoundsHandler, err := enablers.NewEnableRoundsHandler(roundConfig, roundNotifier)
 	if err != nil {
 		return nil, err
 	}