Merge pull request #5872 from multiversx/MX-15047

dragos-rebegea · web-flow · commit fc997c4111ef · 2024-09-24T10:42:49.000+03:00
MX-15047: add gasUsage for changeConfig
diff --git a/cmd/node/config/gasSchedules/gasScheduleV1.toml b/cmd/node/config/gasSchedules/gasScheduleV1.toml
@@ -37,6 +37,8 @@
     DelegateVote          = 1000000
     RevokeVote            = 500000
     CloseProposal         = 1000000
+    ClaimAccumulatedFees  = 1000000
+    ChangeConfig          = 50000000
     DelegationOps         = 1000000
     UnstakeTokens         = 5000000
     UnbondTokens          = 5000000
diff --git a/cmd/node/config/gasSchedules/gasScheduleV2.toml b/cmd/node/config/gasSchedules/gasScheduleV2.toml
@@ -37,6 +37,8 @@
     DelegateVote          = 1000000
     RevokeVote            = 500000
     CloseProposal         = 1000000
+    ClaimAccumulatedFees  = 1000000
+    ChangeConfig          = 50000000
     DelegationOps         = 1000000
     UnstakeTokens         = 5000000
     UnbondTokens          = 5000000
diff --git a/cmd/node/config/gasSchedules/gasScheduleV3.toml b/cmd/node/config/gasSchedules/gasScheduleV3.toml
@@ -40,6 +40,8 @@
     DelegateVote          = 50000000
     RevokeVote            = 50000000
     CloseProposal         = 50000000
+    ClaimAccumulatedFees  = 1000000
+    ChangeConfig          = 50000000
     GetAllNodeStates      = 20000000
     UnstakeTokens         = 5000000
     UnbondTokens          = 5000000
diff --git a/cmd/node/config/gasSchedules/gasScheduleV4.toml b/cmd/node/config/gasSchedules/gasScheduleV4.toml
@@ -40,6 +40,8 @@
     DelegateVote          = 50000000
     RevokeVote            = 50000000
     CloseProposal         = 50000000
+    ClaimAccumulatedFees  = 1000000
+    ChangeConfig          = 50000000
     GetAllNodeStates      = 20000000
     UnstakeTokens         = 5000000
     UnbondTokens          = 5000000
diff --git a/cmd/node/config/gasSchedules/gasScheduleV5.toml b/cmd/node/config/gasSchedules/gasScheduleV5.toml
@@ -40,6 +40,8 @@
     DelegateVote          = 50000000
     RevokeVote            = 50000000
     CloseProposal         = 50000000
+    ClaimAccumulatedFees  = 1000000
+    ChangeConfig          = 50000000
     GetAllNodeStates      = 20000000
     UnstakeTokens         = 5000000
     UnbondTokens          = 5000000
diff --git a/cmd/node/config/gasSchedules/gasScheduleV6.toml b/cmd/node/config/gasSchedules/gasScheduleV6.toml
@@ -40,6 +40,8 @@
     DelegateVote          = 50000000
     RevokeVote            = 50000000
     CloseProposal         = 50000000
+    ClaimAccumulatedFees  = 1000000
+    ChangeConfig          = 50000000
     GetAllNodeStates      = 20000000
     UnstakeTokens         = 5000000
     UnbondTokens          = 5000000
diff --git a/cmd/node/config/gasSchedules/gasScheduleV7.toml b/cmd/node/config/gasSchedules/gasScheduleV7.toml
@@ -41,6 +41,8 @@
     DelegateVote          = 50000000
     RevokeVote            = 50000000
     CloseProposal         = 50000000
+    ClaimAccumulatedFees  = 1000000
+    ChangeConfig          = 50000000
     GetAllNodeStates      = 20000000
     UnstakeTokens         = 5000000
     UnbondTokens          = 5000000
