Merge branch 'rc/v1.7.0' into MX-15381-add-withKeys-on-api-address

epochStart/metachain/legacySystemSCs.go

@@ -151,7 +151,8 @@ func (s *legacySystemSCProcessor) processLegacy(
 		}
 	}
 
-	if s.flagChangeMaxNodesEnabled.IsSet() {
+	// the updateMaxNodes call needs the StakingV2Flag functionality to be enabled. Otherwise, the call will error
+	if s.flagChangeMaxNodesEnabled.IsSet() && s.enableEpochsHandler.IsFlagEnabled(common.StakingV2Flag) {
 		err := s.updateMaxNodes(validatorsInfoMap, nonce)
 		if err != nil {
 			return err

errors/errors.go

@@ -595,3 +595,6 @@ var ErrInvalidNodeOperationMode = errors.New("invalid node operation mode")
 
 // ErrNilSentSignatureTracker defines the error for setting a nil SentSignatureTracker
 var ErrNilSentSignatureTracker = errors.New("nil sent signature tracker")
+
+// ErrNilEpochSystemSCProcessor defines the error for setting a nil EpochSystemSCProcessor
+var ErrNilEpochSystemSCProcessor = errors.New("nil epoch system SC processor")

factory/disabled/epochStartSystemSCProcessor.go

@@ -0,0 +1,42 @@
+package disabled
+
+import (
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/multiversx/mx-chain-go/epochStart"
+	"github.com/multiversx/mx-chain-go/state"
+)
+
+type epochStartSystemSCProcessor struct {
+}
+
+// NewDisabledEpochStartSystemSC creates a new disabled EpochStartSystemSCProcessor instance
+func NewDisabledEpochStartSystemSC() *epochStartSystemSCProcessor {
+	return &epochStartSystemSCProcessor{}
+}
+
+// ToggleUnStakeUnBond returns nil
+func (e *epochStartSystemSCProcessor) ToggleUnStakeUnBond(_ bool) error {
+	return nil
+}
+
+// ProcessSystemSmartContract returns nil
+func (e *epochStartSystemSCProcessor) ProcessSystemSmartContract(
+	_ state.ShardValidatorsInfoMapHandler,
+	_ data.HeaderHandler,
+) error {
+	return nil
+}
+
+// ProcessDelegationRewards returns nil
+func (e *epochStartSystemSCProcessor) ProcessDelegationRewards(
+	_ block.MiniBlockSlice,
+	_ epochStart.TransactionCacher,
+) error {
+	return nil
+}
+
+// IsInterfaceNil returns true if there is no value under the interface
+func (e *epochStartSystemSCProcessor) IsInterfaceNil() bool {
+	return e == nil
+}

factory/interface.go

@@ -310,6 +310,7 @@ type ProcessComponentsHolder interface {
 	AccountsParser() genesis.AccountsParser
 	ReceiptsRepository() ReceiptsRepository
 	SentSignaturesTracker() process.SentSignaturesTracker
+	EpochSystemSCProcessor() process.EpochStartSystemSCProcessor
 	IsInterfaceNil() bool
 }
 

factory/mock/processComponentsStub.go

@@ -57,6 +57,7 @@ type ProcessComponentsMock struct {
 	AccountsParserInternal               genesis.AccountsParser
 	ReceiptsRepositoryInternal           factory.ReceiptsRepository
 	SentSignaturesTrackerInternal        process.SentSignaturesTracker
+	EpochSystemSCProcessorInternal       process.EpochStartSystemSCProcessor
 }
 
 // Create -
@@ -284,6 +285,11 @@ func (pcm *ProcessComponentsMock) SentSignaturesTracker() process.SentSignatures
 	return pcm.SentSignaturesTrackerInternal
 }
 
+// EpochSystemSCProcessor -
+func (pcm *ProcessComponentsMock) EpochSystemSCProcessor() process.EpochStartSystemSCProcessor {
+	return pcm.EpochSystemSCProcessorInternal
+}
+
 // IsInterfaceNil -
 func (pcm *ProcessComponentsMock) IsInterfaceNil() bool {
 	return pcm == nil

factory/processing/blockProcessorCreator.go

@@ -50,6 +50,7 @@ import (
 type blockProcessorAndVmFactories struct {
 	blockProcessor         process.BlockProcessor
 	vmFactoryForProcessing process.VirtualMachinesContainerFactory
+	epochSystemSCProcessor process.EpochStartSystemSCProcessor
 }
 
 func (pcf *processComponentsFactory) newBlockProcessor(
@@ -453,6 +454,7 @@ func (pcf *processComponentsFactory) newShardBlockProcessor(
 	blockProcessorComponents := &blockProcessorAndVmFactories{
 		blockProcessor:         blockProcessor,
 		vmFactoryForProcessing: vmFactory,
+		epochSystemSCProcessor: factoryDisabled.NewDisabledEpochStartSystemSC(),
 	}
 
 	pcf.stakingDataProviderAPI = factoryDisabled.NewDisabledStakingDataProvider()
@@ -982,6 +984,7 @@ func (pcf *processComponentsFactory) newMetaBlockProcessor(
 	blockProcessorComponents := &blockProcessorAndVmFactories{
 		blockProcessor:         metaProcessor,
 		vmFactoryForProcessing: vmFactory,
+		epochSystemSCProcessor: epochStartSystemSCProcessor,
 	}
 
 	return blockProcessorComponents, nil

factory/processing/blockProcessorCreator_test.go

@@ -1,6 +1,7 @@
 package processing_test
 
 import (
+	"fmt"
 	"sync"
 	"testing"
 
@@ -40,7 +41,7 @@ func Test_newBlockProcessorCreatorForShard(t *testing.T) {
 	_, err = pcf.Create()
 	require.NoError(t, err)
 
-	bp, err := pcf.NewBlockProcessor(
+	bp, epochStartSCProc, err := pcf.NewBlockProcessor(
 		&testscommon.RequestHandlerStub{},
 		&processMocks.ForkDetectorStub{},
 		&mock.EpochStartTriggerStub{},
@@ -60,6 +61,7 @@ func Test_newBlockProcessorCreatorForShard(t *testing.T) {
 
 	require.NoError(t, err)
 	require.NotNil(t, bp)
+	require.Equal(t, "*disabled.epochStartSystemSCProcessor", fmt.Sprintf("%T", epochStartSCProc))
 }
 
 func Test_newBlockProcessorCreatorForMeta(t *testing.T) {
@@ -166,7 +168,7 @@ func Test_newBlockProcessorCreatorForMeta(t *testing.T) {
 	_, err = pcf.Create()
 	require.NoError(t, err)
 
-	bp, err := pcf.NewBlockProcessor(
+	bp, epochStartSCProc, err := pcf.NewBlockProcessor(
 		&testscommon.RequestHandlerStub{},
 		&processMocks.ForkDetectorStub{},
 		&mock.EpochStartTriggerStub{},
@@ -186,6 +188,7 @@ func Test_newBlockProcessorCreatorForMeta(t *testing.T) {
 
 	require.NoError(t, err)
 	require.NotNil(t, bp)
+	require.Equal(t, "*metachain.systemSCProcessor", fmt.Sprintf("%T", epochStartSCProc))
 }
 
 func createAccountAdapter(

factory/processing/export_test.go

@@ -25,7 +25,7 @@ func (pcf *processComponentsFactory) NewBlockProcessor(
 	blockProcessingCutoff cutoff.BlockProcessingCutoffHandler,
 	missingTrieNodesNotifier common.MissingTrieNodesNotifier,
 	sentSignaturesTracker process.SentSignaturesTracker,
-) (process.BlockProcessor, error) {
+) (process.BlockProcessor, process.EpochStartSystemSCProcessor, error) {
 	blockProcessorComponents, err := pcf.newBlockProcessor(
 		requestHandler,
 		forkDetector,
@@ -44,10 +44,10 @@ func (pcf *processComponentsFactory) NewBlockProcessor(
 		sentSignaturesTracker,
 	)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
-	return blockProcessorComponents.blockProcessor, nil
+	return blockProcessorComponents.blockProcessor, blockProcessorComponents.epochSystemSCProcessor, nil
 }
 
 // CreateAPITransactionEvaluator -

factory/processing/processComponents.go

@@ -131,6 +131,7 @@ type processComponents struct {
 	accountsParser                   genesis.AccountsParser
 	receiptsRepository               mainFactory.ReceiptsRepository
 	sentSignaturesTracker            process.SentSignaturesTracker
+	epochSystemSCProcessor           process.EpochStartSystemSCProcessor
 }
 
 // ProcessComponentsFactoryArgs holds the arguments needed to create a process components factory
@@ -751,6 +752,7 @@ func (pcf *processComponentsFactory) Create() (*processComponents, error) {
 		currentEpochProvider:             currentEpochProvider,
 		vmFactoryForTxSimulator:          vmFactoryForTxSimulate,
 		vmFactoryForProcessing:           blockProcessorComponents.vmFactoryForProcessing,
+		epochSystemSCProcessor:           blockProcessorComponents.epochSystemSCProcessor,
 		scheduledTxsExecutionHandler:     scheduledTxsExecutionHandler,
 		txsSender:                        txsSenderWithAccumulator,
 		hardforkTrigger:                  hardforkTrigger,

factory/processing/processComponentsHandler.go

@@ -177,6 +177,9 @@ func (m *managedProcessComponents) CheckSubcomponents() error {
 	if check.IfNil(m.processComponents.sentSignaturesTracker) {
 		return errors.ErrNilSentSignatureTracker
 	}
+	if check.IfNil(m.processComponents.epochSystemSCProcessor) {
+		return errors.ErrNilEpochSystemSCProcessor
+	}
 
 	return nil
 }
@@ -673,6 +676,18 @@ func (m *managedProcessComponents) SentSignaturesTracker() process.SentSignature
 	return m.processComponents.sentSignaturesTracker
 }
 
+// EpochSystemSCProcessor returns the epoch start system SC processor
+func (m *managedProcessComponents) EpochSystemSCProcessor() process.EpochStartSystemSCProcessor {
+	m.mutProcessComponents.RLock()
+	defer m.mutProcessComponents.RUnlock()
+
+	if m.processComponents == nil {
+		return nil
+	}
+
+	return m.processComponents.epochSystemSCProcessor
+}
+
 // IsInterfaceNil returns true if the interface is nil
 func (m *managedProcessComponents) IsInterfaceNil() bool {
 	return m == nil

factory/processing/processComponentsHandler_test.go

@@ -93,6 +93,7 @@ func TestManagedProcessComponents_Create(t *testing.T) {
 		require.True(t, check.IfNil(managedProcessComponents.FullArchivePeerShardMapper()))
 		require.True(t, check.IfNil(managedProcessComponents.FullArchiveInterceptorsContainer()))
 		require.True(t, check.IfNil(managedProcessComponents.SentSignaturesTracker()))
+		require.True(t, check.IfNil(managedProcessComponents.EpochSystemSCProcessor()))
 
 		err := managedProcessComponents.Create()
 		require.NoError(t, err)
@@ -137,6 +138,7 @@ func TestManagedProcessComponents_Create(t *testing.T) {
 		require.False(t, check.IfNil(managedProcessComponents.FullArchivePeerShardMapper()))
 		require.False(t, check.IfNil(managedProcessComponents.FullArchiveInterceptorsContainer()))
 		require.False(t, check.IfNil(managedProcessComponents.SentSignaturesTracker()))
+		require.False(t, check.IfNil(managedProcessComponents.EpochSystemSCProcessor()))
 
 		require.Equal(t, factory.ProcessComponentsName, managedProcessComponents.String())
 	})

integrationTests/chainSimulator/staking/stakingProvider/delegation_test.go

@@ -81,6 +81,13 @@ func TestChainSimulator_MakeNewContractFromValidatorData(t *testing.T) {
 			NumNodesWaitingListMeta:  3,
 			NumNodesWaitingListShard: 3,
 			AlterConfigsFunction: func(cfg *config.Configs) {
+				maxNodesChangeEnableEpoch := cfg.EpochConfig.EnableEpochs.MaxNodesChangeEnableEpoch
+				blsMultiSignerEnableEpoch := cfg.EpochConfig.EnableEpochs.BLSMultiSignerEnableEpoch
+
+				cfg.EpochConfig.EnableEpochs = config.EnableEpochs{}
+				cfg.EpochConfig.EnableEpochs.MaxNodesChangeEnableEpoch = maxNodesChangeEnableEpoch
+				cfg.EpochConfig.EnableEpochs.BLSMultiSignerEnableEpoch = blsMultiSignerEnableEpoch
+
 				cfg.EpochConfig.EnableEpochs.StakingV4Step1EnableEpoch = 100
 				cfg.EpochConfig.EnableEpochs.StakingV4Step2EnableEpoch = 101
 				cfg.EpochConfig.EnableEpochs.StakingV4Step3EnableEpoch = 102
@@ -96,6 +103,57 @@ func TestChainSimulator_MakeNewContractFromValidatorData(t *testing.T) {
 		testChainSimulatorMakeNewContractFromValidatorData(t, cs, 1)
 	})
 
+	// Test scenario done in staking 3.5 phase (staking v4 is not active)
+	// 1. Add a new validator private key in the multi key handler
+	// 2. Set the initial state for the owner and the 2 delegators
+	// 3. Do a stake transaction for the validator key and test that the new key is on queue and topup is 500
+	// 4. Execute the MakeNewContractFromValidatorData transaction and test that the key is on queue and topup is 500
+	// 5. Execute 2 delegation operations of 100 EGLD each, check the topup is 700
+	// 6. Execute 2 unDelegate operations of 100 EGLD each, check the topup is back to 500
+	t.Run("staking ph 4 is not active and all is done in epoch 0", func(t *testing.T) {
+		cs, err := chainSimulator.NewChainSimulator(chainSimulator.ArgsChainSimulator{
+			BypassTxSignatureCheck:   false,
+			TempDir:                  t.TempDir(),
+			PathToInitialConfig:      defaultPathToInitialConfig,
+			NumOfShards:              3,
+			GenesisTimestamp:         time.Now().Unix(),
+			RoundDurationInMillis:    roundDurationInMillis,
+			RoundsPerEpoch:           roundsPerEpoch,
+			ApiInterface:             api.NewNoApiInterface(),
+			MinNodesPerShard:         3,
+			MetaChainMinNodes:        3,
+			NumNodesWaitingListMeta:  3,
+			NumNodesWaitingListShard: 3,
+			AlterConfigsFunction: func(cfg *config.Configs) {
+				maxNodesChangeEnableEpoch := cfg.EpochConfig.EnableEpochs.MaxNodesChangeEnableEpoch
+				blsMultiSignerEnableEpoch := cfg.EpochConfig.EnableEpochs.BLSMultiSignerEnableEpoch
+
+				// set all activation epoch values on 0
+				cfg.EpochConfig.EnableEpochs = config.EnableEpochs{}
+				cfg.EpochConfig.EnableEpochs.MaxNodesChangeEnableEpoch = maxNodesChangeEnableEpoch
+				cfg.EpochConfig.EnableEpochs.BLSMultiSignerEnableEpoch = blsMultiSignerEnableEpoch
+
+				cfg.EpochConfig.EnableEpochs.StakingV4Step1EnableEpoch = 100
+				cfg.EpochConfig.EnableEpochs.StakingV4Step2EnableEpoch = 101
+				cfg.EpochConfig.EnableEpochs.StakingV4Step3EnableEpoch = 102
+
+				cfg.EpochConfig.EnableEpochs.MaxNodesChangeEnableEpoch[2].EpochEnable = 102
+			},
+		})
+		require.Nil(t, err)
+		require.NotNil(t, cs)
+
+		defer cs.Close()
+
+		// we need a little time to enable the VM queries on the http server
+		time.Sleep(time.Second)
+		// also, propose a couple of blocks
+		err = cs.GenerateBlocks(3)
+		require.Nil(t, err)
+
+		testChainSimulatorMakeNewContractFromValidatorData(t, cs, 0)
+	})
+
 	// Test scenario done in staking v4 phase step 1
 	// 1. Add a new validator private key in the multi key handler
 	// 2. Set the initial state for the owner and the 2 delegators

integrationTests/mock/processComponentsStub.go

@@ -60,6 +60,7 @@ type ProcessComponentsStub struct {
 	ReceiptsRepositoryInternal           factory.ReceiptsRepository
 	ESDTDataStorageHandlerForAPIInternal vmcommon.ESDTNFTStorageHandler
 	SentSignaturesTrackerInternal        process.SentSignaturesTracker
+	EpochSystemSCProcessorInternal       process.EpochStartSystemSCProcessor
 }
 
 // Create -
@@ -296,6 +297,11 @@ func (pcs *ProcessComponentsStub) SentSignaturesTracker() process.SentSignatures
 	return pcs.SentSignaturesTrackerInternal
 }
 
+// EpochSystemSCProcessor -
+func (pcs *ProcessComponentsStub) EpochSystemSCProcessor() process.EpochStartSystemSCProcessor {
+	return pcs.EpochSystemSCProcessorInternal
+}
+
 // IsInterfaceNil -
 func (pcs *ProcessComponentsStub) IsInterfaceNil() bool {
 	return pcs == nil