fix: proposal MsgChangeRewardDenoms (#2166)

cosmos · Aug 28, 2024 · 400a8f8 · 400a8f8
1 parent 40eb3fd
commit 400a8f8
Show file tree

Hide file tree

Showing 4 changed files with 155 additions and 116 deletions.
diff --git a/proto/interchain_security/ccv/provider/v1/tx.proto b/proto/interchain_security/ccv/provider/v1/tx.proto
@@ -30,6 +30,7 @@ service Msg {
   rpc OptOut(MsgOptOut) returns (MsgOptOutResponse);
   rpc SetConsumerCommissionRate(MsgSetConsumerCommissionRate) returns (MsgSetConsumerCommissionRateResponse);
   rpc ConsumerModification(MsgConsumerModification) returns (MsgConsumerModificationResponse);
+  rpc ChangeRewardDenoms(MsgChangeRewardDenoms) returns (MsgChangeRewardDenomsResponse);
 }
 
 

diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go
@@ -2227,8 +2227,8 @@ func (tr Chain) submitChangeRewardDenomsProposal(action SubmitChangeRewardDenoms
  "messages": [
   {
    "@type": "/interchain_security.ccv.provider.v1.MsgChangeRewardDenoms",
-   "denoms_to_add": %s,
-   "denoms_to_remove": %s,
+   "denoms_to_add": ["%s"],
+   "denoms_to_remove": ["%s"],
    "authority": "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn"
   }
  ],
@@ -2239,15 +2239,15 @@ func (tr Chain) submitChangeRewardDenomsProposal(action SubmitChangeRewardDenoms
  "expedited": false
 }`
 
-	denomsToAdd := []string{action.Denom}
-	denomsToRemove := []string{"stake"}
+	denomsToAdd := action.Denom
+	denomsToRemove := "stake"
 	jsonStr := fmt.Sprintf(template,
 		denomsToAdd,
 		denomsToRemove,
 		action.Deposit)
 
 	//#nosec G204 -- bypass unsafe quoting warning (no production code)
-	proposalFile := "/consumer-addition.proposal"
+	proposalFile := "/change-reward.proposal"
 	bz, err := tr.target.ExecCommand(
 		"/bin/bash", "-c", fmt.Sprintf(`echo '%s' > %s`, jsonStr, proposalFile),
 	).CombinedOutput()

diff --git a/tests/e2e/test_driver.go b/tests/e2e/test_driver.go
@@ -221,7 +221,8 @@ func (td *DefaultDriver) runAction(action interface{}) error {
 		target.startConsumerEvidenceDetector(action, td.verbose)
 	case SubmitChangeRewardDenomsProposalAction:
 		target = td.getTargetDriver(action.Chain)
-		if semver.Compare(semver.Major(target.testConfig.providerVersion), "v5") < 0 {
+		version := target.testConfig.providerVersion
+		if semver.IsValid(version) && semver.Compare(semver.Major(version), "v5") < 0 {
 			target.submitChangeRewardDenomsLegacyProposal(action, td.verbose)
 		} else {
 			target.submitChangeRewardDenomsProposal(action, td.verbose)