diff --git a/process/factory/metachain/vmContainerFactory_test.go b/process/factory/metachain/vmContainerFactory_test.go
@@ -424,6 +424,8 @@ func FillGasMapMetaChainSystemSCsCosts(value uint64) map[string]uint64 {
 	gasMap["DelegateVote"] = value
 	gasMap["RevokeVote"] = value
 	gasMap["CloseProposal"] = value
+	gasMap["ClaimAccumulatedFees"] = value
+	gasMap["ChangeConfig"] = value
 	gasMap["DelegationOps"] = value
 	gasMap["UnStakeTokens"] = value
 	gasMap["UnBondTokens"] = value
diff --git a/testscommon/components/components.go b/testscommon/components/components.go
@@ -820,6 +820,8 @@ func FillGasMapMetaChainSystemSCsCosts(value uint64) map[string]uint64 {
 	gasMap["DelegateVote"] = value
 	gasMap["RevokeVote"] = value
 	gasMap["CloseProposal"] = value
+	gasMap["ClaimAccumulatedFees"] = value
+	gasMap["ChangeConfig"] = value
 	gasMap["DelegationOps"] = value
 	gasMap["UnStakeTokens"] = value
 	gasMap["UnBondTokens"] = value
diff --git a/vm/gasCost.go b/vm/gasCost.go
@@ -28,6 +28,8 @@ type MetaChainSystemSCsCost struct {
 	DelegateVote          uint64
 	RevokeVote            uint64
 	CloseProposal         uint64
+	ClaimAccumulatedFees  uint64
+	ChangeConfig          uint64
 	DelegationOps         uint64
 	UnStakeTokens         uint64
 	UnBondTokens          uint64
diff --git a/vm/systemSmartContracts/defaults/gasMap.go b/vm/systemSmartContracts/defaults/gasMap.go
@@ -74,6 +74,8 @@ func FillGasMapMetaChainSystemSCsCosts(value uint64) map[string]uint64 {
 	gasMap["DelegateVote"] = value
 	gasMap["RevokeVote"] = value
 	gasMap["CloseProposal"] = value
+	gasMap["ClaimAccumulatedFees"] = value
+	gasMap["ChangeConfig"] = value
 	gasMap["DelegationOps"] = value
 	gasMap["UnStakeTokens"] = value
 	gasMap["UnBondTokens"] = value
diff --git a/vm/systemSmartContracts/governance.go b/vm/systemSmartContracts/governance.go
@@ -228,6 +228,11 @@ func (g *governanceContract) changeConfig(args *vmcommon.ContractCallInput) vmco
 		g.eei.AddReturnMessage("changeConfig needs 5 arguments")
 		return vmcommon.UserError
 	}
+	err := g.eei.UseGas(g.gasCost.MetaChainSystemSCsCost.ChangeConfig)
+	if err != nil {
+		g.eei.AddReturnMessage("not enough gas")
+		return vmcommon.OutOfGas
+	}
 
 	proposalFee, okConvert := big.NewInt(0).SetString(string(args.Arguments[0]), conversionBase)
 	if !okConvert || proposalFee.Cmp(zero) <= 0 {
@@ -747,7 +752,7 @@ func (g *governanceContract) claimAccumulatedFees(args *vmcommon.ContractCallInp
 		g.eei.AddReturnMessage("can be called only by owner")
 		return vmcommon.UserError
 	}
-	err := g.eei.UseGas(g.gasCost.MetaChainSystemSCsCost.CloseProposal)
+	err := g.eei.UseGas(g.gasCost.MetaChainSystemSCsCost.ClaimAccumulatedFees)
 	if err != nil {
 		g.eei.AddReturnMessage("not enough gas")
 		return vmcommon.OutOfGas
diff --git a/vm/systemSmartContracts/governance_test.go b/vm/systemSmartContracts/governance_test.go
@@ -381,6 +381,30 @@ func TestGovernanceContract_ChangeConfig(t *testing.T) {
 	require.Equal(t, vmcommon.Ok, retCode)
 }
 
+func TestGovernanceContract_ChangeConfigOutOfGas(t *testing.T) {
+	t.Parallel()
+
+	gsc, _, eei := createGovernanceBlockChainHookStubContextHandler()
+
+	callInputArgs := [][]byte{
+		[]byte("1"),
+		[]byte("1"),
+		[]byte("10"),
+		[]byte("10"),
+		[]byte("15"),
+	}
+	callInput := createVMInput(zero, "changeConfig", gsc.ownerAddress, vm.GovernanceSCAddress, callInputArgs)
+
+	gsc.gasCost.MetaChainSystemSCsCost.ChangeConfig = 100
+	retCode := gsc.Execute(callInput)
+	require.Equal(t, vmcommon.OutOfGas, retCode)
+	require.True(t, strings.Contains(eei.GetReturnMessage(), "not enough gas"))
+
+	gsc.gasCost.MetaChainSystemSCsCost.ChangeConfig = 0
+	retCode = gsc.Execute(callInput)
+	require.Equal(t, vmcommon.Ok, retCode)
+}
+
 func TestGovernanceContract_ChangeConfigWrongCaller(t *testing.T) {
 	t.Parallel()
 
@@ -2105,13 +2129,13 @@ func TestGovernanceContract_ClaimAccumulatedFees(t *testing.T) {
 	require.Equal(t, vmcommon.UserError, retCode)
 	require.True(t, strings.Contains(eei.GetReturnMessage(), "can be called only by owner"))
 
-	gsc.gasCost.MetaChainSystemSCsCost.CloseProposal = 100
+	gsc.gasCost.MetaChainSystemSCsCost.ClaimAccumulatedFees = 100
 	callInput.CallerAddr = gsc.ownerAddress
 	retCode = gsc.Execute(callInput)
 	require.Equal(t, vmcommon.OutOfGas, retCode)
 	require.True(t, strings.Contains(eei.GetReturnMessage(), "not enough gas"))
 
-	gsc.gasCost.MetaChainSystemSCsCost.CloseProposal = 0
+	gsc.gasCost.MetaChainSystemSCsCost.ClaimAccumulatedFees = 0
 	retCode = gsc.Execute(callInput)
 	require.Equal(t, vmcommon.Ok, retCode)
 	require.Equal(t, big.NewInt(0), eei.GetTotalSentToUser(callInput.CallerAddr))
