Merge pull request #5877 from multiversx/MX-15032

dragos-rebegea · web-flow · commit 2e55c6022d06 · 2024-09-23T17:42:39.000+03:00
MX-15032: MaxVotingDelayPeriodInEpochs
diff --git a/cmd/node/config/systemSmartContractsConfig.toml b/cmd/node/config/systemSmartContractsConfig.toml
@@ -18,6 +18,7 @@
 
 [GovernanceSystemSCConfig]
     OwnerAddress = "erd1vxy22x0fj4zv6hktmydg8vpfh6euv02cz4yg0aaws6rrad5a5awqgqky80" #should use a multisign contract instead of a wallet address
+    MaxVotingDelayPeriodInEpochs = 30
     [GovernanceSystemSCConfig.V1]
         NumNodes           = 500
         ProposalCost       = "5000000000000000000" #5 eGLD
diff --git a/config/systemSmartContractsConfig.go b/config/systemSmartContractsConfig.go
@@ -32,7 +32,7 @@ type ESDTSystemSCConfig struct {
 }
 
 // GovernanceSystemSCConfigV1 holds the initial set of values that were used to initialise the
-//  governance system smart contract at genesis time
+// governance system smart contract at genesis time
 type GovernanceSystemSCConfigV1 struct {
 	NumNodes         int64
 	ProposalCost     string
@@ -42,7 +42,7 @@ type GovernanceSystemSCConfigV1 struct {
 }
 
 // GovernanceSystemSCConfigActive defines the set of configuration values used by the governance
-//  system smart contract once it activates
+// system smart contract once it activates
 type GovernanceSystemSCConfigActive struct {
 	ProposalCost     string
 	LostProposalFee  string
@@ -53,9 +53,10 @@ type GovernanceSystemSCConfigActive struct {
 
 // GovernanceSystemSCConfig defines the set of constants to initialize the governance system smart contract
 type GovernanceSystemSCConfig struct {
-	V1           GovernanceSystemSCConfigV1
-	Active       GovernanceSystemSCConfigActive
-	OwnerAddress string
+	V1                           GovernanceSystemSCConfigV1
+	Active                       GovernanceSystemSCConfigActive
+	OwnerAddress                 string
+	MaxVotingDelayPeriodInEpochs uint32
 }
 
 // DelegationManagerSystemSCConfig defines a set of constants to initialize the delegation manager system smart contract
diff --git a/epochStart/metachain/systemSCs_test.go b/epochStart/metachain/systemSCs_test.go
@@ -1017,7 +1017,8 @@ func createFullArgumentsForSystemSCProcessing(enableEpochsConfig config.EnableEp
 					MinVetoThreshold: 0.5,
 					LostProposalFee:  "1",
 				},
-				OwnerAddress: "3132333435363738393031323334353637383930313233343536373839303234",
+				OwnerAddress:                 "3132333435363738393031323334353637383930313233343536373839303234",
+				MaxVotingDelayPeriodInEpochs: 30,
 			},
 			StakingSystemSCConfig: config.StakingSystemSCConfig{
 				GenesisNodePrice:                     "1000",
diff --git a/factory/processing/processComponents_test.go b/factory/processing/processComponents_test.go
@@ -124,7 +124,8 @@ func createMockProcessComponentsFactoryArgs() processComp.ProcessComponentsFacto
 					MinPassThreshold: 0.5,
 					MinVetoThreshold: 0.5,
 				},
-				OwnerAddress: "erd1vxy22x0fj4zv6hktmydg8vpfh6euv02cz4yg0aaws6rrad5a5awqgqky80",
+				OwnerAddress:                 "erd1vxy22x0fj4zv6hktmydg8vpfh6euv02cz4yg0aaws6rrad5a5awqgqky80",
+				MaxVotingDelayPeriodInEpochs: 30,
 			},
 			StakingSystemSCConfig: config.StakingSystemSCConfig{
 				GenesisNodePrice:                     "2500000000000000000000",
diff --git a/genesis/process/genesisBlockCreator_test.go b/genesis/process/genesisBlockCreator_test.go
@@ -137,7 +137,8 @@ func createMockArgument(
 					MinVetoThreshold: 0.5,
 					LostProposalFee:  "1",
 				},
-				OwnerAddress: "3132333435363738393031323334353637383930313233343536373839303234",
+				OwnerAddress:                 "3132333435363738393031323334353637383930313233343536373839303234",
+				MaxVotingDelayPeriodInEpochs: 30,
 			},
 			StakingSystemSCConfig: config.StakingSystemSCConfig{
 				GenesisNodePrice:                     nodePrice.Text(10),
diff --git a/integrationTests/multiShard/hardFork/hardFork_test.go b/integrationTests/multiShard/hardFork/hardFork_test.go
@@ -451,7 +451,8 @@ func hardForkImport(
 						MinVetoThreshold: 0.5,
 						LostProposalFee:  "1",
 					},
-					OwnerAddress: integrationTests.DelegationManagerConfigChangeAddress,
+					OwnerAddress:                 integrationTests.DelegationManagerConfigChangeAddress,
+					MaxVotingDelayPeriodInEpochs: 30,
 				},
 				StakingSystemSCConfig: config.StakingSystemSCConfig{
 					GenesisNodePrice:                     "1000",
diff --git a/integrationTests/testInitializer.go b/integrationTests/testInitializer.go
@@ -691,7 +691,8 @@ func CreateFullGenesisBlocks(
 				OwnerAddress:    "aaaaaa",
 			},
 			GovernanceSystemSCConfig: config.GovernanceSystemSCConfig{
-				OwnerAddress: DelegationManagerConfigChangeAddress,
+				OwnerAddress:                 DelegationManagerConfigChangeAddress,
+				MaxVotingDelayPeriodInEpochs: 30,
 				V1: config.GovernanceSystemSCConfigV1{
 					ProposalCost: "500",
 				},
@@ -808,7 +809,8 @@ func CreateGenesisMetaBlock(
 					MinVetoThreshold: 0.5,
 					LostProposalFee:  "1",
 				},
-				OwnerAddress: DelegationManagerConfigChangeAddress,
+				OwnerAddress:                 DelegationManagerConfigChangeAddress,
+				MaxVotingDelayPeriodInEpochs: 30,
 			},
 			StakingSystemSCConfig: config.StakingSystemSCConfig{
 				GenesisNodePrice:                     "1000",
diff --git a/integrationTests/testProcessorNode.go b/integrationTests/testProcessorNode.go
@@ -927,7 +927,8 @@ func (tpn *TestProcessorNode) createFullSCQueryService(gasMap map[string]map[str
 						MinVetoThreshold: 0.5,
 						LostProposalFee:  "1",
 					},
-					OwnerAddress: DelegationManagerConfigChangeAddress,
+					OwnerAddress:                 DelegationManagerConfigChangeAddress,
+					MaxVotingDelayPeriodInEpochs: 30,
 				},
 				StakingSystemSCConfig: config.StakingSystemSCConfig{
 					GenesisNodePrice:                     "1000",
@@ -1882,7 +1883,8 @@ func (tpn *TestProcessorNode) initMetaInnerProcessors(gasMap map[string]map[stri
 					MinVetoThreshold: 0.5,
 					LostProposalFee:  "1",
 				},
-				OwnerAddress: DelegationManagerConfigChangeAddress,
+				OwnerAddress:                 DelegationManagerConfigChangeAddress,
+				MaxVotingDelayPeriodInEpochs: 30,
 			},
 			StakingSystemSCConfig: config.StakingSystemSCConfig{
 				GenesisNodePrice:                     "1000",
diff --git a/integrationTests/vm/testInitializer.go b/integrationTests/vm/testInitializer.go
@@ -749,7 +749,8 @@ func createSystemSCConfig() *config.SystemSmartContractsConfig {
 				MinVetoThreshold: 0.5,
 				LostProposalFee:  "1",
 			},
-			OwnerAddress: "3132333435363738393031323334353637383930313233343536373839303234",
+			OwnerAddress:                 "3132333435363738393031323334353637383930313233343536373839303234",
+			MaxVotingDelayPeriodInEpochs: 30,
 		},
 		StakingSystemSCConfig: config.StakingSystemSCConfig{
 			GenesisNodePrice:                     "2500000000000000000000",
diff --git a/process/factory/metachain/vmContainerFactory_test.go b/process/factory/metachain/vmContainerFactory_test.go
@@ -328,7 +328,8 @@ func TestVmContainerFactory_Create(t *testing.T) {
 					MinVetoThreshold: 0.5,
 					LostProposalFee:  "1",
 				},
-				OwnerAddress: "3132333435363738393031323334353637383930313233343536373839303234",
+				OwnerAddress:                 "3132333435363738393031323334353637383930313233343536373839303234",
+				MaxVotingDelayPeriodInEpochs: 30,
 			},
 			StakingSystemSCConfig: config.StakingSystemSCConfig{
 				GenesisNodePrice:                     "1000",
diff --git a/testscommon/components/components.go b/testscommon/components/components.go
@@ -534,7 +534,8 @@ func GetProcessArgs(
 					MinVetoThreshold: 0.5,
 					LostProposalFee:  "1",
 				},
-				OwnerAddress: "erd1vxy22x0fj4zv6hktmydg8vpfh6euv02cz4yg0aaws6rrad5a5awqgqky80",
+				OwnerAddress:                 "erd1vxy22x0fj4zv6hktmydg8vpfh6euv02cz4yg0aaws6rrad5a5awqgqky80",
+				MaxVotingDelayPeriodInEpochs: 30,
 			},
 			StakingSystemSCConfig: config.StakingSystemSCConfig{
 				GenesisNodePrice:                     "2500000000000000000000",
diff --git a/vm/factory/systemSCFactory.go b/vm/factory/systemSCFactory.go
@@ -225,17 +225,18 @@ func (scf *systemSCFactory) createGovernanceContract() (vm.SystemSmartContract,
 	}
 
 	argsGovernance := systemSmartContracts.ArgsNewGovernanceContract{
-		Eei:                    scf.systemEI,
-		GasCost:                scf.gasCost,
-		GovernanceConfig:       scf.systemSCConfig.GovernanceSystemSCConfig,
-		Marshalizer:            scf.marshalizer,
-		Hasher:                 scf.hasher,
-		GovernanceSCAddress:    vm.GovernanceSCAddress,
-		DelegationMgrSCAddress: vm.DelegationManagerSCAddress,
-		ValidatorSCAddress:     vm.ValidatorSCAddress,
-		EnableEpochsHandler:    scf.enableEpochsHandler,
-		UnBondPeriodInEpochs:   scf.systemSCConfig.StakingSystemSCConfig.UnBondPeriodInEpochs,
-		OwnerAddress:           ownerAddress,
+		Eei:                          scf.systemEI,
+		GasCost:                      scf.gasCost,
+		GovernanceConfig:             scf.systemSCConfig.GovernanceSystemSCConfig,
+		Marshalizer:                  scf.marshalizer,
+		Hasher:                       scf.hasher,
+		GovernanceSCAddress:          vm.GovernanceSCAddress,
+		DelegationMgrSCAddress:       vm.DelegationManagerSCAddress,
+		ValidatorSCAddress:           vm.ValidatorSCAddress,
+		EnableEpochsHandler:          scf.enableEpochsHandler,
+		UnBondPeriodInEpochs:         scf.systemSCConfig.StakingSystemSCConfig.UnBondPeriodInEpochs,
+		MaxVotingDelayPeriodInEpochs: scf.systemSCConfig.GovernanceSystemSCConfig.MaxVotingDelayPeriodInEpochs,
+		OwnerAddress:                 ownerAddress,
 	}
 	governance, err := systemSmartContracts.NewGovernanceContract(argsGovernance)
 	return governance, err
diff --git a/vm/factory/systemSCFactory_test.go b/vm/factory/systemSCFactory_test.go
@@ -51,7 +51,8 @@ func createMockNewSystemScFactoryArgs() ArgsNewSystemSCFactory {
 					MinVetoThreshold: 0.5,
 					LostProposalFee:  "1",
 				},
-				OwnerAddress: "3132333435363738393031323334353637383930313233343536373839303234",
+				OwnerAddress:                 "3132333435363738393031323334353637383930313233343536373839303234",
+				MaxVotingDelayPeriodInEpochs: 30,
 			},
 			StakingSystemSCConfig: config.StakingSystemSCConfig{
 				GenesisNodePrice:                     "1000",
diff --git a/vm/systemSmartContracts/governance.go b/vm/systemSmartContracts/governance.go
@@ -30,33 +30,35 @@ const maxPercentage = float64(10000.0)
 
 // ArgsNewGovernanceContract defines the arguments needed for the on-chain governance contract
 type ArgsNewGovernanceContract struct {
-	Eei                    vm.SystemEI
-	GasCost                vm.GasCost
-	GovernanceConfig       config.GovernanceSystemSCConfig
-	Marshalizer            marshal.Marshalizer
-	Hasher                 hashing.Hasher
-	GovernanceSCAddress    []byte
-	DelegationMgrSCAddress []byte
-	ValidatorSCAddress     []byte
-	OwnerAddress           []byte
-	UnBondPeriodInEpochs   uint32
-	EnableEpochsHandler    common.EnableEpochsHandler
+	Eei                          vm.SystemEI
+	GasCost                      vm.GasCost
+	GovernanceConfig             config.GovernanceSystemSCConfig
+	Marshalizer                  marshal.Marshalizer
+	Hasher                       hashing.Hasher
+	GovernanceSCAddress          []byte
+	DelegationMgrSCAddress       []byte
+	ValidatorSCAddress           []byte
+	OwnerAddress                 []byte
+	UnBondPeriodInEpochs         uint32
+	MaxVotingDelayPeriodInEpochs uint32
+	EnableEpochsHandler          common.EnableEpochsHandler
 }
 
 type governanceContract struct {
-	eei                    vm.SystemEI
-	gasCost                vm.GasCost
-	baseProposalCost       *big.Int
-	ownerAddress           []byte
-	governanceSCAddress    []byte
-	delegationMgrSCAddress []byte
-	validatorSCAddress     []byte
-	marshalizer            marshal.Marshalizer
-	hasher                 hashing.Hasher
-	governanceConfig       config.GovernanceSystemSCConfig
-	unBondPeriodInEpochs   uint32
-	enableEpochsHandler    common.EnableEpochsHandler
-	mutExecution           sync.RWMutex
+	eei                          vm.SystemEI
+	gasCost                      vm.GasCost
+	baseProposalCost             *big.Int
+	ownerAddress                 []byte
+	governanceSCAddress          []byte
+	delegationMgrSCAddress       []byte
+	validatorSCAddress           []byte
+	marshalizer                  marshal.Marshalizer
+	hasher                       hashing.Hasher
+	governanceConfig             config.GovernanceSystemSCConfig
+	unBondPeriodInEpochs         uint32
+	maxVotingDelayPeriodInEpochs uint32
+	enableEpochsHandler          common.EnableEpochsHandler
+	mutExecution                 sync.RWMutex
 }
 
 // NewGovernanceContract creates a new governance smart contract
@@ -99,18 +101,19 @@ func NewGovernanceContract(args ArgsNewGovernanceContract) (*governanceContract,
 	}
 
 	g := &governanceContract{
-		eei:                    args.Eei,
-		gasCost:                args.GasCost,
-		baseProposalCost:       baseProposalCost,
-		ownerAddress:           args.OwnerAddress,
-		governanceSCAddress:    args.GovernanceSCAddress,
-		delegationMgrSCAddress: args.DelegationMgrSCAddress,
-		validatorSCAddress:     args.ValidatorSCAddress,
-		marshalizer:            args.Marshalizer,
-		hasher:                 args.Hasher,
-		governanceConfig:       args.GovernanceConfig,
-		enableEpochsHandler:    args.EnableEpochsHandler,
-		unBondPeriodInEpochs:   args.UnBondPeriodInEpochs,
+		eei:                          args.Eei,
+		gasCost:                      args.GasCost,
+		baseProposalCost:             baseProposalCost,
+		ownerAddress:                 args.OwnerAddress,
+		governanceSCAddress:          args.GovernanceSCAddress,
+		delegationMgrSCAddress:       args.DelegationMgrSCAddress,
+		validatorSCAddress:           args.ValidatorSCAddress,
+		marshalizer:                  args.Marshalizer,
+		hasher:                       args.Hasher,
+		governanceConfig:             args.GovernanceConfig,
+		enableEpochsHandler:          args.EnableEpochsHandler,
+		unBondPeriodInEpochs:         args.UnBondPeriodInEpochs,
+		maxVotingDelayPeriodInEpochs: args.MaxVotingDelayPeriodInEpochs,
 	}
 
 	return g, nil
@@ -1218,18 +1221,21 @@ func (g *governanceContract) proposalExists(reference []byte) bool {
 
 // startEndEpochFromArguments converts the nonce string arguments to uint64
 func (g *governanceContract) startEndEpochFromArguments(argStart []byte, argEnd []byte) (uint64, uint64, error) {
-	startVoteEpoch := big.NewInt(0).SetBytes(argStart)
-	endVoteEpoch := big.NewInt(0).SetBytes(argEnd)
+	startVoteEpoch := big.NewInt(0).SetBytes(argStart).Uint64()
+	endVoteEpoch := big.NewInt(0).SetBytes(argEnd).Uint64()
 
 	currentEpoch := uint64(g.eei.BlockChainHook().CurrentEpoch())
-	if currentEpoch > startVoteEpoch.Uint64() || startVoteEpoch.Uint64() > endVoteEpoch.Uint64() {
+	if currentEpoch > startVoteEpoch || startVoteEpoch > endVoteEpoch {
 		return 0, 0, vm.ErrInvalidStartEndVoteEpoch
 	}
-	if endVoteEpoch.Uint64()-startVoteEpoch.Uint64() >= uint64(g.unBondPeriodInEpochs) {
+	if endVoteEpoch-startVoteEpoch >= uint64(g.unBondPeriodInEpochs) {
+		return 0, 0, vm.ErrInvalidStartEndVoteEpoch
+	}
+	if g.enableEpochsHandler.IsFlagEnabled(common.GovernanceFixesFlag) && startVoteEpoch-currentEpoch >= uint64(g.maxVotingDelayPeriodInEpochs) {
 		return 0, 0, vm.ErrInvalidStartEndVoteEpoch
 	}
 
-	return startVoteEpoch.Uint64(), endVoteEpoch.Uint64(), nil
+	return startVoteEpoch, endVoteEpoch, nil
 }
 
 // convertV2Config converts the passed config file to the correct V2 typed GovernanceConfig
diff --git a/vm/systemSmartContracts/governance_test.go b/vm/systemSmartContracts/governance_test.go
