From 706fb44ed0db523a56d5bed3013ed366669fdbbd Mon Sep 17 00:00:00 2001
From: bernd-m <43466467+bermuell@users.noreply.github.com>
Date: Wed, 24 Jul 2024 15:21:18 +0200
Subject: [PATCH 1/5] test: fix e2e tests broken in various ways (#2078)

* Fix failing compatiblity tests

* Improve identification of closest ICS version for a git reference

* fix e2e tests

* Fix e2e query command for rewards

* Update tests/e2e/config.go

Co-authored-by: Simon Noetzlin <simon.ntz@gmail.com>

---------

Co-authored-by: Simon Noetzlin <simon.ntz@gmail.com>
---
 .gitignore                       |  1 +
 tests/e2e/actions.go             | 24 ++++++++++++------------
 tests/e2e/config.go              | 13 +++++++++++--
 tests/e2e/state.go               |  7 ++++---
 tests/e2e/steps_compatibility.go |  3 ++-
 tests/e2e/testlib/utils.go       |  9 +--------
 tests/e2e/v4/state.go            |  2 +-
 7 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index e77a988583..d93ff09e5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ vendor/
 build/
 .vscode
 .idea
+__debug_*
 
 # docusaurus versioned docs created during build
 docs/versions.json
diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go
index b7207d72c8..6c841a48ca 100644
--- a/tests/e2e/actions.go
+++ b/tests/e2e/actions.go
@@ -1000,10 +1000,10 @@ func (tr Chain) addChainToGorelayer(
 	}
 
 	addChainCommand := tr.target.ExecCommand("rly", "chains", "add", "--file", chainConfigFileName, string(ChainId))
-	e2e.ExecuteCommand(addChainCommand, "add chain")
+	e2e.ExecuteCommand(addChainCommand, "add chain", verbose)
 
 	keyRestoreCommand := tr.target.ExecCommand("rly", "keys", "restore", string(ChainId), "default", tr.testConfig.validatorConfigs[action.Validator].Mnemonic)
-	e2e.ExecuteCommand(keyRestoreCommand, "restore keys")
+	e2e.ExecuteCommand(keyRestoreCommand, "restore keys", verbose)
 }
 
 func (tr Chain) addChainToHermes(
@@ -1109,7 +1109,7 @@ func (tr Chain) addIbcConnectionGorelayer(
 
 	//#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments.
 	pathConfigCommand := tr.target.ExecCommand("bash", "-c", bashCommand)
-	e2e.ExecuteCommand(pathConfigCommand, "add path config")
+	e2e.ExecuteCommand(pathConfigCommand, "add path config", verbose)
 
 	//#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments.
 	newPathCommand := tr.target.ExecCommand("rly",
@@ -1120,12 +1120,12 @@ func (tr Chain) addIbcConnectionGorelayer(
 		"--file", pathConfigFileName,
 	)
 
-	e2e.ExecuteCommand(newPathCommand, "new path")
+	e2e.ExecuteCommand(newPathCommand, "new path", verbose)
 
 	//#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments.
 	newClientsCommand := tr.target.ExecCommand("rly", "transact", "clients", pathName)
 
-	e2e.ExecuteCommand(newClientsCommand, "new clients")
+	e2e.ExecuteCommand(newClientsCommand, "new clients", verbose)
 
 	tr.waitBlocks(action.ChainA, 1, 10*time.Second)
 	tr.waitBlocks(action.ChainB, 1, 10*time.Second)
@@ -1133,7 +1133,7 @@ func (tr Chain) addIbcConnectionGorelayer(
 	//#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments.
 	newConnectionCommand := tr.target.ExecCommand("rly", "transact", "connection", pathName)
 
-	e2e.ExecuteCommand(newConnectionCommand, "new connection")
+	e2e.ExecuteCommand(newConnectionCommand, "new connection", verbose)
 
 	tr.waitBlocks(action.ChainA, 1, 10*time.Second)
 	tr.waitBlocks(action.ChainB, 1, 10*time.Second)
@@ -1300,7 +1300,7 @@ func (tr Chain) addIbcChannelGorelayer(
 		"--order", action.Order,
 		"--debug",
 	)
-	e2e.ExecuteCommand(cmd, "addChannel")
+	e2e.ExecuteCommand(cmd, "addChannel", verbose)
 }
 
 func (tr Chain) addIbcChannelHermes(
@@ -1373,8 +1373,7 @@ func (tr Chain) transferChannelComplete(
 		log.Fatal("transferChannelComplete is not implemented for rly")
 	}
 
-	chanOpenTryCmd := tr.target.ExecCommand("hermes",
-		"tx", "chan-open-try",
+	chanOpenTryCmd := tr.target.ExecCommand("hermes", "tx", "chan-open-try",
 		"--dst-chain", string(tr.testConfig.chainConfigs[action.ChainB].ChainId),
 		"--src-chain", string(tr.testConfig.chainConfigs[action.ChainA].ChainId),
 		"--dst-connection", "connection-"+fmt.Sprint(action.ConnectionA),
@@ -1382,7 +1381,8 @@ func (tr Chain) transferChannelComplete(
 		"--src-port", action.PortA,
 		"--src-channel", "channel-"+fmt.Sprint(action.ChannelA),
 	)
-	e2e.ExecuteCommand(chanOpenTryCmd, "transferChanOpenTry")
+
+	e2e.ExecuteCommand(chanOpenTryCmd, "transferChanOpenTry", verbose)
 
 	chanOpenAckCmd := tr.target.ExecCommand("hermes",
 		"tx", "chan-open-ack",
@@ -1395,7 +1395,7 @@ func (tr Chain) transferChannelComplete(
 		"--src-channel", "channel-"+fmt.Sprint(action.ChannelB),
 	)
 
-	e2e.ExecuteCommand(chanOpenAckCmd, "transferChanOpenAck")
+	e2e.ExecuteCommand(chanOpenAckCmd, "transferChanOpenAck", verbose)
 
 	chanOpenConfirmCmd := tr.target.ExecCommand("hermes",
 		"tx", "chan-open-confirm",
@@ -1407,7 +1407,7 @@ func (tr Chain) transferChannelComplete(
 		"--dst-channel", "channel-"+fmt.Sprint(action.ChannelB),
 		"--src-channel", "channel-"+fmt.Sprint(action.ChannelA),
 	)
-	e2e.ExecuteCommand(chanOpenConfirmCmd, "transferChanOpenConfirm")
+	e2e.ExecuteCommand(chanOpenConfirmCmd, "transferChanOpenConfirm", verbose)
 }
 
 type RelayPacketsAction struct {
diff --git a/tests/e2e/config.go b/tests/e2e/config.go
index 40a1cfc4c5..d622042fbc 100644
--- a/tests/e2e/config.go
+++ b/tests/e2e/config.go
@@ -128,15 +128,24 @@ func (tr *TestConfig) Initialize() {
 // Note: if no matching version is found an empty string is returned
 func getIcsVersion(reference string) string {
 	icsVersion := ""
-	if reference == "" {
+
+	if reference == "" || reference == VLatest {
 		return icsVersion
 	}
+
 	if semver.IsValid(reference) {
 		// remove build suffix
 		return semver.Canonical(reference)
 	}
 
-	for _, tag := range []string{"v2.0.0", "v2.4.0", "v2.4.0-lsm", "v3.1.0", "v3.2.0", "v3.3.0", "v4.0.0", "v4.1.1", "v4.1.1-lsm"} {
+	// List of all tags matching vX.Y.Z or vX.Y.Z-lsm in ascending order
+	cmd := exec.Command("git", "tag", "-l", "--sort", "v:refname", "v*.?", "v*.?-lsm", "v*.??", "v*.??-lsm")
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		panic(fmt.Sprintf("Error getting sorted tag list from git: %s", err.Error()))
+	}
+	icsVersions := strings.Split(string(out), "\n")
+	for _, tag := range icsVersions {
 		//#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments
 		cmd := exec.Command("git", "merge-base", "--is-ancestor", reference, tag)
 		out, err := cmd.CombinedOutput()
diff --git a/tests/e2e/state.go b/tests/e2e/state.go
index b9618a3964..118f0019e1 100644
--- a/tests/e2e/state.go
+++ b/tests/e2e/state.go
@@ -295,7 +295,7 @@ func (tr Chain) curlJsonRPCRequest(method, params, address string) {
 	cmd := tr.target.ExecCommand("bash", "-c", fmt.Sprintf(cmd_template, method, params, address))
 
 	verbosity := false
-	e2e.ExecuteCommandWithVerbosity(cmd, "curlJsonRPCRequest", verbosity)
+	e2e.ExecuteCommand(cmd, "curlJsonRPCRequest", verbosity)
 }
 
 func uintPtr(i uint) *uint {
@@ -357,8 +357,8 @@ func (tr Commands) GetReward(chain ChainID, validator ValidatorID, blockHeight u
 
 	binaryName := tr.chainConfigs[chain].BinaryName
 	cmd := tr.target.ExecCommand(binaryName,
-		"query", "distribution", "delegation-total-rewards",
-		"--delegator-address", delAddresss,
+		"query", "distribution", "rewards",
+		delAddresss,
 		`--height`, fmt.Sprint(blockHeight),
 		`--node`, tr.GetQueryNode(chain),
 		`-o`, `json`,
@@ -367,6 +367,7 @@ func (tr Commands) GetReward(chain ChainID, validator ValidatorID, blockHeight u
 	bz, err := cmd.CombinedOutput()
 
 	if err != nil {
+		log.Println("running cmd: ", cmd)
 		log.Fatal("failed getting rewards: ", err, "\n", string(bz))
 	}
 
diff --git a/tests/e2e/steps_compatibility.go b/tests/e2e/steps_compatibility.go
index dfcf14cd58..ab6e9dbc47 100644
--- a/tests/e2e/steps_compatibility.go
+++ b/tests/e2e/steps_compatibility.go
@@ -8,6 +8,7 @@ import (
 
 	gov "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
 )
 
 func compstepStartProviderChain() []Step {
@@ -98,7 +99,7 @@ func compstepsStartConsumerChain(consumerName string, proposalIndex, chainIndex
 				ConsumerPubkey:  getDefaultValidators()[ValidatorID("carol")].ConsumerValPubKey,
 				ReconfigureNode: false,
 				ExpectError:     true,
-				ExpectedError:   "a validator has assigned the consumer key already: consumer key is already in use by a validator",
+				ExpectedError:   providertypes.ErrConsumerKeyInUse.Error(),
 			},
 			State: State{
 				ChainID(consumerName): ChainState{
diff --git a/tests/e2e/testlib/utils.go b/tests/e2e/testlib/utils.go
index 8b68c25947..08f410269f 100644
--- a/tests/e2e/testlib/utils.go
+++ b/tests/e2e/testlib/utils.go
@@ -7,9 +7,7 @@ import (
 	"os/exec"
 )
 
-var verbose *bool //TODO: remove hack
-
-func ExecuteCommandWithVerbosity(cmd *exec.Cmd, cmdName string, verbose bool) {
+func ExecuteCommand(cmd *exec.Cmd, cmdName string, verbose bool) {
 	if verbose {
 		fmt.Println(cmdName+" cmd:", cmd.String())
 	}
@@ -36,8 +34,3 @@ func ExecuteCommandWithVerbosity(cmd *exec.Cmd, cmdName string, verbose bool) {
 		log.Fatal(err)
 	}
 }
-
-// Executes a command with verbosity specified by CLI flag
-func ExecuteCommand(cmd *exec.Cmd, cmdName string) {
-	ExecuteCommandWithVerbosity(cmd, cmdName, *verbose)
-}
diff --git a/tests/e2e/v4/state.go b/tests/e2e/v4/state.go
index 70ca8afe7c..5bf9066a1e 100644
--- a/tests/e2e/v4/state.go
+++ b/tests/e2e/v4/state.go
@@ -538,7 +538,7 @@ func (tr Commands) curlJsonRPCRequest(method, params, address string) {
 	cmd := tr.Target.ExecCommand("bash", "-c", fmt.Sprintf(cmd_template, method, params, address))
 
 	verbosity := false
-	e2e.ExecuteCommandWithVerbosity(cmd, "curlJsonRPCRequest", verbosity)
+	e2e.ExecuteCommand(cmd, "curlJsonRPCRequest", verbosity)
 }
 
 // GetClientFrozenHeight returns the frozen height for a client with the given client ID

From 67b0b081a7be814c571ea80d8c196f48c8311a4a Mon Sep 17 00:00:00 2001
From: MSalopek <matija.salopek994@gmail.com>
Date: Wed, 24 Jul 2024 16:00:30 +0200
Subject: [PATCH 2/5] chore: update gosec rules and resolve errs (#2090)

---
 .github/workflows/gosec.yml            |  2 +-
 x/ccv/consumer/module.go               |  5 +++-
 x/ccv/democracy/distribution/module.go |  4 +--
 x/ccv/democracy/governance/module.go   | 36 ++++++++++++++++++++++----
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml
index 90f1379eb1..6e23df8031 100644
--- a/.github/workflows/gosec.yml
+++ b/.github/workflows/gosec.yml
@@ -28,4 +28,4 @@ jobs:
       - name: Run Gosec Security Scanner
         uses: securego/gosec@master
         with:
-          args: -exclude-dir=tests ./... -exclude-generated ./...
+          args: -exclude-dir=tests -exclude-dir=app -exclude-generated ./...
diff --git a/x/ccv/consumer/module.go b/x/ccv/consumer/module.go
index a175f2e450..a162653abd 100644
--- a/x/ccv/consumer/module.go
+++ b/x/ccv/consumer/module.go
@@ -172,7 +172,10 @@ func (am AppModule) BeginBlock(goCtx context.Context) error {
 	am.keeper.SetHeightValsetUpdateID(ctx, blockHeight+1, vID)
 	am.keeper.Logger(ctx).Debug("block height was mapped to vscID", "height", blockHeight+1, "vscID", vID)
 
-	am.keeper.TrackHistoricalInfo(ctx)
+	err := am.keeper.TrackHistoricalInfo(ctx)
+	if err != nil {
+		am.keeper.Logger(ctx).Warn("failed to track historical info", "error", err)
+	}
 	return nil
 }
 
diff --git a/x/ccv/democracy/distribution/module.go b/x/ccv/democracy/distribution/module.go
index 310e542b6a..95d1cef6cd 100644
--- a/x/ccv/democracy/distribution/module.go
+++ b/x/ccv/democracy/distribution/module.go
@@ -127,12 +127,12 @@ func (am AppModule) AllocateTokens(
 	representativesFraction := math.LegacyOneDec().Sub(communityTax)
 
 	// allocate tokens proportionally to representatives voting power
-	vs.IterateBondedValidatorsByPower(ctx, func(_ int64, validator stakingtypes.ValidatorI) bool {
+	_ = vs.IterateBondedValidatorsByPower(ctx, func(_ int64, validator stakingtypes.ValidatorI) bool {
 		// we get this validator's percentage of the total power by dividing their tokens by the total bonded tokens
 		powerFraction := math.LegacyNewDecFromInt(validator.GetTokens()).QuoTruncate(math.LegacyNewDecFromInt(totalBondedTokens))
 		// we truncate here again, which means that the reward will be slightly lower than it should be
 		reward := feesCollected.MulDecTruncate(representativesFraction).MulDecTruncate(powerFraction)
-		am.keeper.AllocateTokensToValidator(ctx, validator, reward)
+		_ = am.keeper.AllocateTokensToValidator(ctx, validator, reward)
 		remaining = remaining.Sub(reward)
 
 		return false
diff --git a/x/ccv/democracy/governance/module.go b/x/ccv/democracy/governance/module.go
index c4bf930066..3ccc00c024 100644
--- a/x/ccv/democracy/governance/module.go
+++ b/x/ccv/democracy/governance/module.go
@@ -113,14 +113,41 @@ func deleteForbiddenProposal(ctx sdk.Context, am AppModule, proposal govv1.Propo
 		return
 	}
 
+	logger := am.keeper.Logger(ctx)
+
 	// delete the votes related to the proposal calling Tally
 	// Tally's return result won't be used in decision if the tokens will be burned or refunded (they are always refunded), but
 	// this function needs to be called to delete the votes related to the given proposal, since the deleteVote function is
 	// private and cannot be called directly from the overridden app module
-	am.keeper.Tally(ctx, proposal)
+	_, _, _, err := am.keeper.Tally(ctx, proposal)
+	if err != nil {
+		logger.Warn(
+			"failed to tally disallowed proposal",
+			"proposal", proposal.Id,
+			"title", proposal.GetTitle(),
+			"total_deposit", proposal.TotalDeposit)
+		return
+	}
 
-	am.keeper.DeleteProposal(ctx, proposal.Id)
-	am.keeper.RefundAndDeleteDeposits(ctx, proposal.Id)
+	err = am.keeper.DeleteProposal(ctx, proposal.Id)
+	if err != nil {
+		logger.Warn(
+			"failed to delete disallowed proposal",
+			"proposal", proposal.Id,
+			"title", proposal.GetTitle(),
+			"total_deposit", proposal.TotalDeposit)
+		return
+	}
+
+	err = am.keeper.RefundAndDeleteDeposits(ctx, proposal.Id)
+	if err != nil {
+		logger.Warn(
+			"failed to refund deposits for disallowed proposal",
+			"proposal", proposal.Id,
+			"title", proposal.GetTitle(),
+			"total_deposit", proposal.TotalDeposit)
+		return
+	}
 
 	ctx.EventManager().EmitEvent(
 		sdk.NewEvent(
@@ -130,9 +157,8 @@ func deleteForbiddenProposal(ctx sdk.Context, am AppModule, proposal govv1.Propo
 		),
 	)
 
-	logger := am.keeper.Logger(ctx)
 	logger.Info(
-		"proposal is not whitelisted; deleted",
+		"proposal is not allowed; deleted",
 		"proposal", proposal.Id,
 		"title", proposal.GetTitle(),
 		"total_deposit", proposal.TotalDeposit)

From 5f9af23b05894365de83d1f72465446376ee5921 Mon Sep 17 00:00:00 2001
From: Cosmos SDK <113218068+github-prbot@users.noreply.github.com>
Date: Wed, 24 Jul 2024 16:38:46 +0200
Subject: [PATCH 3/5] chore: fix spelling errors (#2091)

chore: spelling errors fixes

Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
---
 docs/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README.md b/docs/README.md
index 956468bb4f..2598b1d9ff 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -94,4 +94,4 @@ The `./docs/legacy` directory gets included into the rest of the documentation u
 
 Building on remote host is handled by [deploy-docs.yml workflow](.github/workflows/deploy-docs.yml).
 
-It executes `./sync_versions.sh` and `./build_deploy.sh` scripts and allows the output of the build proces to be served by github pages.
+It executes `./sync_versions.sh` and `./build_deploy.sh` scripts and allows the output of the build process to be served by github pages.

From 7b419f1c8322638f85ed960f0dbe065538e938ae Mon Sep 17 00:00:00 2001
From: Simon Noetzlin <simon.ntz@gmail.com>
Date: Thu, 25 Jul 2024 16:56:19 +0200
Subject: [PATCH 4/5] docs: add v5.1.0 to changelog (#2096)

add v5.1.0 changelogs
---
 .../1995-deprecate-soft-opt-out.md            |  2 +
 .../1998-change-ux-in-key-assignment.md       |  0
 .../dependencies/2013-bump-comet.md           |  0
 .../dependencies/2053-bump-ibc.md             |  0
 .../dependencies/2053-bump-sdk.md             |  0
 .../features/1995-deprecate-soft-opt-out.md   |  2 +
 .../1995-deprecate-soft-opt-out.md            |  2 +
 .../state-breaking/2013-bump-comet.md         |  0
 .../state-breaking/2053-bump-ibc.md           |  0
 .../state-breaking/2053-bump-sdk.md           |  0
 .../1998-change-ux-in-key-assignment.md       |  0
 .changelog/v5.1.0/summary.md                  |  1 +
 CHANGELOG.md                                  | 50 +++++++++++++++++++
 13 files changed, 57 insertions(+)
 create mode 100644 .changelog/v5.1.0/api-breaking/1995-deprecate-soft-opt-out.md
 rename .changelog/{unreleased => v5.1.0}/api-breaking/provider/1998-change-ux-in-key-assignment.md (100%)
 rename .changelog/{unreleased => v5.1.0}/dependencies/2013-bump-comet.md (100%)
 rename .changelog/{unreleased => v5.1.0}/dependencies/2053-bump-ibc.md (100%)
 rename .changelog/{unreleased => v5.1.0}/dependencies/2053-bump-sdk.md (100%)
 create mode 100644 .changelog/v5.1.0/features/1995-deprecate-soft-opt-out.md
 create mode 100644 .changelog/v5.1.0/state-breaking/1995-deprecate-soft-opt-out.md
 rename .changelog/{unreleased => v5.1.0}/state-breaking/2013-bump-comet.md (100%)
 rename .changelog/{unreleased => v5.1.0}/state-breaking/2053-bump-ibc.md (100%)
 rename .changelog/{unreleased => v5.1.0}/state-breaking/2053-bump-sdk.md (100%)
 rename .changelog/{unreleased => v5.1.0}/state-breaking/provider/1998-change-ux-in-key-assignment.md (100%)
 create mode 100644 .changelog/v5.1.0/summary.md

diff --git a/.changelog/v5.1.0/api-breaking/1995-deprecate-soft-opt-out.md b/.changelog/v5.1.0/api-breaking/1995-deprecate-soft-opt-out.md
new file mode 100644
index 0000000000..bf47d6e7e4
--- /dev/null
+++ b/.changelog/v5.1.0/api-breaking/1995-deprecate-soft-opt-out.md
@@ -0,0 +1,2 @@
+- Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
\ No newline at end of file
diff --git a/.changelog/unreleased/api-breaking/provider/1998-change-ux-in-key-assignment.md b/.changelog/v5.1.0/api-breaking/provider/1998-change-ux-in-key-assignment.md
similarity index 100%
rename from .changelog/unreleased/api-breaking/provider/1998-change-ux-in-key-assignment.md
rename to .changelog/v5.1.0/api-breaking/provider/1998-change-ux-in-key-assignment.md
diff --git a/.changelog/unreleased/dependencies/2013-bump-comet.md b/.changelog/v5.1.0/dependencies/2013-bump-comet.md
similarity index 100%
rename from .changelog/unreleased/dependencies/2013-bump-comet.md
rename to .changelog/v5.1.0/dependencies/2013-bump-comet.md
diff --git a/.changelog/unreleased/dependencies/2053-bump-ibc.md b/.changelog/v5.1.0/dependencies/2053-bump-ibc.md
similarity index 100%
rename from .changelog/unreleased/dependencies/2053-bump-ibc.md
rename to .changelog/v5.1.0/dependencies/2053-bump-ibc.md
diff --git a/.changelog/unreleased/dependencies/2053-bump-sdk.md b/.changelog/v5.1.0/dependencies/2053-bump-sdk.md
similarity index 100%
rename from .changelog/unreleased/dependencies/2053-bump-sdk.md
rename to .changelog/v5.1.0/dependencies/2053-bump-sdk.md
diff --git a/.changelog/v5.1.0/features/1995-deprecate-soft-opt-out.md b/.changelog/v5.1.0/features/1995-deprecate-soft-opt-out.md
new file mode 100644
index 0000000000..6b447d3ed6
--- /dev/null
+++ b/.changelog/v5.1.0/features/1995-deprecate-soft-opt-out.md
@@ -0,0 +1,2 @@
+- Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+  Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
\ No newline at end of file
diff --git a/.changelog/v5.1.0/state-breaking/1995-deprecate-soft-opt-out.md b/.changelog/v5.1.0/state-breaking/1995-deprecate-soft-opt-out.md
new file mode 100644
index 0000000000..6b447d3ed6
--- /dev/null
+++ b/.changelog/v5.1.0/state-breaking/1995-deprecate-soft-opt-out.md
@@ -0,0 +1,2 @@
+- Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+  Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
\ No newline at end of file
diff --git a/.changelog/unreleased/state-breaking/2013-bump-comet.md b/.changelog/v5.1.0/state-breaking/2013-bump-comet.md
similarity index 100%
rename from .changelog/unreleased/state-breaking/2013-bump-comet.md
rename to .changelog/v5.1.0/state-breaking/2013-bump-comet.md
diff --git a/.changelog/unreleased/state-breaking/2053-bump-ibc.md b/.changelog/v5.1.0/state-breaking/2053-bump-ibc.md
similarity index 100%
rename from .changelog/unreleased/state-breaking/2053-bump-ibc.md
rename to .changelog/v5.1.0/state-breaking/2053-bump-ibc.md
diff --git a/.changelog/unreleased/state-breaking/2053-bump-sdk.md b/.changelog/v5.1.0/state-breaking/2053-bump-sdk.md
similarity index 100%
rename from .changelog/unreleased/state-breaking/2053-bump-sdk.md
rename to .changelog/v5.1.0/state-breaking/2053-bump-sdk.md
diff --git a/.changelog/unreleased/state-breaking/provider/1998-change-ux-in-key-assignment.md b/.changelog/v5.1.0/state-breaking/provider/1998-change-ux-in-key-assignment.md
similarity index 100%
rename from .changelog/unreleased/state-breaking/provider/1998-change-ux-in-key-assignment.md
rename to .changelog/v5.1.0/state-breaking/provider/1998-change-ux-in-key-assignment.md
diff --git a/.changelog/v5.1.0/summary.md b/.changelog/v5.1.0/summary.md
new file mode 100644
index 0000000000..aea175d241
--- /dev/null
+++ b/.changelog/v5.1.0/summary.md
@@ -0,0 +1 @@
+*July 19, 2024*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cc3e8a931..a73bbdbcbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,55 @@
 # CHANGELOG
 
+## v5.1.0
+
+*July 19, 2024*
+
+### API BREAKING
+
+- General
+  - Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+    Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
+- [Provider](x/ccv/provider)
+  - Change the UX in key assignment by returning an error if a validator tries to
+    reuse the same consumer key.
+    ([\#1998](https://github.com/cosmos/interchain-security/pull/1998))
+
+### DEPENDENCIES
+
+- Bump [CometBFT](https://github.com/cometbft/cometbft) to
+  [v0.38.9](https://github.com/cometbft/cometbft/releases/tag/v0.38.9).
+  ([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
+- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
+  [v8.3.2](https://github.com/cosmos/ibc-go/releases/tag/v8.3.2).
+  ([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
+- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
+[v0.50.8](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8)
+([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
+
+### FEATURES
+
+- Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+  Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
+
+### STATE BREAKING
+
+- General
+  - Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+    Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
+  - Bump [CometBFT](https://github.com/cometbft/cometbft) to
+    [v0.38.9](https://github.com/cometbft/cometbft/releases/tag/v0.38.9).
+    ([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
+  - Bump [ibc-go](https://github.com/cosmos/ibc-go) to
+    [v8.3.2](https://github.com/cosmos/ibc-go/releases/tag/v8.3.2).
+    ([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
+  - Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
+    [v0.50.8](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8)
+    ([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
+- [Provider](x/ccv/provider)
+  - Change the UX in key assignment by returning an error if a validator tries to
+    reuse the same consumer key.
+    ([\#1998](https://github.com/cosmos/interchain-security/pull/1998))
+
 ## v5.0.0
 
 *May 9, 2024*

From aedc0c8c503177d7eb0492a6db66de29a8e3f1b9 Mon Sep 17 00:00:00 2001
From: Simon Noetzlin <simon.ntz@gmail.com>
Date: Thu, 25 Jul 2024 18:32:24 +0200
Subject: [PATCH 5/5] fix: add missing signers in proto message (#2095)

* add missing signers in msgs

* add changelog entries

* nit
---
 .../provider/2095-proto-message-fix.md        |   2 +
 .../provider/2095-proto-message-fix.md        |   2 +
 .../ccv/provider/v1/tx.proto                  |   6 +
 x/ccv/provider/types/tx.pb.go                 | 261 ++++++++++--------
 4 files changed, 163 insertions(+), 108 deletions(-)
 create mode 100644 .changelog/unreleased/api-breaking/provider/2095-proto-message-fix.md
 create mode 100644 .changelog/unreleased/state-breaking/provider/2095-proto-message-fix.md

diff --git a/.changelog/unreleased/api-breaking/provider/2095-proto-message-fix.md b/.changelog/unreleased/api-breaking/provider/2095-proto-message-fix.md
new file mode 100644
index 0000000000..bb41e17a3c
--- /dev/null
+++ b/.changelog/unreleased/api-breaking/provider/2095-proto-message-fix.md
@@ -0,0 +1,2 @@
+- Fix incorrect message defitions in the proto files of the provider module
+  ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))
\ No newline at end of file
diff --git a/.changelog/unreleased/state-breaking/provider/2095-proto-message-fix.md b/.changelog/unreleased/state-breaking/provider/2095-proto-message-fix.md
new file mode 100644
index 0000000000..bb41e17a3c
--- /dev/null
+++ b/.changelog/unreleased/state-breaking/provider/2095-proto-message-fix.md
@@ -0,0 +1,2 @@
+- Fix incorrect message defitions in the proto files of the provider module
+  ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))
\ No newline at end of file
diff --git a/proto/interchain_security/ccv/provider/v1/tx.proto b/proto/interchain_security/ccv/provider/v1/tx.proto
index 91d7e517a3..7a87c56397 100644
--- a/proto/interchain_security/ccv/provider/v1/tx.proto
+++ b/proto/interchain_security/ccv/provider/v1/tx.proto
@@ -270,6 +270,8 @@ message MsgOptOutResponse {}
 message MsgSetConsumerCommissionRate {
   option (gogoproto.equal) = false;
   option (gogoproto.goproto_getters) = false;
+  option (cosmos.msg.v1.signer) = "signer";
+
    // The validator address on the provider
    string provider_addr = 1 [ (gogoproto.moretags) = "yaml:\"address\"" ];
   // The chain id of the consumer chain to set a commission rate
@@ -281,6 +283,8 @@ message MsgSetConsumerCommissionRate {
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable)   = false
     ];
+  // signer address
+  string signer = 4 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   }
 
 
@@ -292,6 +296,8 @@ message MsgSetConsumerCommissionRateResponse {}
 //
 // Note: this replaces ConsumerModificationProposal which is deprecated and will be removed soon
 message MsgConsumerModification {
+  option (cosmos.msg.v1.signer) = "authority";
+
   // the title of the proposal
   string title = 1;
   // the description of the proposal
diff --git a/x/ccv/provider/types/tx.pb.go b/x/ccv/provider/types/tx.pb.go
index be71e8fa18..e2bf04424f 100644
--- a/x/ccv/provider/types/tx.pb.go
+++ b/x/ccv/provider/types/tx.pb.go
@@ -424,7 +424,7 @@ type MsgConsumerAddition struct {
 	// channel is created on top of the same connection as the CCV channel.
 	// Note that transfer_channel_id is the ID of the channel end on the consumer
 	// chain. it is most relevant for chains performing a sovereign to consumer
-	// changeover in order to maintan the existing ibc transfer channel
+	// changeover in order to maintain the existing ibc transfer channel
 	DistributionTransmissionChannel string `protobuf:"bytes,12,opt,name=distribution_transmission_channel,json=distributionTransmissionChannel,proto3" json:"distribution_transmission_channel,omitempty"`
 	// Corresponds to the percentage of validators that have to validate the chain under the Top N case.
 	// For example, 53 corresponds to a Top 53% chain, meaning that the top 53% provider validators by voting power
@@ -1027,6 +1027,8 @@ type MsgSetConsumerCommissionRate struct {
 	// The rate to charge delegators on the consumer chain, as a fraction
 	// TODO: migrate rate from sdk.Dec to math.LegacyDec
 	Rate cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=rate,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"rate"`
+	// signer address
+	Signer string `protobuf:"bytes,4,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
 func (m *MsgSetConsumerCommissionRate) Reset()         { *m = MsgSetConsumerCommissionRate{} }
@@ -1295,113 +1297,113 @@ func init() {
 }
 
 var fileDescriptor_43221a4391e9fbf4 = []byte{
-	// 1687 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcf, 0x6f, 0xe4, 0x48,
-	0x15, 0x8e, 0xf3, 0x6b, 0xba, 0xab, 0xf3, 0xd3, 0x93, 0x21, 0x1d, 0x6f, 0xb6, 0x3b, 0x69, 0x96,
-	0xdd, 0x68, 0xd8, 0xd8, 0x9b, 0xc0, 0xee, 0x42, 0xb4, 0x08, 0x92, 0xf4, 0xc0, 0x64, 0x21, 0x93,
-	0xe0, 0x09, 0x8b, 0x04, 0x12, 0x56, 0xb5, 0x5d, 0x71, 0x97, 0xc6, 0x76, 0x59, 0x55, 0xd5, 0x9d,
-	0xed, 0x1b, 0xda, 0x13, 0x12, 0x02, 0x2d, 0x37, 0xc4, 0x69, 0x0f, 0x08, 0x09, 0x09, 0xa4, 0x39,
-	0xec, 0x89, 0x1b, 0xe2, 0x32, 0x07, 0x0e, 0xcb, 0x8a, 0x03, 0xe2, 0x30, 0xa0, 0x99, 0xc3, 0x72,
-	0xe6, 0x2f, 0x40, 0x55, 0x2e, 0xbb, 0xdd, 0x49, 0xa7, 0xa7, 0xbb, 0x03, 0x07, 0x2e, 0xad, 0x76,
-	0xbd, 0xef, 0x7d, 0xf5, 0x7d, 0xcf, 0xae, 0x57, 0x65, 0x83, 0xd7, 0x71, 0xc4, 0x11, 0x75, 0x9b,
-	0x10, 0x47, 0x0e, 0x43, 0x6e, 0x8b, 0x62, 0xde, 0xb1, 0x5c, 0xb7, 0x6d, 0xc5, 0x94, 0xb4, 0xb1,
-	0x87, 0xa8, 0xd5, 0xde, 0xb1, 0xf8, 0xfb, 0x66, 0x4c, 0x09, 0x27, 0xfa, 0xe7, 0xfb, 0xa0, 0x4d,
-	0xd7, 0x6d, 0x9b, 0x29, 0xda, 0x6c, 0xef, 0x18, 0xcb, 0x30, 0xc4, 0x11, 0xb1, 0xe4, 0x6f, 0x92,
-	0x67, 0xac, 0xfb, 0x84, 0xf8, 0x01, 0xb2, 0x60, 0x8c, 0x2d, 0x18, 0x45, 0x84, 0x43, 0x8e, 0x49,
-	0xc4, 0x54, 0xb4, 0xaa, 0xa2, 0xf2, 0xaa, 0xd1, 0x3a, 0xb7, 0x38, 0x0e, 0x11, 0xe3, 0x30, 0x8c,
-	0x15, 0xa0, 0x72, 0x19, 0xe0, 0xb5, 0xa8, 0x64, 0x50, 0xf1, 0xb5, 0xcb, 0x71, 0x18, 0x75, 0x54,
-	0x68, 0xc5, 0x27, 0x3e, 0x91, 0x7f, 0x2d, 0xf1, 0x2f, 0x4d, 0x70, 0x09, 0x0b, 0x09, 0x73, 0x92,
-	0x40, 0x72, 0xa1, 0x42, 0xab, 0xc9, 0x95, 0x15, 0x32, 0x5f, 0x58, 0x0f, 0x99, 0x9f, 0xaa, 0xc4,
-	0x0d, 0xd7, 0x72, 0x09, 0x45, 0x96, 0x1b, 0x60, 0x14, 0x71, 0x11, 0x4d, 0xfe, 0x29, 0xc0, 0xee,
-	0x30, 0xa5, 0xcc, 0x0a, 0x95, 0xe4, 0x58, 0x82, 0x34, 0xc0, 0x7e, 0x93, 0x27, 0x54, 0xcc, 0xe2,
-	0x28, 0xf2, 0x10, 0x0d, 0x71, 0x32, 0x41, 0xf7, 0x2a, 0x55, 0x91, 0x8b, 0xf3, 0x4e, 0x8c, 0x98,
-	0x85, 0x04, 0x5f, 0xe4, 0xa2, 0x04, 0x50, 0xfb, 0xab, 0x06, 0x56, 0x8e, 0x99, 0xbf, 0xcf, 0x18,
-	0xf6, 0xa3, 0x43, 0x12, 0xb1, 0x56, 0x88, 0xe8, 0xb7, 0x51, 0x47, 0x5f, 0x03, 0x85, 0x44, 0x1b,
-	0xf6, 0xca, 0xda, 0x86, 0xb6, 0x55, 0xb4, 0x6f, 0xc9, 0xeb, 0x23, 0x4f, 0x7f, 0x1b, 0xcc, 0xa7,
-	0xba, 0x1c, 0xe8, 0x79, 0xb4, 0x3c, 0x29, 0xe2, 0x07, 0xfa, 0xbf, 0x9f, 0x56, 0x17, 0x3a, 0x30,
-	0x0c, 0xf6, 0x6a, 0x62, 0x14, 0x31, 0x56, 0xb3, 0xe7, 0x52, 0xe0, 0xbe, 0xe7, 0x51, 0x7d, 0x13,
-	0xcc, 0xb9, 0x6a, 0x0a, 0xe7, 0x11, 0xea, 0x94, 0xa7, 0x24, 0x6f, 0xc9, 0xcd, 0x4d, 0xfb, 0x06,
-	0x98, 0x15, 0x4a, 0x10, 0x2d, 0x4f, 0x4b, 0xd2, 0xf2, 0xa7, 0x1f, 0x6f, 0xaf, 0xa8, 0x8a, 0xef,
-	0x27, 0xac, 0x0f, 0x39, 0xc5, 0x91, 0x6f, 0x2b, 0xdc, 0xde, 0xed, 0x9f, 0x7c, 0x54, 0x9d, 0xf8,
-	0xd7, 0x47, 0xd5, 0x89, 0x0f, 0x3e, 0x7b, 0x7c, 0x57, 0x0d, 0xd6, 0x2a, 0x60, 0xbd, 0x9f, 0x2b,
-	0x1b, 0xb1, 0x98, 0x44, 0x0c, 0xd5, 0xfe, 0xa8, 0x81, 0x97, 0x8f, 0x99, 0xff, 0xb0, 0xd5, 0x08,
-	0x31, 0x4f, 0x01, 0xc7, 0x98, 0x35, 0x50, 0x13, 0xb6, 0x31, 0x69, 0x51, 0xfd, 0x2d, 0x50, 0x64,
-	0x32, 0xca, 0x11, 0x4d, 0x0a, 0x30, 0x40, 0x4b, 0x17, 0xaa, 0x9f, 0x82, 0xb9, 0x30, 0xc7, 0x23,
-	0x6b, 0x53, 0xda, 0x7d, 0xdd, 0xc4, 0x0d, 0xd7, 0xcc, 0xdf, 0x39, 0x33, 0x77, 0xaf, 0xda, 0x3b,
-	0x66, 0x7e, 0x6e, 0xbb, 0x87, 0x61, 0xef, 0x73, 0x79, 0x83, 0xdd, 0x99, 0x6a, 0xaf, 0x81, 0x2f,
-	0x0c, 0xb4, 0x90, 0x99, 0x7d, 0x3c, 0xd9, 0xc7, 0x6c, 0x9d, 0xb4, 0x1a, 0x01, 0x7a, 0x8f, 0x70,
-	0x1c, 0xf9, 0x63, 0x9b, 0x75, 0xc0, 0xaa, 0xd7, 0x8a, 0x03, 0xec, 0x42, 0x8e, 0x9c, 0x36, 0xe1,
-	0xc8, 0x49, 0x1f, 0x2f, 0xe5, 0xfb, 0xb5, 0xbc, 0x4d, 0xf9, 0x00, 0x9a, 0xf5, 0x34, 0xe1, 0x3d,
-	0xc2, 0xd1, 0x3d, 0x05, 0xb7, 0xef, 0x78, 0xfd, 0x86, 0xf5, 0x1f, 0x81, 0x55, 0x1c, 0x9d, 0x53,
-	0xe8, 0x8a, 0xe5, 0xeb, 0x34, 0x02, 0xe2, 0x3e, 0x72, 0x9a, 0x08, 0x7a, 0x88, 0xca, 0x87, 0xa7,
-	0xb4, 0xfb, 0xea, 0x8b, 0x0a, 0x7b, 0x5f, 0xa2, 0xed, 0x3b, 0x5d, 0x9a, 0x03, 0xc1, 0x92, 0x0c,
-	0x8f, 0x54, 0xdb, 0x7c, 0xc5, 0xb2, 0xda, 0xfe, 0x5a, 0x03, 0x8b, 0xc7, 0xcc, 0xff, 0x5e, 0xec,
-	0x41, 0x8e, 0x4e, 0x21, 0x85, 0x21, 0x13, 0xd5, 0x84, 0x2d, 0xde, 0x24, 0x62, 0x45, 0xbf, 0xb8,
-	0x9a, 0x19, 0x54, 0x3f, 0x02, 0xb3, 0xb1, 0x64, 0x50, 0xc5, 0xfb, 0xa2, 0x39, 0x44, 0xff, 0x34,
-	0x93, 0x49, 0x0f, 0xa6, 0x9f, 0x3c, 0xad, 0x4e, 0xd8, 0x8a, 0x60, 0x6f, 0x41, 0xfa, 0xc9, 0xa8,
-	0x6b, 0x6b, 0x60, 0xf5, 0x92, 0xca, 0xcc, 0xc1, 0xcf, 0x0a, 0xe0, 0xf6, 0x31, 0xf3, 0x53, 0x97,
-	0xfb, 0x9e, 0x87, 0x45, 0x95, 0x06, 0x35, 0x80, 0x6f, 0x81, 0x05, 0x1c, 0x61, 0x8e, 0x61, 0xe0,
-	0x34, 0x91, 0x28, 0xbd, 0x12, 0x6c, 0xc8, 0x9b, 0x21, 0x9a, 0x9e, 0xa9, 0x5a, 0x9d, 0xbc, 0x01,
-	0x02, 0xa1, 0xf4, 0xcd, 0xab, 0xbc, 0x64, 0x50, 0x34, 0x04, 0x1f, 0x45, 0x88, 0x61, 0xe6, 0x34,
-	0x21, 0x6b, 0xca, 0x7b, 0x3a, 0x67, 0x97, 0xd4, 0xd8, 0x7d, 0xc8, 0x9a, 0x7a, 0x15, 0x94, 0x1a,
-	0x38, 0x82, 0xb4, 0x93, 0x20, 0xa6, 0x25, 0x02, 0x24, 0x43, 0x12, 0x70, 0x08, 0x00, 0x8b, 0xe1,
-	0x45, 0xe4, 0x88, 0x6d, 0xa0, 0x3c, 0xa3, 0x84, 0x24, 0x2d, 0xde, 0x4c, 0x5b, 0xbc, 0x79, 0x96,
-	0xee, 0x11, 0x07, 0x05, 0x21, 0xe4, 0xc3, 0x7f, 0x54, 0x35, 0xbb, 0x28, 0xf3, 0x44, 0x44, 0x7f,
-	0x00, 0x96, 0x5a, 0x51, 0x83, 0x44, 0x1e, 0x8e, 0x7c, 0x27, 0x46, 0x14, 0x13, 0xaf, 0x3c, 0x2b,
-	0xa9, 0xd6, 0xae, 0x50, 0xd5, 0xd5, 0x6e, 0x92, 0x30, 0xfd, 0x52, 0x30, 0x2d, 0x66, 0xc9, 0xa7,
-	0x32, 0x57, 0xff, 0x2e, 0xd0, 0x5d, 0xb7, 0x2d, 0x25, 0x91, 0x16, 0x4f, 0x19, 0x6f, 0x0d, 0xcf,
-	0xb8, 0xe4, 0xba, 0xed, 0xb3, 0x24, 0x5b, 0x51, 0xfe, 0x10, 0xac, 0x72, 0x0a, 0x23, 0x76, 0x8e,
-	0xe8, 0x65, 0xde, 0xc2, 0xf0, 0xbc, 0x77, 0x52, 0x8e, 0x5e, 0xf2, 0xfb, 0x60, 0x23, 0xeb, 0xcc,
-	0x14, 0x79, 0x98, 0x71, 0x8a, 0x1b, 0x2d, 0xb9, 0xe8, 0xd2, 0x65, 0x53, 0x2e, 0xca, 0x87, 0xa0,
-	0x92, 0xe2, 0xec, 0x1e, 0xd8, 0x37, 0x15, 0x4a, 0x3f, 0x01, 0xaf, 0xc8, 0x65, 0xca, 0x84, 0x38,
-	0xa7, 0x87, 0x49, 0x4e, 0x1d, 0x62, 0xc6, 0x04, 0x1b, 0xd8, 0xd0, 0xb6, 0xa6, 0xec, 0xcd, 0x04,
-	0x7b, 0x8a, 0x68, 0x3d, 0x87, 0x3c, 0xcb, 0x01, 0xf5, 0x6d, 0xa0, 0x37, 0x31, 0xe3, 0x84, 0x62,
-	0x17, 0x06, 0x0e, 0x8a, 0x38, 0xc5, 0x88, 0x95, 0x4b, 0x32, 0x7d, 0xb9, 0x1b, 0xb9, 0x97, 0x04,
-	0xf4, 0x77, 0xc1, 0xe6, 0xb5, 0x93, 0x3a, 0x6e, 0x13, 0x46, 0x11, 0x0a, 0xca, 0x73, 0xd2, 0x4a,
-	0xd5, 0xbb, 0x66, 0xce, 0xc3, 0x04, 0xa6, 0xdf, 0x06, 0x33, 0x9c, 0xc4, 0xce, 0x83, 0xf2, 0xfc,
-	0x86, 0xb6, 0x35, 0x6f, 0x4f, 0x73, 0x12, 0x3f, 0xd0, 0xdf, 0x00, 0x2b, 0x6d, 0x18, 0x60, 0x0f,
-	0x72, 0x42, 0x99, 0x13, 0x93, 0x0b, 0x44, 0x1d, 0x17, 0xc6, 0xe5, 0x05, 0x89, 0xd1, 0xbb, 0xb1,
-	0x53, 0x11, 0x3a, 0x84, 0xb1, 0x7e, 0x17, 0x2c, 0x67, 0xa3, 0x0e, 0x43, 0x5c, 0xc2, 0x17, 0x25,
-	0x7c, 0x31, 0x0b, 0x3c, 0x44, 0x5c, 0x60, 0xd7, 0x41, 0x11, 0x06, 0x01, 0xb9, 0x08, 0x30, 0xe3,
-	0xe5, 0xa5, 0x8d, 0xa9, 0xad, 0xa2, 0xdd, 0x1d, 0xd0, 0x0d, 0x50, 0xf0, 0x50, 0xd4, 0x91, 0xc1,
-	0x65, 0x19, 0xcc, 0xae, 0x7b, 0xbb, 0x8e, 0x3e, 0x74, 0xd7, 0xb9, 0xd2, 0x2a, 0x5e, 0x06, 0x2f,
-	0xf5, 0x69, 0x07, 0x59, 0xbb, 0xf8, 0x83, 0x06, 0xf4, 0x5c, 0xdc, 0x46, 0x21, 0x69, 0xc3, 0x60,
-	0x50, 0xb7, 0xd8, 0x07, 0x45, 0x26, 0xca, 0x28, 0xd7, 0xe7, 0xe4, 0x08, 0xeb, 0xb3, 0x20, 0xd2,
-	0xe4, 0xf2, 0xec, 0xf1, 0x36, 0x35, 0xbe, 0xb7, 0x75, 0x60, 0x5c, 0xd5, 0x9e, 0x59, 0xfb, 0xbd,
-	0x06, 0xee, 0x88, 0x70, 0x13, 0x46, 0x3e, 0xb2, 0xd1, 0x05, 0xa4, 0x5e, 0x1d, 0x45, 0x24, 0x64,
-	0x7a, 0x0d, 0xcc, 0x7b, 0xf2, 0x9f, 0xc3, 0x89, 0x38, 0xf2, 0x94, 0x35, 0x59, 0xfc, 0x52, 0x32,
-	0x78, 0x46, 0xf6, 0x3d, 0x4f, 0xdf, 0x02, 0x4b, 0x5d, 0x0c, 0x15, 0xd4, 0xc2, 0xad, 0x80, 0x2d,
-	0xa4, 0x30, 0x39, 0xe1, 0x7f, 0xcf, 0x4d, 0x55, 0x6e, 0xeb, 0x57, 0xe5, 0x66, 0x86, 0x9e, 0x68,
-	0xa0, 0x70, 0xcc, 0xfc, 0x93, 0x98, 0x1f, 0x45, 0xff, 0xe7, 0x07, 0x3a, 0x1d, 0x2c, 0xa5, 0x4e,
-	0x32, 0x7b, 0xbf, 0xd1, 0x40, 0x31, 0x19, 0x3c, 0x69, 0xf1, 0xff, 0x89, 0xbf, 0xae, 0xf8, 0xa9,
-	0x9b, 0x88, 0xbf, 0x0d, 0x96, 0x33, 0x9d, 0x99, 0xfa, 0x3f, 0x69, 0xf2, 0x8c, 0x2a, 0xd6, 0xbd,
-	0x2a, 0xd7, 0x21, 0x09, 0x55, 0x03, 0xb2, 0x21, 0x47, 0x57, 0x55, 0x6b, 0x43, 0xaa, 0xce, 0x57,
-	0x62, 0xb2, 0xb7, 0x12, 0xf7, 0xc0, 0x34, 0x85, 0x1c, 0x29, 0x3b, 0x3b, 0x62, 0xa9, 0xfd, 0xfd,
-	0x69, 0xf5, 0xa5, 0xc4, 0x12, 0xf3, 0x1e, 0x99, 0x98, 0x58, 0x21, 0xe4, 0x4d, 0xf3, 0x3b, 0xc8,
-	0x87, 0x6e, 0xa7, 0x8e, 0xdc, 0x4f, 0x3f, 0xde, 0x06, 0xca, 0x71, 0x1d, 0xb9, 0xb6, 0x4c, 0xdf,
-	0x2b, 0xa4, 0x2e, 0x6b, 0xaf, 0x82, 0x57, 0x06, 0x99, 0xc8, 0xdc, 0xfe, 0x65, 0x52, 0x9e, 0x40,
-	0xb2, 0x73, 0x2a, 0xf1, 0xf0, 0xb9, 0x38, 0xee, 0x89, 0x0e, 0xbf, 0x02, 0x66, 0x38, 0xe6, 0x01,
-	0x52, 0xb7, 0x2d, 0xb9, 0xd0, 0x37, 0x40, 0xc9, 0x43, 0xcc, 0xa5, 0x38, 0x96, 0xbb, 0x4f, 0x62,
-	0x24, 0x3f, 0xd4, 0xe3, 0x73, 0xaa, 0xd7, 0x67, 0xd6, 0xb9, 0xa7, 0x87, 0xe8, 0xdc, 0x33, 0xa3,
-	0x75, 0xee, 0xd9, 0x21, 0x3a, 0xf7, 0xad, 0x41, 0x9d, 0xbb, 0x30, 0xa8, 0x73, 0x17, 0x87, 0xee,
-	0x07, 0xb5, 0x4d, 0x50, 0xbd, 0xa6, 0xa4, 0x69, 0xd9, 0x77, 0xff, 0x5c, 0x02, 0x53, 0xc7, 0xcc,
-	0xd7, 0x7f, 0xa1, 0x81, 0xe5, 0xab, 0xef, 0x78, 0x5f, 0x1d, 0xea, 0x80, 0xd9, 0xef, 0x45, 0xca,
-	0xd8, 0x1f, 0x3b, 0x35, 0xd5, 0xa6, 0xff, 0x4e, 0x03, 0xc6, 0x80, 0x17, 0xb0, 0x83, 0x61, 0x67,
-	0xb8, 0x9e, 0xc3, 0x78, 0xf7, 0xe6, 0x1c, 0x03, 0xe4, 0xf6, 0xbc, 0x42, 0x8d, 0x29, 0x37, 0xcf,
-	0x31, 0xae, 0xdc, 0x7e, 0x2f, 0x26, 0xfa, 0xcf, 0x35, 0xb0, 0x74, 0xe5, 0x4c, 0xff, 0x95, 0x61,
-	0x27, 0xb8, 0x9c, 0x69, 0x7c, 0x63, 0xdc, 0xcc, 0x4c, 0xd0, 0x4f, 0x35, 0xb0, 0x78, 0xf9, 0xd4,
-	0xf0, 0xf6, 0xa8, 0xac, 0x2a, 0xd1, 0xf8, 0xfa, 0x98, 0x89, 0x99, 0x9a, 0x0f, 0x34, 0x30, 0xd7,
-	0xf3, 0xd2, 0xf6, 0xe5, 0x61, 0x19, 0xf3, 0x59, 0xc6, 0x3b, 0xe3, 0x64, 0x65, 0x22, 0x42, 0x30,
-	0x93, 0xec, 0xcd, 0xdb, 0xc3, 0xd2, 0x48, 0xb8, 0xf1, 0xe6, 0x48, 0xf0, 0x6c, 0xba, 0x18, 0xcc,
-	0xaa, 0xbd, 0xd2, 0x1c, 0x81, 0xe0, 0xa4, 0xc5, 0x8d, 0xb7, 0x46, 0xc3, 0x67, 0x33, 0xfe, 0x56,
-	0x03, 0x6b, 0xd7, 0x6f, 0x70, 0x43, 0xf7, 0x90, 0x6b, 0x29, 0x8c, 0xa3, 0x1b, 0x53, 0x64, 0x5a,
-	0x7f, 0xa5, 0x81, 0x95, 0xbe, 0xdb, 0xd3, 0x3b, 0xa3, 0x3e, 0x6b, 0xf9, 0x6c, 0xa3, 0x7e, 0x93,
-	0xec, 0x54, 0x9c, 0x31, 0xf3, 0xe3, 0xcf, 0x1e, 0xdf, 0xd5, 0x0e, 0xbe, 0xff, 0xe4, 0x59, 0x45,
-	0xfb, 0xe4, 0x59, 0x45, 0xfb, 0xe7, 0xb3, 0x8a, 0xf6, 0xe1, 0xf3, 0xca, 0xc4, 0x27, 0xcf, 0x2b,
-	0x13, 0x7f, 0x7b, 0x5e, 0x99, 0xf8, 0xc1, 0xd7, 0x7c, 0xcc, 0x9b, 0xad, 0x86, 0xe9, 0x92, 0x50,
-	0x7d, 0xa0, 0xb4, 0xba, 0xf3, 0x6e, 0x67, 0xdf, 0x17, 0xdb, 0x6f, 0x5a, 0xef, 0xf7, 0x7e, 0x64,
-	0x94, 0x1f, 0x65, 0x1a, 0xb3, 0xf2, 0x20, 0xfe, 0xa5, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x39,
-	0xec, 0x0a, 0x75, 0xe0, 0x15, 0x00, 0x00,
+	// 1686 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcf, 0x6f, 0x24, 0x47,
+	0x15, 0x76, 0xfb, 0xd7, 0xce, 0xd4, 0xf8, 0x67, 0xaf, 0x17, 0x8f, 0x3b, 0xce, 0x8c, 0x3d, 0x84,
+	0xc4, 0x5a, 0xe2, 0xee, 0xd8, 0x90, 0x04, 0xac, 0x20, 0xb0, 0x3d, 0x0b, 0xeb, 0x80, 0xd7, 0xa6,
+	0xd7, 0x04, 0x09, 0x24, 0x5a, 0x35, 0xdd, 0xe5, 0x9e, 0xd2, 0x76, 0x77, 0xb5, 0xaa, 0x6a, 0xc6,
+	0x99, 0x5b, 0x94, 0x13, 0x12, 0x02, 0x85, 0x1b, 0xe2, 0x94, 0x03, 0x42, 0x42, 0x02, 0x69, 0x0f,
+	0x39, 0x71, 0xe3, 0xb6, 0x07, 0x0e, 0x51, 0xc4, 0x01, 0x71, 0x58, 0x60, 0xf7, 0x10, 0xce, 0xfc,
+	0x05, 0xa8, 0xaa, 0xab, 0x7b, 0x7a, 0xec, 0xf1, 0x64, 0x66, 0x1c, 0x0e, 0xb9, 0x8c, 0xa6, 0xeb,
+	0x7d, 0xef, 0x7b, 0xdf, 0x7b, 0xd5, 0xf5, 0xaa, 0xaa, 0xc1, 0xab, 0x38, 0xe2, 0x88, 0xba, 0x4d,
+	0x88, 0x23, 0x87, 0x21, 0xb7, 0x45, 0x31, 0xef, 0x58, 0xae, 0xdb, 0xb6, 0x62, 0x4a, 0xda, 0xd8,
+	0x43, 0xd4, 0x6a, 0xef, 0x58, 0xfc, 0x5d, 0x33, 0xa6, 0x84, 0x13, 0xfd, 0xcb, 0x7d, 0xd0, 0xa6,
+	0xeb, 0xb6, 0xcd, 0x14, 0x6d, 0xb6, 0x77, 0x8c, 0x65, 0x18, 0xe2, 0x88, 0x58, 0xf2, 0x37, 0xf1,
+	0x33, 0xd6, 0x7d, 0x42, 0xfc, 0x00, 0x59, 0x30, 0xc6, 0x16, 0x8c, 0x22, 0xc2, 0x21, 0xc7, 0x24,
+	0x62, 0xca, 0x5a, 0x55, 0x56, 0xf9, 0xd4, 0x68, 0x9d, 0x5b, 0x1c, 0x87, 0x88, 0x71, 0x18, 0xc6,
+	0x0a, 0x50, 0xb9, 0x0c, 0xf0, 0x5a, 0x54, 0x32, 0x28, 0xfb, 0xda, 0x65, 0x3b, 0x8c, 0x3a, 0xca,
+	0xb4, 0xe2, 0x13, 0x9f, 0xc8, 0xbf, 0x96, 0xf8, 0x97, 0x3a, 0xb8, 0x84, 0x85, 0x84, 0x39, 0x89,
+	0x21, 0x79, 0x50, 0xa6, 0xd5, 0xe4, 0xc9, 0x0a, 0x99, 0x2f, 0x52, 0x0f, 0x99, 0x9f, 0xaa, 0xc4,
+	0x0d, 0xd7, 0x72, 0x09, 0x45, 0x96, 0x1b, 0x60, 0x14, 0x71, 0x61, 0x4d, 0xfe, 0x29, 0xc0, 0xee,
+	0x30, 0xa5, 0xcc, 0x0a, 0x95, 0xf8, 0x58, 0x82, 0x34, 0xc0, 0x7e, 0x93, 0x27, 0x54, 0xcc, 0xe2,
+	0x28, 0xf2, 0x10, 0x0d, 0x71, 0x12, 0xa0, 0xfb, 0x94, 0xaa, 0xc8, 0xd9, 0x79, 0x27, 0x46, 0xcc,
+	0x42, 0x82, 0x2f, 0x72, 0x51, 0x02, 0xa8, 0xfd, 0x4d, 0x03, 0x2b, 0xc7, 0xcc, 0xdf, 0x67, 0x0c,
+	0xfb, 0xd1, 0x21, 0x89, 0x58, 0x2b, 0x44, 0xf4, 0xfb, 0xa8, 0xa3, 0xaf, 0x81, 0x42, 0xa2, 0x0d,
+	0x7b, 0x65, 0x6d, 0x43, 0xdb, 0x2a, 0xda, 0xb7, 0xe4, 0xf3, 0x91, 0xa7, 0xbf, 0x09, 0xe6, 0x53,
+	0x5d, 0x0e, 0xf4, 0x3c, 0x5a, 0x9e, 0x14, 0xf6, 0x03, 0xfd, 0xbf, 0x4f, 0xab, 0x0b, 0x1d, 0x18,
+	0x06, 0x7b, 0x35, 0x31, 0x8a, 0x18, 0xab, 0xd9, 0x73, 0x29, 0x70, 0xdf, 0xf3, 0xa8, 0xbe, 0x09,
+	0xe6, 0x5c, 0x15, 0xc2, 0x79, 0x84, 0x3a, 0xe5, 0x29, 0xc9, 0x5b, 0x72, 0x73, 0x61, 0x5f, 0x03,
+	0xb3, 0x42, 0x09, 0xa2, 0xe5, 0x69, 0x49, 0x5a, 0xfe, 0xe4, 0xa3, 0xed, 0x15, 0x55, 0xf1, 0xfd,
+	0x84, 0xf5, 0x21, 0xa7, 0x38, 0xf2, 0x6d, 0x85, 0xdb, 0xbb, 0xfd, 0xf3, 0x0f, 0xab, 0x13, 0xff,
+	0xf9, 0xb0, 0x3a, 0xf1, 0xfe, 0xa7, 0x8f, 0xef, 0xaa, 0xc1, 0x5a, 0x05, 0xac, 0xf7, 0xcb, 0xca,
+	0x46, 0x2c, 0x26, 0x11, 0x43, 0xb5, 0xbf, 0x68, 0xe0, 0xc5, 0x63, 0xe6, 0x3f, 0x6c, 0x35, 0x42,
+	0xcc, 0x53, 0xc0, 0x31, 0x66, 0x0d, 0xd4, 0x84, 0x6d, 0x4c, 0x5a, 0x54, 0x7f, 0x03, 0x14, 0x99,
+	0xb4, 0x72, 0x44, 0x93, 0x02, 0x0c, 0xd0, 0xd2, 0x85, 0xea, 0xa7, 0x60, 0x2e, 0xcc, 0xf1, 0xc8,
+	0xda, 0x94, 0x76, 0x5f, 0x35, 0x71, 0xc3, 0x35, 0xf3, 0x33, 0x67, 0xe6, 0xe6, 0xaa, 0xbd, 0x63,
+	0xe6, 0x63, 0xdb, 0x3d, 0x0c, 0x7b, 0x5f, 0xca, 0x27, 0xd8, 0x8d, 0x54, 0x7b, 0x05, 0x7c, 0x65,
+	0x60, 0x0a, 0x59, 0xb2, 0x8f, 0x27, 0xfb, 0x24, 0x5b, 0x27, 0xad, 0x46, 0x80, 0xde, 0x21, 0x1c,
+	0x47, 0xfe, 0xd8, 0xc9, 0x3a, 0x60, 0xd5, 0x6b, 0xc5, 0x01, 0x76, 0x21, 0x47, 0x4e, 0x9b, 0x70,
+	0xe4, 0xa4, 0xaf, 0x97, 0xca, 0xfb, 0x95, 0x7c, 0x9a, 0xf2, 0x05, 0x34, 0xeb, 0xa9, 0xc3, 0x3b,
+	0x84, 0xa3, 0x7b, 0x0a, 0x6e, 0xdf, 0xf1, 0xfa, 0x0d, 0xeb, 0x3f, 0x03, 0xab, 0x38, 0x3a, 0xa7,
+	0xd0, 0x15, 0xcb, 0xd7, 0x69, 0x04, 0xc4, 0x7d, 0xe4, 0x34, 0x11, 0xf4, 0x10, 0x95, 0x2f, 0x4f,
+	0x69, 0xf7, 0xe5, 0xcf, 0x2a, 0xec, 0x7d, 0x89, 0xb6, 0xef, 0x74, 0x69, 0x0e, 0x04, 0x4b, 0x32,
+	0x3c, 0x52, 0x6d, 0xf3, 0x15, 0xcb, 0x6a, 0xfb, 0x3b, 0x0d, 0x2c, 0x1e, 0x33, 0xff, 0x47, 0xb1,
+	0x07, 0x39, 0x3a, 0x85, 0x14, 0x86, 0x4c, 0x54, 0x13, 0xb6, 0x78, 0x93, 0x88, 0x15, 0xfd, 0xd9,
+	0xd5, 0xcc, 0xa0, 0xfa, 0x11, 0x98, 0x8d, 0x25, 0x83, 0x2a, 0xde, 0x57, 0xcd, 0x21, 0xfa, 0xa7,
+	0x99, 0x04, 0x3d, 0x98, 0x7e, 0xf2, 0xb4, 0x3a, 0x61, 0x2b, 0x82, 0xbd, 0x05, 0x99, 0x4f, 0x46,
+	0x5d, 0x5b, 0x03, 0xab, 0x97, 0x54, 0x66, 0x19, 0xfc, 0xb2, 0x00, 0x6e, 0x1f, 0x33, 0x3f, 0xcd,
+	0x72, 0xdf, 0xf3, 0xb0, 0xa8, 0xd2, 0xa0, 0x06, 0xf0, 0x3d, 0xb0, 0x80, 0x23, 0xcc, 0x31, 0x0c,
+	0x9c, 0x26, 0x12, 0xa5, 0x57, 0x82, 0x0d, 0x39, 0x19, 0xa2, 0xe9, 0x99, 0xaa, 0xd5, 0xc9, 0x09,
+	0x10, 0x08, 0xa5, 0x6f, 0x5e, 0xf9, 0x25, 0x83, 0xa2, 0x21, 0xf8, 0x28, 0x42, 0x0c, 0x33, 0xa7,
+	0x09, 0x59, 0x53, 0xce, 0xe9, 0x9c, 0x5d, 0x52, 0x63, 0xf7, 0x21, 0x6b, 0xea, 0x55, 0x50, 0x6a,
+	0xe0, 0x08, 0xd2, 0x4e, 0x82, 0x98, 0x96, 0x08, 0x90, 0x0c, 0x49, 0xc0, 0x21, 0x00, 0x2c, 0x86,
+	0x17, 0x91, 0x23, 0xb6, 0x81, 0xf2, 0x8c, 0x12, 0x92, 0xb4, 0x78, 0x33, 0x6d, 0xf1, 0xe6, 0x59,
+	0xba, 0x47, 0x1c, 0x14, 0x84, 0x90, 0x0f, 0xfe, 0x59, 0xd5, 0xec, 0xa2, 0xf4, 0x13, 0x16, 0xfd,
+	0x01, 0x58, 0x6a, 0x45, 0x0d, 0x12, 0x79, 0x38, 0xf2, 0x9d, 0x18, 0x51, 0x4c, 0xbc, 0xf2, 0xac,
+	0xa4, 0x5a, 0xbb, 0x42, 0x55, 0x57, 0xbb, 0x49, 0xc2, 0xf4, 0x1b, 0xc1, 0xb4, 0x98, 0x39, 0x9f,
+	0x4a, 0x5f, 0xfd, 0x87, 0x40, 0x77, 0xdd, 0xb6, 0x94, 0x44, 0x5a, 0x3c, 0x65, 0xbc, 0x35, 0x3c,
+	0xe3, 0x92, 0xeb, 0xb6, 0xcf, 0x12, 0x6f, 0x45, 0xf9, 0x53, 0xb0, 0xca, 0x29, 0x8c, 0xd8, 0x39,
+	0xa2, 0x97, 0x79, 0x0b, 0xc3, 0xf3, 0xde, 0x49, 0x39, 0x7a, 0xc9, 0xef, 0x83, 0x8d, 0xac, 0x33,
+	0x53, 0xe4, 0x61, 0xc6, 0x29, 0x6e, 0xb4, 0xe4, 0xa2, 0x4b, 0x97, 0x4d, 0xb9, 0x28, 0x5f, 0x82,
+	0x4a, 0x8a, 0xb3, 0x7b, 0x60, 0xdf, 0x55, 0x28, 0xfd, 0x04, 0xbc, 0x24, 0x97, 0x29, 0x13, 0xe2,
+	0x9c, 0x1e, 0x26, 0x19, 0x3a, 0xc4, 0x8c, 0x09, 0x36, 0xb0, 0xa1, 0x6d, 0x4d, 0xd9, 0x9b, 0x09,
+	0xf6, 0x14, 0xd1, 0x7a, 0x0e, 0x79, 0x96, 0x03, 0xea, 0xdb, 0x40, 0x6f, 0x62, 0xc6, 0x09, 0xc5,
+	0x2e, 0x0c, 0x1c, 0x14, 0x71, 0x8a, 0x11, 0x2b, 0x97, 0xa4, 0xfb, 0x72, 0xd7, 0x72, 0x2f, 0x31,
+	0xe8, 0x6f, 0x83, 0xcd, 0x6b, 0x83, 0x3a, 0x6e, 0x13, 0x46, 0x11, 0x0a, 0xca, 0x73, 0x32, 0x95,
+	0xaa, 0x77, 0x4d, 0xcc, 0xc3, 0x04, 0xa6, 0xdf, 0x06, 0x33, 0x9c, 0xc4, 0xce, 0x83, 0xf2, 0xfc,
+	0x86, 0xb6, 0x35, 0x6f, 0x4f, 0x73, 0x12, 0x3f, 0xd0, 0x5f, 0x03, 0x2b, 0x6d, 0x18, 0x60, 0x0f,
+	0x72, 0x42, 0x99, 0x13, 0x93, 0x0b, 0x44, 0x1d, 0x17, 0xc6, 0xe5, 0x05, 0x89, 0xd1, 0xbb, 0xb6,
+	0x53, 0x61, 0x3a, 0x84, 0xb1, 0x7e, 0x17, 0x2c, 0x67, 0xa3, 0x0e, 0x43, 0x5c, 0xc2, 0x17, 0x25,
+	0x7c, 0x31, 0x33, 0x3c, 0x44, 0x5c, 0x60, 0xd7, 0x41, 0x11, 0x06, 0x01, 0xb9, 0x08, 0x30, 0xe3,
+	0xe5, 0xa5, 0x8d, 0xa9, 0xad, 0xa2, 0xdd, 0x1d, 0xd0, 0x0d, 0x50, 0xf0, 0x50, 0xd4, 0x91, 0xc6,
+	0x65, 0x69, 0xcc, 0x9e, 0x7b, 0xbb, 0x8e, 0x3e, 0x74, 0xd7, 0xb9, 0xd2, 0x2a, 0x5e, 0x04, 0x2f,
+	0xf4, 0x69, 0x07, 0x59, 0xbb, 0xf8, 0xb3, 0x06, 0xf4, 0x9c, 0xdd, 0x46, 0x21, 0x69, 0xc3, 0x60,
+	0x50, 0xb7, 0xd8, 0x07, 0x45, 0x26, 0xca, 0x28, 0xd7, 0xe7, 0xe4, 0x08, 0xeb, 0xb3, 0x20, 0xdc,
+	0xe4, 0xf2, 0xec, 0xc9, 0x6d, 0x6a, 0xfc, 0xdc, 0xd6, 0x81, 0x71, 0x55, 0x7b, 0x96, 0xda, 0x9f,
+	0x34, 0x70, 0x47, 0x98, 0x9b, 0x30, 0xf2, 0x91, 0x8d, 0x2e, 0x20, 0xf5, 0xea, 0x28, 0x22, 0x21,
+	0xd3, 0x6b, 0x60, 0xde, 0x93, 0xff, 0x1c, 0x4e, 0xc4, 0x91, 0xa7, 0xac, 0xc9, 0xe2, 0x97, 0x92,
+	0xc1, 0x33, 0xb2, 0xef, 0x79, 0xfa, 0x16, 0x58, 0xea, 0x62, 0xa8, 0xa0, 0x16, 0xd9, 0x0a, 0xd8,
+	0x42, 0x0a, 0x93, 0x01, 0x3f, 0xbf, 0x6c, 0xaa, 0x72, 0x5b, 0xbf, 0x2a, 0x37, 0x4b, 0xe8, 0x89,
+	0x06, 0x0a, 0xc7, 0xcc, 0x3f, 0x89, 0xf9, 0x51, 0xf4, 0x05, 0x3f, 0xd0, 0xe9, 0x60, 0x29, 0xcd,
+	0x24, 0x4b, 0xef, 0xf7, 0x1a, 0x28, 0x26, 0x83, 0x27, 0x2d, 0xfe, 0x7f, 0xc9, 0xaf, 0x2b, 0x7e,
+	0xea, 0x26, 0xe2, 0x6f, 0x83, 0xe5, 0x4c, 0x67, 0xa6, 0xfe, 0xbd, 0x49, 0x79, 0x46, 0x15, 0xeb,
+	0x5e, 0x95, 0xeb, 0x90, 0x84, 0xaa, 0x01, 0xd9, 0x90, 0xa3, 0xab, 0xaa, 0xb5, 0x21, 0x55, 0xe7,
+	0x2b, 0x31, 0xd9, 0x5b, 0x89, 0x7b, 0x60, 0x9a, 0x42, 0x8e, 0x54, 0x3a, 0x3b, 0x62, 0xa9, 0xfd,
+	0xe3, 0x69, 0xf5, 0x85, 0x24, 0x25, 0xe6, 0x3d, 0x32, 0x31, 0xb1, 0x42, 0xc8, 0x9b, 0xe6, 0x0f,
+	0x90, 0x0f, 0xdd, 0x4e, 0x1d, 0xb9, 0x9f, 0x7c, 0xb4, 0x0d, 0x54, 0xc6, 0x75, 0xe4, 0xda, 0xd2,
+	0xfd, 0xf3, 0x9a, 0xd4, 0x97, 0xc1, 0x4b, 0x83, 0x2a, 0x90, 0x95, 0xea, 0xdf, 0x93, 0xf2, 0xf8,
+	0x92, 0x1d, 0x72, 0x89, 0x87, 0xcf, 0xc5, 0x59, 0x51, 0x6c, 0x0f, 0x2b, 0x60, 0x86, 0x63, 0x1e,
+	0x20, 0x35, 0xe7, 0xc9, 0x83, 0xbe, 0x01, 0x4a, 0x1e, 0x62, 0x2e, 0xc5, 0xb1, 0xdc, 0xba, 0x92,
+	0x2a, 0xe4, 0x87, 0x7a, 0x8a, 0x34, 0xd5, 0x5b, 0xa4, 0xac, 0xed, 0x4f, 0x0f, 0xd1, 0xf6, 0x67,
+	0x46, 0x6b, 0xfb, 0xb3, 0x43, 0xb4, 0xfd, 0x5b, 0x83, 0xda, 0x7e, 0x61, 0x50, 0xdb, 0x2f, 0x8e,
+	0xdf, 0x4c, 0x36, 0x41, 0xf5, 0x9a, 0x12, 0xa7, 0xd3, 0xb0, 0xfb, 0xd7, 0x12, 0x98, 0x3a, 0x66,
+	0xbe, 0xfe, 0x6b, 0x0d, 0x2c, 0x5f, 0xbd, 0x30, 0x7e, 0x73, 0xa8, 0xd3, 0x6a, 0xbf, 0x5b, 0x99,
+	0xb1, 0x3f, 0xb6, 0x6b, 0xaa, 0x4d, 0xff, 0xa3, 0x06, 0x8c, 0x01, 0xb7, 0xb9, 0x83, 0x61, 0x23,
+	0x5c, 0xcf, 0x61, 0xbc, 0x7d, 0x73, 0x8e, 0x01, 0x72, 0x7b, 0xee, 0x63, 0x63, 0xca, 0xcd, 0x73,
+	0x8c, 0x2b, 0xb7, 0xdf, 0x2d, 0x47, 0xff, 0x95, 0x06, 0x96, 0xae, 0x5c, 0x10, 0xbe, 0x31, 0x6c,
+	0x80, 0xcb, 0x9e, 0xc6, 0x77, 0xc6, 0xf5, 0xcc, 0x04, 0xfd, 0x42, 0x03, 0x8b, 0x97, 0x8f, 0x20,
+	0x6f, 0x8e, 0xca, 0xaa, 0x1c, 0x8d, 0x6f, 0x8f, 0xe9, 0x98, 0xa9, 0x79, 0x5f, 0x03, 0x73, 0x3d,
+	0x37, 0xc0, 0xaf, 0x0f, 0xcb, 0x98, 0xf7, 0x32, 0xde, 0x1a, 0xc7, 0x2b, 0x13, 0x11, 0x82, 0x99,
+	0x64, 0xa3, 0xdf, 0x1e, 0x96, 0x46, 0xc2, 0x8d, 0xd7, 0x47, 0x82, 0x67, 0xe1, 0x62, 0x30, 0xab,
+	0x36, 0x5e, 0x73, 0x04, 0x82, 0x93, 0x16, 0x37, 0xde, 0x18, 0x0d, 0x9f, 0x45, 0xfc, 0x83, 0x06,
+	0xd6, 0xae, 0xdf, 0x2d, 0x87, 0xee, 0x21, 0xd7, 0x52, 0x18, 0x47, 0x37, 0xa6, 0xc8, 0xb4, 0xfe,
+	0x56, 0x03, 0x2b, 0x7d, 0xb7, 0xab, 0xb7, 0x46, 0x7d, 0xd7, 0xf2, 0xde, 0x46, 0xfd, 0x26, 0xde,
+	0xa9, 0x38, 0x63, 0xe6, 0xbd, 0x4f, 0x1f, 0xdf, 0xd5, 0x0e, 0x7e, 0xfc, 0xe4, 0x59, 0x45, 0xfb,
+	0xf8, 0x59, 0x45, 0xfb, 0xd7, 0xb3, 0x8a, 0xf6, 0xc1, 0xf3, 0xca, 0xc4, 0xc7, 0xcf, 0x2b, 0x13,
+	0x7f, 0x7f, 0x5e, 0x99, 0xf8, 0xc9, 0xb7, 0x7c, 0xcc, 0x9b, 0xad, 0x86, 0xe9, 0x92, 0x50, 0x7d,
+	0xed, 0xb4, 0xba, 0x71, 0xb7, 0xb3, 0x8f, 0x95, 0xed, 0xd7, 0xad, 0x77, 0x7b, 0xbf, 0x58, 0xca,
+	0x2f, 0x3c, 0x8d, 0x59, 0x79, 0xaa, 0xff, 0xda, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x21, 0x15,
+	0x3c, 0x60, 0x2d, 0x16, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2566,6 +2568,13 @@ func (m *MsgSetConsumerCommissionRate) MarshalToSizedBuffer(dAtA []byte) (int, e
 	_ = i
 	var l int
 	_ = l
+	if len(m.Signer) > 0 {
+		i -= len(m.Signer)
+		copy(dAtA[i:], m.Signer)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.Signer)))
+		i--
+		dAtA[i] = 0x22
+	}
 	{
 		size := m.Rate.Size()
 		i -= size
@@ -3069,6 +3078,10 @@ func (m *MsgSetConsumerCommissionRate) Size() (n int) {
 	}
 	l = m.Rate.Size()
 	n += 1 + l + sovTx(uint64(l))
+	l = len(m.Signer)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
 	return n
 }
 
@@ -5471,6 +5484,38 @@ func (m *MsgSetConsumerCommissionRate) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Signer = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipTx(dAtA[iNdEx:])