Merge branch 'rc/v1.7.0' into more_chainSimulator_tests_p2

cmd/node/config/config.toml

@@ -621,6 +621,7 @@
    Type = "json"
 
 [EpochStartConfig]
+    GenesisEpoch = 0
     MinRoundsBetweenEpochs = 20
     RoundsPerEpoch         = 200
     # Min and Max ShuffledOutRestartThreshold represents the minimum and maximum duration of an epoch (in percentage) after a node which

config/config.go

@@ -95,6 +95,7 @@ type EpochStartConfig struct {
 	MinNumConnectedPeersToStart                 int
 	MinNumOfPeersToConsiderBlockValid           int
 	ExtraDelayForRequestBlockInfoInMilliseconds int
+	GenesisEpoch                                uint32
 }
 
 // BlockSizeThrottleConfig will hold the configuration for adaptive block size throttle

epochStart/bootstrap/process.go

@@ -237,6 +237,7 @@ func NewEpochStartBootstrap(args ArgsEpochStartBootstrap) (*epochStartBootstrap,
 		nodeProcessingMode:         args.NodeProcessingMode,
 		nodeOperationMode:          common.NormalOperation,
 		stateStatsHandler:          args.StateStatsHandler,
+		startEpoch:                 args.GeneralConfig.EpochStartConfig.GenesisEpoch,
 	}
 
 	if epochStartProvider.prefsConfig.FullArchive {

epochStart/metachain/epochStartData.go

@@ -289,7 +289,7 @@ func (e *epochStartData) getShardDataFromEpochStartData(
 	}
 
 	epochStartIdentifier := core.EpochStartIdentifier(prevEpoch)
-	if prevEpoch == 0 {
+	if prevEpoch == e.genesisEpoch {
 		return lastMetaHash, []byte(epochStartIdentifier), nil
 	}
 

factory/processing/processComponents.go

@@ -162,6 +162,9 @@ type ProcessComponentsFactoryArgs struct {
 	StatusComponents        factory.StatusComponentsHolder
 	StatusCoreComponents    factory.StatusCoreComponentsHolder
 	TxExecutionOrderHandler common.TxExecutionOrderHandler
+
+	GenesisNonce uint64
+	GenesisRound uint64
 }
 
 type processComponentsFactory struct {
@@ -196,6 +199,9 @@ type processComponentsFactory struct {
 	statusComponents        factory.StatusComponentsHolder
 	statusCoreComponents    factory.StatusCoreComponentsHolder
 	txExecutionOrderHandler common.TxExecutionOrderHandler
+
+	genesisNonce uint64
+	genesisRound uint64
 }
 
 // NewProcessComponentsFactory will return a new instance of processComponentsFactory
@@ -232,6 +238,8 @@ func NewProcessComponentsFactory(args ProcessComponentsFactoryArgs) (*processCom
 		statusCoreComponents:    args.StatusCoreComponents,
 		flagsConfig:             args.FlagsConfig,
 		txExecutionOrderHandler: args.TxExecutionOrderHandler,
+		genesisNonce:            args.GenesisNonce,
+		genesisRound:            args.GenesisRound,
 	}, nil
 }
 
@@ -888,6 +896,9 @@ func (pcf *processComponentsFactory) generateGenesisHeadersAndApplyInitialBalanc
 		GenesisNodePrice:        genesisNodePrice,
 		GenesisString:           pcf.config.GeneralSettings.GenesisString,
 		TxExecutionOrderHandler: pcf.txExecutionOrderHandler,
+		GenesisEpoch:            pcf.config.EpochStartConfig.GenesisEpoch,
+		GenesisNonce:            pcf.genesisNonce,
+		GenesisRound:            pcf.genesisRound,
 	}
 
 	gbc, err := processGenesis.NewGenesisBlockCreator(arg)

genesis/process/argGenesisBlockCreator.go

@@ -44,7 +44,10 @@ type dataComponentsHandler interface {
 // ArgsGenesisBlockCreator holds the arguments which are needed to create a genesis block
 type ArgsGenesisBlockCreator struct {
 	GenesisTime             uint64
+	GenesisNonce            uint64
+	GenesisRound            uint64
 	StartEpochNum           uint32
+	GenesisEpoch            uint32
 	Data                    dataComponentsHandler
 	Core                    coreComponentsHandler
 	Accounts                state.AccountsAdapter

genesis/process/genesisBlockCreator.go

@@ -82,7 +82,7 @@ func getGenesisBlocksRoundNonceEpoch(arg ArgsGenesisBlockCreator) (uint64, uint6
 	if arg.HardForkConfig.AfterHardFork {
 		return arg.HardForkConfig.StartRound, arg.HardForkConfig.StartNonce, arg.HardForkConfig.StartEpoch
 	}
-	return 0, 0, 0
+	return arg.GenesisRound, arg.GenesisNonce, arg.GenesisEpoch
 }
 
 func (gbc *genesisBlockCreator) createHardForkImportHandler() error {
@@ -212,7 +212,7 @@ func checkArgumentsForBlockCreator(arg ArgsGenesisBlockCreator) error {
 }
 
 func mustDoGenesisProcess(arg ArgsGenesisBlockCreator) bool {
-	genesisEpoch := uint32(0)
+	genesisEpoch := arg.GenesisEpoch
 	if arg.HardForkConfig.AfterHardFork {
 		genesisEpoch = arg.HardForkConfig.StartEpoch
 	}

node/chainSimulator/chainSimulator.go

@@ -29,6 +29,8 @@ type ArgsChainSimulator struct {
 	MetaChainMinNodes      uint32
 	GenesisTimestamp       int64
 	InitialRound           int64
+	InitialEpoch           uint32
+	InitialNonce           uint64
 	RoundDurationInMillis  uint64
 	RoundsPerEpoch         core.OptionalUint64
 	ApiInterface           components.APIConfigurator
@@ -76,6 +78,7 @@ func (s *simulator) createChainHandlers(args ArgsChainSimulator) error {
 		MinNodesPerShard:      args.MinNodesPerShard,
 		MetaChainMinNodes:     args.MetaChainMinNodes,
 		RoundsPerEpoch:        args.RoundsPerEpoch,
+		InitialEpoch:          args.InitialEpoch,
 	})
 	if err != nil {
 		return err
@@ -133,6 +136,7 @@ func (s *simulator) createTestNode(
 		APIInterface:           args.ApiInterface,
 		BypassTxSignatureCheck: args.BypassTxSignatureCheck,
 		InitialRound:           args.InitialRound,
+		InitialNonce:           args.InitialNonce,
 		MinNodesPerShard:       args.MinNodesPerShard,
 		MinNodesMeta:           args.MetaChainMinNodes,
 	}

node/chainSimulator/chainSimulator_test.go

@@ -57,18 +57,23 @@ func TestChainSimulator_GenerateBlocksShouldWork(t *testing.T) {
 		NumOfShards:            3,
 		GenesisTimestamp:       startTime,
 		RoundDurationInMillis:  roundDurationInMillis,
-		RoundsPerEpoch:         core.OptionalUint64{},
-		ApiInterface:           api.NewNoApiInterface(),
-		MinNodesPerShard:       1,
-		MetaChainMinNodes:      1,
-		InitialRound:           200000000,
+		RoundsPerEpoch: core.OptionalUint64{
+			HasValue: true,
+			Value:    20,
+		},
+		ApiInterface:      api.NewNoApiInterface(),
+		MinNodesPerShard:  1,
+		MetaChainMinNodes: 1,
+		InitialRound:      200000000,
+		InitialEpoch:      100,
+		InitialNonce:      100,
 	})
 	require.Nil(t, err)
 	require.NotNil(t, chainSimulator)
 
 	time.Sleep(time.Second)
 
-	err = chainSimulator.GenerateBlocks(30)
+	err = chainSimulator.GenerateBlocks(50)
 	require.Nil(t, err)
 
 	err = chainSimulator.Close()

node/chainSimulator/components/manualRoundHandler.go

@@ -9,6 +9,7 @@ type manualRoundHandler struct {
 	index            int64
 	genesisTimeStamp int64
 	roundDuration    time.Duration
+	initialRound     int64
 }
 
 // NewManualRoundHandler returns a manual round handler instance
@@ -17,6 +18,7 @@ func NewManualRoundHandler(genesisTimeStamp int64, roundDuration time.Duration,
 		genesisTimeStamp: genesisTimeStamp,
 		roundDuration:    roundDuration,
 		index:            initialRound,
+		initialRound:     initialRound,
 	}
 }
 
@@ -44,7 +46,7 @@ func (handler *manualRoundHandler) TimeStamp() time.Time {
 	rounds := atomic.LoadInt64(&handler.index)
 	timeFromGenesis := handler.roundDuration * time.Duration(rounds)
 	timestamp := time.Unix(handler.genesisTimeStamp, 0).Add(timeFromGenesis)
-
+	timestamp = time.Unix(timestamp.Unix()-int64(handler.roundDuration.Seconds())*handler.initialRound, 0)
 	return timestamp
 }
 

node/chainSimulator/components/processComponents.go

@@ -49,6 +49,9 @@ type ArgsProcessComponentsHolder struct {
 	Config                   config.Config
 	EconomicsConfig          config.EconomicsConfig
 	SystemSCConfig           config.SystemSmartContractsConfig
+
+	GenesisNonce uint64
+	GenesisRound uint64
 }
 
 type processComponentsHolder struct {
@@ -203,6 +206,8 @@ func CreateProcessComponents(args ArgsProcessComponentsHolder) (*processComponen
 		HistoryRepo:             historyRepository,
 		FlagsConfig:             args.FlagsConfig,
 		TxExecutionOrderHandler: txExecutionOrderHandler,
+		GenesisNonce:            args.GenesisNonce,
+		GenesisRound:            args.GenesisRound,
 	}
 	processComponentsFactory, err := processComp.NewProcessComponentsFactory(processArgs)
 	if err != nil {

node/chainSimulator/components/testOnlyProcessingNode.go

@@ -39,6 +39,7 @@ type ArgsTestOnlyProcessingNode struct {
 	SyncedBroadcastNetwork SyncedBroadcastNetworkHandler
 
 	InitialRound           int64
+	InitialNonce           uint64
 	GasScheduleFilename    string
 	NumShards              uint32
 	ShardIDStr             string
@@ -205,6 +206,8 @@ func NewTestOnlyProcessingNode(args ArgsTestOnlyProcessingNode) (*testOnlyProces
 		ConfigurationPathsHolder: *args.Configs.ConfigurationPathsHolder,
 		NodesCoordinator:         instance.NodesCoordinator,
 		DataComponents:           instance.DataComponentsHolder,
+		GenesisNonce:             args.InitialNonce,
+		GenesisRound:             uint64(args.InitialRound),
 	})
 	if err != nil {
 		return nil, err

node/chainSimulator/configs/configs.go

@@ -47,6 +47,7 @@ type ArgsChainSimulatorConfigs struct {
 	TempDir               string
 	MinNodesPerShard      uint32
 	MetaChainMinNodes     uint32
+	InitialEpoch          uint32
 	RoundsPerEpoch        core.OptionalUint64
 }
 
@@ -117,6 +118,8 @@ func CreateChainSimulatorConfigs(args ArgsChainSimulatorConfigs) (*ArgsConfigsSi
 	configs.GeneralConfig.DbLookupExtensions.Enabled = true
 
 	configs.GeneralConfig.EpochStartConfig.ExtraDelayForRequestBlockInfoInMilliseconds = 1
+	configs.GeneralConfig.EpochStartConfig.GenesisEpoch = args.InitialEpoch
+	configs.EpochConfig.EnableEpochs.StakingV2EnableEpoch = args.InitialEpoch + 1
 
 	if args.RoundsPerEpoch.HasValue {
 		configs.GeneralConfig.EpochStartConfig.RoundsPerEpoch = int64(args.RoundsPerEpoch.Value)

node/chainSimulator/process/processor.go

@@ -149,6 +149,8 @@ func (creator *blocksCreator) getPreviousHeaderData() (nonce, round uint64, prev
 	prevHash = creator.nodeHandler.GetChainHandler().GetGenesisHeaderHash()
 	prevRandSeed = creator.nodeHandler.GetChainHandler().GetGenesisHeader().GetRandSeed()
 	round = uint64(creator.nodeHandler.GetCoreComponents().RoundHandler().Index()) - 1
+	epoch = creator.nodeHandler.GetChainHandler().GetGenesisHeader().GetEpoch()
+	nonce = creator.nodeHandler.GetChainHandler().GetGenesisHeader().GetNonce()
 
 	return
 }