From 09146f28e9aec65a6421373d34b430a310eb8009 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Thu, 22 Jun 2023 12:15:05 -0700
Subject: [PATCH 01/21] consumer proto folder

---
 .../ccv/consumer/v1/consumer.proto             | 18 ++++++++++++++----
 .../ccv/consumer/v1/genesis.proto              | 11 +++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/proto/interchain_security/ccv/consumer/v1/consumer.proto b/proto/interchain_security/ccv/consumer/v1/consumer.proto
index 97ba14f6da..2f08aefd56 100644
--- a/proto/interchain_security/ccv/consumer/v1/consumer.proto
+++ b/proto/interchain_security/ccv/consumer/v1/consumer.proto
@@ -11,7 +11,10 @@ import "cosmos_proto/cosmos.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
-// Params defines the parameters for CCV consumer module
+// Params defines the parameters for CCV consumer module.
+// 
+// Note this type is referenced in both the consumer and provider CCV modules,
+// and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis. 
 message Params {
   // TODO: Remove enabled flag and find a better way to setup integration tests
   // See: https://github.com/cosmos/interchain-security/issues/339
@@ -69,10 +72,15 @@ message Params {
 }
 
 // LastTransmissionBlockHeight is the last time validator holding
-// pools were transmitted to the provider chain
+// pools were transmitted to the provider chain.
+//
+// This type is only used internally to the consumer CCV module. 
 message LastTransmissionBlockHeight { int64 height = 1; }
 
-// CrossChainValidator defines the validators for CCV consumer module
+// CrossChainValidator defines the type used to store validator information internal 
+// to the consumer CCV module.  Note one cross chain validator entry is persisted for
+// each consumer validator, where incoming VSC packets update this data, which is eventually
+// forwarded to comet for consumer chain consensus. 
 message CrossChainValidator {
   bytes address = 1;
   int64 power = 2;
@@ -83,7 +91,9 @@ message CrossChainValidator {
   ];
 }
 
-// MaturingVSCPacket contains the maturing time of a received VSCPacket
+// MaturingVSCPacket represents a vsc packet that is maturing internal to the
+// consumer CCV module, where the consumer has not yet relayed a VSCMatured packet
+// back to the provider. 
 message MaturingVSCPacket {
   uint64 vscId = 1;
   google.protobuf.Timestamp maturity_time = 2
diff --git a/proto/interchain_security/ccv/consumer/v1/genesis.proto b/proto/interchain_security/ccv/consumer/v1/genesis.proto
index 9c9418ef3c..463fe63b53 100644
--- a/proto/interchain_security/ccv/consumer/v1/genesis.proto
+++ b/proto/interchain_security/ccv/consumer/v1/genesis.proto
@@ -13,6 +13,9 @@ import "google/protobuf/duration.proto";
 import "gogoproto/gogo.proto";
 
 // GenesisState defines the CCV consumer chain genesis state
+// 
+// Note this type is referenced in both the consumer and provider CCV modules,
+// and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis.
 message GenesisState {
   Params params = 1 [ (gogoproto.nullable) = false ];
   string provider_client_id = 2; // empty for a new chain, filled in on restart.
@@ -46,13 +49,13 @@ message GenesisState {
                     // pre-CCV state
 }
 
-// HeightValsetUpdateID defines the genesis information for the mapping
-// of each block height to a valset update id
+// HeightValsetUpdateID represents a mapping internal to the consumer CCV module
+// which links a block height to each recv valset update id.
 message HeightToValsetUpdateID {
   uint64 height = 1;
   uint64 valset_update_id = 2;
 }
 
-// OutstandingDowntime defines the genesis information for each validator
-// flagged with an outstanding downtime slashing.
+// OutstandingDowntime defines the type used internally to the consumer CCV module,
+// in order to not send multiple slashing requests for the same downtime infraction.
 message OutstandingDowntime { string validator_consensus_address = 1; }
\ No newline at end of file

From 1ed4a86dc2a3313562f5e227cec17b27ed02dd51 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Thu, 22 Jun 2023 12:33:31 -0700
Subject: [PATCH 02/21] provider comments, move one msg

---
 .../ccv/provider/v1/provider.proto            | 41 ++++++++++++++++---
 proto/interchain_security/ccv/v1/ccv.proto    |  8 +++-
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto
index b986255ce5..a26a59f655 100644
--- a/proto/interchain_security/ccv/provider/v1/provider.proto
+++ b/proto/interchain_security/ccv/provider/v1/provider.proto
@@ -18,6 +18,8 @@ import "cosmos/base/v1beta1/coin.proto";
 // chain are expected to validate the consumer chain at spawn time or get
 // slashed. It is recommended that spawn time occurs after the proposal end
 // time.
+// 
+// Note this type is only used internally to the provider CCV module. 
 message ConsumerAdditionProposal {
   option (gogoproto.goproto_getters) = false;
   option (gogoproto.goproto_stringer) = false;
@@ -83,6 +85,8 @@ message ConsumerAdditionProposal {
 // remove (and stop) a consumer chain. If it passes, all the consumer chain's
 // state is removed from the provider chain. The outstanding unbonding operation
 // funds are released.
+// 
+// Note this type is only used internally to the provider CCV module. 
 message ConsumerRemovalProposal {
   // the title of the proposal
   string title = 1;
@@ -96,6 +100,10 @@ message ConsumerRemovalProposal {
       [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ];
 }
 
+// EquivocationProposal is a governance proposal on the provider chain to
+// punish a validator for equivocation on a consumer chain.
+// 
+// This type is only used internally to the consumer CCV module.  
 message EquivocationProposal {
   // the title of the proposal
   string title = 1;
@@ -108,6 +116,8 @@ message EquivocationProposal {
 // A persisted queue entry indicating that a slash packet data instance needs to
 // be handled. This type belongs in the "global" queue, to coordinate slash
 // packet handling times between consumers.
+//
+// Soon to be depreicated
 message GlobalSlashEntry {
   // Block time that slash packet was received by provider chain.
   // This field is used for store key iteration ordering.
@@ -127,6 +137,8 @@ message GlobalSlashEntry {
 }
 
 // Params defines the parameters for CCV Provider module
+// 
+// Note this type is only used internally to the provider CCV module. 
 message Params {
   ibc.lightclients.tendermint.v1.ClientState template_client = 1;
   // TrustingPeriodFraction is used to compute the consumer and provider IBC
@@ -164,17 +176,16 @@ message Params {
       [ (gogoproto.nullable) = false ];
 }
 
-message HandshakeMetadata {
-  string provider_fee_pool_addr = 1;
-  string version = 2;
-}
-
 // SlashAcks contains cons addresses of consumer chain validators
-// successfully slashed on the provider chain
+// successfully slashed on the provider chain. 
+// 
+// Note this type is only used internally to the provider CCV module.
 message SlashAcks { repeated string addresses = 1; }
 
 // ConsumerAdditionProposals holds pending governance proposals on the provider
 // chain to spawn a new chain.
+// 
+// Note this type is only used internally to the provider CCV module.
 message ConsumerAdditionProposals {
   // proposals waiting for spawn_time to pass
   repeated ConsumerAdditionProposal pending = 1;
@@ -182,14 +193,19 @@ message ConsumerAdditionProposals {
 
 // ConsumerRemovalProposals holds pending governance proposals on the provider
 // chain to remove (and stop) a consumer chain.
+// 
+// Note this type is only used internally to the provider CCV module.
 message ConsumerRemovalProposals {
   // proposals waiting for stop_time to pass
   repeated ConsumerRemovalProposal pending = 1;
 }
 
 // AddressList contains a list of consensus addresses
+// 
+// Note this type is only used internally to the provider CCV module.
 message AddressList { repeated bytes addresses = 1; }
 
+// Note this type is only used internally to the provider CCV module.
 message ChannelToChain {
   string channel_id = 1;
   string chain_id = 2;
@@ -197,6 +213,8 @@ message ChannelToChain {
 
 // VscUnbondingOps contains the IDs of unbonding operations that are waiting for
 // at least one VSCMaturedPacket with vscID from a consumer chain
+// 
+// Note this type is only used internally to the provider CCV module  .
 message VscUnbondingOps {
   uint64 vsc_id = 1;
   repeated uint64 unbonding_op_ids = 2;
@@ -204,17 +222,21 @@ message VscUnbondingOps {
 
 // UnbondingOp contains the ids of consumer chains that need to unbond before
 // the unbonding operation with the given ID can unbond
+// 
+// Note this type is only used internally to the provider CCV module.
 message UnbondingOp {
   uint64 id = 1;
   // consumer chains that are still unbonding
   repeated string unbonding_consumer_chains = 2;
 }
 
+// Note this type is only used internally to the provider CCV module.
 message InitTimeoutTimestamp {
   string chain_id = 1;
   uint64 timestamp = 2;
 }
 
+// Note this type is only used internally to the provider CCV module.
 message VscSendTimestamp {
   uint64 vsc_id = 1;
   google.protobuf.Timestamp timestamp = 2
@@ -225,6 +247,7 @@ message VscSendTimestamp {
 // Key assignment section
 //
 
+// Note this type is only used internally to the provider CCV module.
 message KeyAssignmentReplacement {
   bytes provider_addr = 1;
   tendermint.crypto.PublicKey prev_c_key = 2;
@@ -234,6 +257,8 @@ message KeyAssignmentReplacement {
 // Used to serialize the ValidatorConsumerPubKey index from key assignment
 // ValidatorConsumerPubKey: (chainID, providerAddr consAddr) -> consumerKey
 // tmprotocrypto.PublicKey
+//
+// Note this type is only used internally to the provider CCV module.
 message ValidatorConsumerPubKey {
   string chain_id = 1;
   bytes provider_addr = 2;
@@ -243,6 +268,8 @@ message ValidatorConsumerPubKey {
 // Used to serialize the ValidatorConsumerAddr index from key assignment
 // ValidatorByConsumerAddr: (chainID, consumerAddr consAddr) -> providerAddr
 // consAddr
+// 
+// Note this type is only used internally to the provider CCV module.
 message ValidatorByConsumerAddr {
   string chain_id = 1;
   bytes consumer_addr = 2;
@@ -251,6 +278,8 @@ message ValidatorByConsumerAddr {
 
 // Used to serialize the ConsumerAddrsToPrune index from key assignment
 // ConsumerAddrsToPrune: (chainID, vscID uint64) -> consumerAddrs AddressList
+//
+// Note this type is only used internally to the provider CCV module.
 message ConsumerAddrsToPrune {
   string chain_id = 1;
   uint64 vsc_id = 2;
diff --git a/proto/interchain_security/ccv/v1/ccv.proto b/proto/interchain_security/ccv/v1/ccv.proto
index ffae373aa6..57c18a465b 100644
--- a/proto/interchain_security/ccv/v1/ccv.proto
+++ b/proto/interchain_security/ccv/v1/ccv.proto
@@ -84,4 +84,10 @@ enum ConsumerPacketDataType {
   // VSCMatured packet
   CONSUMER_PACKET_TYPE_VSCM = 2
       [ (gogoproto.enumvalue_customname) = "VscMaturedPacket" ];
-}
\ No newline at end of file
+}
+
+// Note this type is used during IBC handshake methods for both the consumer and provider
+message HandshakeMetadata {
+  string provider_fee_pool_addr = 1;
+  string version = 2;
+}

From 9f397331582a114caff4947bbbbcb0298cc20d5c Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Thu, 22 Jun 2023 12:45:55 -0700
Subject: [PATCH 03/21] ccv comments

---
 .../ccv/provider/v1/provider.proto               | 14 ++++++++++++++
 .../ccv/v1/{ccv.proto => wire.proto}             | 16 ++++++----------
 2 files changed, 20 insertions(+), 10 deletions(-)
 rename proto/interchain_security/ccv/v1/{ccv.proto => wire.proto} (89%)

diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto
index a26a59f655..8518615457 100644
--- a/proto/interchain_security/ccv/provider/v1/provider.proto
+++ b/proto/interchain_security/ccv/provider/v1/provider.proto
@@ -243,6 +243,20 @@ message VscSendTimestamp {
       [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ];
 }
 
+// ValidatorSetChangePackets is a pb list of ccv.ValidatorSetChangePacketData.
+// 
+// Note this type is only used internally to the provider CCV module.
+message ValidatorSetChangePackets {
+  repeated ValidatorSetChangePacketData list = 1
+      [ (gogoproto.nullable) = false ];
+}
+
+// MaturedUnbondingOps defines a list of ids corresponding to ids of matured
+// unbonding operations.
+// 
+// Note this type is only used internally to the provider CCV module.
+message MaturedUnbondingOps { repeated uint64 ids = 1; }
+
 //
 // Key assignment section
 //
diff --git a/proto/interchain_security/ccv/v1/ccv.proto b/proto/interchain_security/ccv/v1/wire.proto
similarity index 89%
rename from proto/interchain_security/ccv/v1/ccv.proto
rename to proto/interchain_security/ccv/v1/wire.proto
index 57c18a465b..d0b5571588 100644
--- a/proto/interchain_security/ccv/v1/ccv.proto
+++ b/proto/interchain_security/ccv/v1/wire.proto
@@ -9,6 +9,11 @@ import "cosmos/staking/v1beta1/staking.proto";
 import "gogoproto/gogo.proto";
 import "tendermint/abci/types.proto";
 
+//
+// Note any type defined in this file is used by both the consumer and provider
+// AND SENT OVER THE WIRE. Ideally these schemas should never change. 
+// 
+
 // This packet is sent from provider chain to consumer chain if the validator
 // set for consumer chain changes (due to new bonding/unbonding messages or
 // slashing events) A VSCMatured packet from consumer chain will be sent
@@ -25,12 +30,6 @@ message ValidatorSetChangePacketData {
   repeated string slash_acks = 3;
 }
 
-// List of ccv.ValidatorSetChangePacketData.
-message ValidatorSetChangePackets {
-  repeated ValidatorSetChangePacketData list = 1
-      [ (gogoproto.nullable) = false ];
-}
-
 // This packet is sent from the consumer chain to the provider chain
 // to notify that a VSC packet reached maturity on the consumer chain.
 message VSCMaturedPacketData {
@@ -52,10 +51,6 @@ message SlashPacketData {
   cosmos.staking.v1beta1.Infraction infraction = 3;
 }
 
-// MaturedUnbondingOps defines a list of ids corresponding to ids of matured
-// unbonding operations.
-message MaturedUnbondingOps { repeated uint64 ids = 1; }
-
 // ConsumerPacketData contains a consumer packet data and a type tag
 message ConsumerPacketData {
   ConsumerPacketDataType type = 1;
@@ -66,6 +61,7 @@ message ConsumerPacketData {
   }
 }
 
+// TODO: to be removed altogether in https://github.com/cosmos/interchain-security/pull/1037
 // ConsumerPacketDataList is a list of consumer packet data packets.
 message ConsumerPacketDataList {
   repeated ConsumerPacketData list = 1 [ (gogoproto.nullable) = false ];

From cc9a354a5be4a83b2b2cfcfe7da5d0283d7d98be Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Thu, 22 Jun 2023 12:57:18 -0700
Subject: [PATCH 04/21] moved shiz

---
 .../ccv/consumer/v1/consumer.proto            |  60 ---------
 .../ccv/consumer/v1/genesis.proto             |  36 ------
 .../ccv/provider/v1/genesis.proto             |   4 +-
 .../ccv/v1/shared_consumer.proto              | 118 ++++++++++++++++++
 4 files changed, 121 insertions(+), 97 deletions(-)
 create mode 100644 proto/interchain_security/ccv/v1/shared_consumer.proto

diff --git a/proto/interchain_security/ccv/consumer/v1/consumer.proto b/proto/interchain_security/ccv/consumer/v1/consumer.proto
index 2f08aefd56..6ede514efe 100644
--- a/proto/interchain_security/ccv/consumer/v1/consumer.proto
+++ b/proto/interchain_security/ccv/consumer/v1/consumer.proto
@@ -11,66 +11,6 @@ import "cosmos_proto/cosmos.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
-// Params defines the parameters for CCV consumer module.
-// 
-// Note this type is referenced in both the consumer and provider CCV modules,
-// and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis. 
-message Params {
-  // TODO: Remove enabled flag and find a better way to setup integration tests
-  // See: https://github.com/cosmos/interchain-security/issues/339
-  bool enabled = 1;
-
-  ///////////////////////
-  // Distribution Params
-  // Number of blocks between ibc-token-transfers from the consumer chain to
-  // the provider chain. Note that at this transmission event a fraction of
-  // the accumulated tokens are divided and sent consumer redistribution
-  // address.
-  int64 blocks_per_distribution_transmission = 2;
-
-  // Channel, and provider-chain receiving address to send distribution token
-  // transfers over. These parameters is auto-set during the consumer <->
-  // provider handshake procedure.
-  string distribution_transmission_channel = 3;
-  string provider_fee_pool_addr_str = 4;
-  // Sent CCV related IBC packets will timeout after this duration
-  google.protobuf.Duration ccv_timeout_period = 5
-      [ (gogoproto.nullable) = false, (gogoproto.stdduration) = true ];
-
-  // Sent transfer related IBC packets will timeout after this duration
-  google.protobuf.Duration transfer_timeout_period = 6
-      [ (gogoproto.nullable) = false, (gogoproto.stdduration) = true ];
-
-  // The fraction of tokens allocated to the consumer redistribution address
-  // during distribution events. The fraction is a string representing a
-  // decimal number. For example "0.75" would represent 75%.
-  string consumer_redistribution_fraction = 7;
-
-  // The number of historical info entries to persist in store.
-  // This param is a part of the cosmos sdk staking module. In the case of
-  // a ccv enabled consumer chain, the ccv module acts as the staking module.
-  int64 historical_entries = 8;
-
-  // Unbonding period for the consumer,
-  // which should be smaller than that of the provider in general.
-  google.protobuf.Duration unbonding_period = 9
-      [ (gogoproto.nullable) = false, (gogoproto.stdduration) = true ];
-
-  // The threshold for the percentage of validators at the bottom of the set who
-  // can opt out of running the consumer chain without being punished. For
-  // example, a value of 0.05 means that the validators in the bottom 5% of the
-  // set can opt out
-  string soft_opt_out_threshold = 10;
-
-  // Reward denoms. These are the denominations which are allowed to be sent to
-  // the provider as rewards.
-  repeated string reward_denoms = 11;
-
-  // Provider-originated reward denoms. These are denoms coming from the
-  // provider which are allowed to be used as rewards. e.g. "uatom"
-  repeated string provider_reward_denoms = 12;
-}
-
 // LastTransmissionBlockHeight is the last time validator holding
 // pools were transmitted to the provider chain.
 //
diff --git a/proto/interchain_security/ccv/consumer/v1/genesis.proto b/proto/interchain_security/ccv/consumer/v1/genesis.proto
index 463fe63b53..7c9bb0d9e2 100644
--- a/proto/interchain_security/ccv/consumer/v1/genesis.proto
+++ b/proto/interchain_security/ccv/consumer/v1/genesis.proto
@@ -12,42 +12,6 @@ import "ibc/core/channel/v1/channel.proto";
 import "google/protobuf/duration.proto";
 import "gogoproto/gogo.proto";
 
-// GenesisState defines the CCV consumer chain genesis state
-// 
-// Note this type is referenced in both the consumer and provider CCV modules,
-// and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis.
-message GenesisState {
-  Params params = 1 [ (gogoproto.nullable) = false ];
-  string provider_client_id = 2; // empty for a new chain, filled in on restart.
-  string provider_channel_id =
-      3; // empty for a new chain, filled in on restart.
-  bool new_chain =
-      4; // true for new chain GenesisState, false for chain restart.
-  // ProviderClientState filled in on new chain, nil on restart.
-  ibc.lightclients.tendermint.v1.ClientState provider_client_state = 5;
-  // ProviderConsensusState filled in on new chain, nil on restart.
-  ibc.lightclients.tendermint.v1.ConsensusState provider_consensus_state = 6;
-  // MaturingPackets nil on new chain, filled in on restart.
-  repeated interchain_security.ccv.consumer.v1.MaturingVSCPacket
-      maturing_packets = 7 [ (gogoproto.nullable) = false ];
-  // InitialValset filled in on new chain and on restart.
-  repeated .tendermint.abci.ValidatorUpdate initial_val_set = 8
-      [ (gogoproto.nullable) = false ];
-  // HeightToValsetUpdateId nil on new chain, filled in on restart.
-  repeated HeightToValsetUpdateID height_to_valset_update_id = 9
-      [ (gogoproto.nullable) = false ];
-  // OutstandingDowntimes nil on new chain, filled  in on restart.
-  repeated OutstandingDowntime outstanding_downtime_slashing = 10
-      [ (gogoproto.nullable) = false ];
-  // PendingConsumerPackets nil on new chain, filled in on restart.
-  interchain_security.ccv.v1.ConsumerPacketDataList pending_consumer_packets =
-      11 [ (gogoproto.nullable) = false ];
-  // LastTransmissionBlockHeight nil on new chain, filled in on restart.
-  interchain_security.ccv.consumer.v1.LastTransmissionBlockHeight
-      last_transmission_block_height = 12 [ (gogoproto.nullable) = false ];
-  bool preCCV = 13; // flag indicating whether the consumer CCV module starts in
-                    // pre-CCV state
-}
 
 // HeightValsetUpdateID represents a mapping internal to the consumer CCV module
 // which links a block height to each recv valset update id.
diff --git a/proto/interchain_security/ccv/provider/v1/genesis.proto b/proto/interchain_security/ccv/provider/v1/genesis.proto
index e1f6ab2e1a..ff1d26e853 100644
--- a/proto/interchain_security/ccv/provider/v1/genesis.proto
+++ b/proto/interchain_security/ccv/provider/v1/genesis.proto
@@ -46,7 +46,9 @@ message GenesisState {
       [ (gogoproto.nullable) = false ];
 }
 
-// consumer chain
+// The provider CCV module's knowledge of consumer state. 
+//
+// Note this type is only used internally to the provider CCV module.
 message ConsumerState {
   // ChainID defines the chain ID for the consumer chain
   string chain_id = 1;
diff --git a/proto/interchain_security/ccv/v1/shared_consumer.proto b/proto/interchain_security/ccv/v1/shared_consumer.proto
new file mode 100644
index 0000000000..c11959a002
--- /dev/null
+++ b/proto/interchain_security/ccv/v1/shared_consumer.proto
@@ -0,0 +1,118 @@
+syntax = "proto3";
+
+package interchain_security.ccv.v1;
+
+option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/types";
+
+import "interchain_security/ccv/consumer/v1/consumer.proto";
+import "tendermint/abci/types.proto";
+import "ibc/lightclients/tendermint/v1/tendermint.proto";
+import "ibc/core/channel/v1/channel.proto";
+import "google/protobuf/duration.proto";
+import "gogoproto/gogo.proto";
+
+//
+// Note any type defined in this file is referenced/persisted in both the consumer and provider CCV modules,
+// but not sent over the wire. These schemas could change, only with careful consideration of effects!
+//
+
+// TODO: rename to ConsumerParams (make issue)
+// 
+// Params defines the parameters for CCV consumer module.
+// 
+// Note this type is referenced in both the consumer and provider CCV modules,
+// and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis. 
+message Params {
+    // TODO: Remove enabled flag and find a better way to setup integration tests
+    // See: https://github.com/cosmos/interchain-security/issues/339
+    bool enabled = 1;
+  
+    ///////////////////////
+    // Distribution Params
+    // Number of blocks between ibc-token-transfers from the consumer chain to
+    // the provider chain. Note that at this transmission event a fraction of
+    // the accumulated tokens are divided and sent consumer redistribution
+    // address.
+    int64 blocks_per_distribution_transmission = 2;
+  
+    // Channel, and provider-chain receiving address to send distribution token
+    // transfers over. These parameters is auto-set during the consumer <->
+    // provider handshake procedure.
+    string distribution_transmission_channel = 3;
+    string provider_fee_pool_addr_str = 4;
+    // Sent CCV related IBC packets will timeout after this duration
+    google.protobuf.Duration ccv_timeout_period = 5
+        [ (gogoproto.nullable) = false, (gogoproto.stdduration) = true ];
+  
+    // Sent transfer related IBC packets will timeout after this duration
+    google.protobuf.Duration transfer_timeout_period = 6
+        [ (gogoproto.nullable) = false, (gogoproto.stdduration) = true ];
+  
+    // The fraction of tokens allocated to the consumer redistribution address
+    // during distribution events. The fraction is a string representing a
+    // decimal number. For example "0.75" would represent 75%.
+    string consumer_redistribution_fraction = 7;
+  
+    // The number of historical info entries to persist in store.
+    // This param is a part of the cosmos sdk staking module. In the case of
+    // a ccv enabled consumer chain, the ccv module acts as the staking module.
+    int64 historical_entries = 8;
+  
+    // Unbonding period for the consumer,
+    // which should be smaller than that of the provider in general.
+    google.protobuf.Duration unbonding_period = 9
+        [ (gogoproto.nullable) = false, (gogoproto.stdduration) = true ];
+  
+    // The threshold for the percentage of validators at the bottom of the set who
+    // can opt out of running the consumer chain without being punished. For
+    // example, a value of 0.05 means that the validators in the bottom 5% of the
+    // set can opt out
+    string soft_opt_out_threshold = 10;
+  
+    // Reward denoms. These are the denominations which are allowed to be sent to
+    // the provider as rewards.
+    repeated string reward_denoms = 11;
+  
+    // Provider-originated reward denoms. These are denoms coming from the
+    // provider which are allowed to be used as rewards. e.g. "uatom"
+    repeated string provider_reward_denoms = 12;
+}
+
+// TODO: rename to ConsumerGenesisState (make issue)
+//
+// GenesisState defines the CCV consumer chain genesis state.
+// 
+// Note this type is referenced in both the consumer and provider CCV modules,
+// and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis.
+message GenesisState {
+    Params params = 1 [ (gogoproto.nullable) = false ];
+    string provider_client_id = 2; // empty for a new chain, filled in on restart.
+    string provider_channel_id =
+        3; // empty for a new chain, filled in on restart.
+    bool new_chain =
+        4; // true for new chain GenesisState, false for chain restart.
+    // ProviderClientState filled in on new chain, nil on restart.
+    ibc.lightclients.tendermint.v1.ClientState provider_client_state = 5;
+    // ProviderConsensusState filled in on new chain, nil on restart.
+    ibc.lightclients.tendermint.v1.ConsensusState provider_consensus_state = 6;
+    // MaturingPackets nil on new chain, filled in on restart.
+    repeated interchain_security.ccv.consumer.v1.MaturingVSCPacket
+        maturing_packets = 7 [ (gogoproto.nullable) = false ];
+    // InitialValset filled in on new chain and on restart.
+    repeated .tendermint.abci.ValidatorUpdate initial_val_set = 8
+        [ (gogoproto.nullable) = false ];
+    // HeightToValsetUpdateId nil on new chain, filled in on restart.
+    repeated HeightToValsetUpdateID height_to_valset_update_id = 9
+        [ (gogoproto.nullable) = false ];
+    // OutstandingDowntimes nil on new chain, filled  in on restart.
+    repeated OutstandingDowntime outstanding_downtime_slashing = 10
+        [ (gogoproto.nullable) = false ];
+    // PendingConsumerPackets nil on new chain, filled in on restart.
+    interchain_security.ccv.v1.ConsumerPacketDataList pending_consumer_packets =
+        11 [ (gogoproto.nullable) = false ];
+    // LastTransmissionBlockHeight nil on new chain, filled in on restart.
+    interchain_security.ccv.consumer.v1.LastTransmissionBlockHeight
+        last_transmission_block_height = 12 [ (gogoproto.nullable) = false ];
+    bool preCCV = 13; // flag indicating whether the consumer CCV module starts in
+                      // pre-CCV state
+}

From 98fd486eeba9db141adb8f65dca3bbc77903dd8f Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Thu, 22 Jun 2023 13:16:16 -0700
Subject: [PATCH 05/21] proto changes to build

---
 .../ccv/consumer/v1/consumer.proto            |  2 +-
 .../ccv/consumer/v1/genesis.proto             | 25 -------------------
 .../ccv/consumer/v1/query.proto               |  3 ++-
 .../ccv/provider/v1/genesis.proto             |  9 +++----
 .../ccv/provider/v1/provider.proto            |  4 ++-
 .../ccv/provider/v1/query.proto               |  6 ++---
 .../ccv/v1/shared_consumer.proto              | 13 ++++++++++
 7 files changed, 26 insertions(+), 36 deletions(-)
 delete mode 100644 proto/interchain_security/ccv/consumer/v1/genesis.proto

diff --git a/proto/interchain_security/ccv/consumer/v1/consumer.proto b/proto/interchain_security/ccv/consumer/v1/consumer.proto
index 6ede514efe..5feb1bb8fb 100644
--- a/proto/interchain_security/ccv/consumer/v1/consumer.proto
+++ b/proto/interchain_security/ccv/consumer/v1/consumer.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package interchain_security.ccv.consumer.v1;
 
-import "interchain_security/ccv/v1/ccv.proto";
+import "interchain_security/ccv/v1/wire.proto";
 
 option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types";
 
diff --git a/proto/interchain_security/ccv/consumer/v1/genesis.proto b/proto/interchain_security/ccv/consumer/v1/genesis.proto
deleted file mode 100644
index 7c9bb0d9e2..0000000000
--- a/proto/interchain_security/ccv/consumer/v1/genesis.proto
+++ /dev/null
@@ -1,25 +0,0 @@
-syntax = "proto3";
-
-package interchain_security.ccv.consumer.v1;
-
-option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types";
-
-import "interchain_security/ccv/v1/ccv.proto";
-import "interchain_security/ccv/consumer/v1/consumer.proto";
-import "tendermint/abci/types.proto";
-import "ibc/lightclients/tendermint/v1/tendermint.proto";
-import "ibc/core/channel/v1/channel.proto";
-import "google/protobuf/duration.proto";
-import "gogoproto/gogo.proto";
-
-
-// HeightValsetUpdateID represents a mapping internal to the consumer CCV module
-// which links a block height to each recv valset update id.
-message HeightToValsetUpdateID {
-  uint64 height = 1;
-  uint64 valset_update_id = 2;
-}
-
-// OutstandingDowntime defines the type used internally to the consumer CCV module,
-// in order to not send multiple slashing requests for the same downtime infraction.
-message OutstandingDowntime { string validator_consensus_address = 1; }
\ No newline at end of file
diff --git a/proto/interchain_security/ccv/consumer/v1/query.proto b/proto/interchain_security/ccv/consumer/v1/query.proto
index df90b1d0aa..a61b38a61a 100644
--- a/proto/interchain_security/ccv/consumer/v1/query.proto
+++ b/proto/interchain_security/ccv/consumer/v1/query.proto
@@ -1,6 +1,7 @@
 syntax = "proto3";
 
 package interchain_security.ccv.consumer.v1;
+import "interchain_security/ccv/v1/shared_consumer.proto";
 option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types";
 
 import "gogoproto/gogo.proto";
@@ -50,5 +51,5 @@ message QueryParamsRequest {}
 // QueryParamsResponse is response type for the Query/Params RPC method.
 message QueryParamsResponse {
   // params holds all the parameters of this module.
-  Params params = 1 [ (gogoproto.nullable) = false ];
+  interchain_security.ccv.v1.Params params = 1 [ (gogoproto.nullable) = false ];
 }
diff --git a/proto/interchain_security/ccv/provider/v1/genesis.proto b/proto/interchain_security/ccv/provider/v1/genesis.proto
index ff1d26e853..5450b08aa7 100644
--- a/proto/interchain_security/ccv/provider/v1/genesis.proto
+++ b/proto/interchain_security/ccv/provider/v1/genesis.proto
@@ -5,10 +5,9 @@ package interchain_security.ccv.provider.v1;
 option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/provider/types";
 
 import "gogoproto/gogo.proto";
-import "interchain_security/ccv/v1/ccv.proto";
+import "interchain_security/ccv/v1/shared_consumer.proto";
+import "interchain_security/ccv/v1/wire.proto";
 import "interchain_security/ccv/provider/v1/provider.proto";
-import "interchain_security/ccv/consumer/v1/consumer.proto";
-import "interchain_security/ccv/consumer/v1/genesis.proto";
 import "tendermint/crypto/keys.proto";
 
 // GenesisState defines the CCV provider chain genesis state
@@ -24,7 +23,7 @@ message GenesisState {
   repeated interchain_security.ccv.provider.v1.UnbondingOp unbonding_ops = 3
       [ (gogoproto.nullable) = false ];
   // empty for a new chain
-  interchain_security.ccv.v1.MaturedUnbondingOps mature_unbonding_ops = 4;
+  interchain_security.ccv.provider.v1.MaturedUnbondingOps mature_unbonding_ops = 4;
   // empty for a new chain
   repeated ValsetUpdateIdToHeight valset_update_id_to_height = 5
       [ (gogoproto.nullable) = false ];
@@ -59,7 +58,7 @@ message ConsumerState {
   // InitalHeight defines the initial block height for the consumer chain
   uint64 initial_height = 4;
   // ConsumerGenesis defines the initial consumer chain genesis states
-  interchain_security.ccv.consumer.v1.GenesisState consumer_genesis = 5
+  interchain_security.ccv.v1.GenesisState consumer_genesis = 5
       [ (gogoproto.nullable) = false ];
   // PendingValsetChanges defines the pending validator set changes for the
   // consumer chain
diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto
index 8518615457..3af9f52746 100644
--- a/proto/interchain_security/ccv/provider/v1/provider.proto
+++ b/proto/interchain_security/ccv/provider/v1/provider.proto
@@ -4,6 +4,8 @@ package interchain_security.ccv.provider.v1;
 
 option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/provider/types";
 
+import "interchain_security/ccv/v1/shared_consumer.proto";
+import "interchain_security/ccv/v1/wire.proto";
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
@@ -247,7 +249,7 @@ message VscSendTimestamp {
 // 
 // Note this type is only used internally to the provider CCV module.
 message ValidatorSetChangePackets {
-  repeated ValidatorSetChangePacketData list = 1
+  repeated interchain_security.ccv.v1.ValidatorSetChangePacketData list = 1
       [ (gogoproto.nullable) = false ];
 }
 
diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto
index 431099be79..b0c1dc2b47 100644
--- a/proto/interchain_security/ccv/provider/v1/query.proto
+++ b/proto/interchain_security/ccv/provider/v1/query.proto
@@ -6,9 +6,9 @@ option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/provider/typ
 import "google/api/annotations.proto";
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
-import "interchain_security/ccv/v1/ccv.proto";
-import "interchain_security/ccv/consumer/v1/genesis.proto";
 import "interchain_security/ccv/provider/v1/provider.proto";
+import "interchain_security/ccv/v1/shared_consumer.proto";
+import "interchain_security/ccv/v1/wire.proto";
 
 service Query {
   // ConsumerGenesis queries the genesis state needed to start a consumer chain
@@ -86,7 +86,7 @@ service Query {
 message QueryConsumerGenesisRequest { string chain_id = 1; }
 
 message QueryConsumerGenesisResponse {
-  interchain_security.ccv.consumer.v1.GenesisState genesis_state = 1
+  interchain_security.ccv.v1.GenesisState genesis_state = 1
       [ (gogoproto.nullable) = false ];
 }
 
diff --git a/proto/interchain_security/ccv/v1/shared_consumer.proto b/proto/interchain_security/ccv/v1/shared_consumer.proto
index c11959a002..95d57b9f57 100644
--- a/proto/interchain_security/ccv/v1/shared_consumer.proto
+++ b/proto/interchain_security/ccv/v1/shared_consumer.proto
@@ -10,6 +10,7 @@ import "ibc/lightclients/tendermint/v1/tendermint.proto";
 import "ibc/core/channel/v1/channel.proto";
 import "google/protobuf/duration.proto";
 import "gogoproto/gogo.proto";
+import "interchain_security/ccv/v1/wire.proto";
 
 //
 // Note any type defined in this file is referenced/persisted in both the consumer and provider CCV modules,
@@ -116,3 +117,15 @@ message GenesisState {
     bool preCCV = 13; // flag indicating whether the consumer CCV module starts in
                       // pre-CCV state
 }
+
+// HeightValsetUpdateID represents a mapping internal to the consumer CCV module
+// AND used in shared consumer genesis state, which links a block height to each recv valset update id.
+message HeightToValsetUpdateID {
+    uint64 height = 1;
+    uint64 valset_update_id = 2;
+}
+
+// OutstandingDowntime defines the type used internally to the consumer CCV module,
+// AND used in shared consumer genesis state, in order to not send multiple slashing 
+// requests for the same downtime infraction.
+message OutstandingDowntime { string validator_consensus_address = 1; }
\ No newline at end of file

From c493387f6dec9bcab428ba203e0793d6a458dc9d Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Thu, 22 Jun 2023 13:17:19 -0700
Subject: [PATCH 06/21] make proto gen again

---
 x/ccv/consumer/types/consumer.pb.go   |  837 +---------
 x/ccv/consumer/types/genesis.pb.go    | 1394 ----------------
 x/ccv/consumer/types/query.pb.go      |   76 +-
 x/ccv/provider/types/genesis.pb.go    |  127 +-
 x/ccv/provider/types/provider.pb.go   |  924 +++++++----
 x/ccv/provider/types/query.pb.go      |  191 ++-
 x/ccv/types/shared_consumer.pb.go     | 2154 +++++++++++++++++++++++++
 x/ccv/types/{ccv.pb.go => wire.pb.go} |  898 ++++-------
 8 files changed, 3333 insertions(+), 3268 deletions(-)
 delete mode 100644 x/ccv/consumer/types/genesis.pb.go
 create mode 100644 x/ccv/types/shared_consumer.pb.go
 rename x/ccv/types/{ccv.pb.go => wire.pb.go} (68%)

diff --git a/x/ccv/consumer/types/consumer.pb.go b/x/ccv/consumer/types/consumer.pb.go
index 90d5d6e12b..1c6a322004 100644
--- a/x/ccv/consumer/types/consumer.pb.go
+++ b/x/ccv/consumer/types/consumer.pb.go
@@ -31,170 +31,10 @@ var _ = time.Kitchen
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
-// Params defines the parameters for CCV consumer module
-type Params struct {
-	// TODO: Remove enabled flag and find a better way to setup integration tests
-	// See: https://github.com/cosmos/interchain-security/issues/339
-	Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
-	///////////////////////
-	// Distribution Params
-	// Number of blocks between ibc-token-transfers from the consumer chain to
-	// the provider chain. Note that at this transmission event a fraction of
-	// the accumulated tokens are divided and sent consumer redistribution
-	// address.
-	BlocksPerDistributionTransmission int64 `protobuf:"varint,2,opt,name=blocks_per_distribution_transmission,json=blocksPerDistributionTransmission,proto3" json:"blocks_per_distribution_transmission,omitempty"`
-	// Channel, and provider-chain receiving address to send distribution token
-	// transfers over. These parameters is auto-set during the consumer <->
-	// provider handshake procedure.
-	DistributionTransmissionChannel string `protobuf:"bytes,3,opt,name=distribution_transmission_channel,json=distributionTransmissionChannel,proto3" json:"distribution_transmission_channel,omitempty"`
-	ProviderFeePoolAddrStr          string `protobuf:"bytes,4,opt,name=provider_fee_pool_addr_str,json=providerFeePoolAddrStr,proto3" json:"provider_fee_pool_addr_str,omitempty"`
-	// Sent CCV related IBC packets will timeout after this duration
-	CcvTimeoutPeriod time.Duration `protobuf:"bytes,5,opt,name=ccv_timeout_period,json=ccvTimeoutPeriod,proto3,stdduration" json:"ccv_timeout_period"`
-	// Sent transfer related IBC packets will timeout after this duration
-	TransferTimeoutPeriod time.Duration `protobuf:"bytes,6,opt,name=transfer_timeout_period,json=transferTimeoutPeriod,proto3,stdduration" json:"transfer_timeout_period"`
-	// The fraction of tokens allocated to the consumer redistribution address
-	// during distribution events. The fraction is a string representing a
-	// decimal number. For example "0.75" would represent 75%.
-	ConsumerRedistributionFraction string `protobuf:"bytes,7,opt,name=consumer_redistribution_fraction,json=consumerRedistributionFraction,proto3" json:"consumer_redistribution_fraction,omitempty"`
-	// The number of historical info entries to persist in store.
-	// This param is a part of the cosmos sdk staking module. In the case of
-	// a ccv enabled consumer chain, the ccv module acts as the staking module.
-	HistoricalEntries int64 `protobuf:"varint,8,opt,name=historical_entries,json=historicalEntries,proto3" json:"historical_entries,omitempty"`
-	// Unbonding period for the consumer,
-	// which should be smaller than that of the provider in general.
-	UnbondingPeriod time.Duration `protobuf:"bytes,9,opt,name=unbonding_period,json=unbondingPeriod,proto3,stdduration" json:"unbonding_period"`
-	// The threshold for the percentage of validators at the bottom of the set who
-	// can opt out of running the consumer chain without being punished. For
-	// example, a value of 0.05 means that the validators in the bottom 5% of the
-	// set can opt out
-	SoftOptOutThreshold string `protobuf:"bytes,10,opt,name=soft_opt_out_threshold,json=softOptOutThreshold,proto3" json:"soft_opt_out_threshold,omitempty"`
-	// Reward denoms. These are the denominations which are allowed to be sent to
-	// the provider as rewards.
-	RewardDenoms []string `protobuf:"bytes,11,rep,name=reward_denoms,json=rewardDenoms,proto3" json:"reward_denoms,omitempty"`
-	// Provider-originated reward denoms. These are denoms coming from the
-	// provider which are allowed to be used as rewards. e.g. "uatom"
-	ProviderRewardDenoms []string `protobuf:"bytes,12,rep,name=provider_reward_denoms,json=providerRewardDenoms,proto3" json:"provider_reward_denoms,omitempty"`
-}
-
-func (m *Params) Reset()         { *m = Params{} }
-func (m *Params) String() string { return proto.CompactTextString(m) }
-func (*Params) ProtoMessage()    {}
-func (*Params) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5b27a82b276e7f93, []int{0}
-}
-func (m *Params) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_Params.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *Params) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Params.Merge(m, src)
-}
-func (m *Params) XXX_Size() int {
-	return m.Size()
-}
-func (m *Params) XXX_DiscardUnknown() {
-	xxx_messageInfo_Params.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Params proto.InternalMessageInfo
-
-func (m *Params) GetEnabled() bool {
-	if m != nil {
-		return m.Enabled
-	}
-	return false
-}
-
-func (m *Params) GetBlocksPerDistributionTransmission() int64 {
-	if m != nil {
-		return m.BlocksPerDistributionTransmission
-	}
-	return 0
-}
-
-func (m *Params) GetDistributionTransmissionChannel() string {
-	if m != nil {
-		return m.DistributionTransmissionChannel
-	}
-	return ""
-}
-
-func (m *Params) GetProviderFeePoolAddrStr() string {
-	if m != nil {
-		return m.ProviderFeePoolAddrStr
-	}
-	return ""
-}
-
-func (m *Params) GetCcvTimeoutPeriod() time.Duration {
-	if m != nil {
-		return m.CcvTimeoutPeriod
-	}
-	return 0
-}
-
-func (m *Params) GetTransferTimeoutPeriod() time.Duration {
-	if m != nil {
-		return m.TransferTimeoutPeriod
-	}
-	return 0
-}
-
-func (m *Params) GetConsumerRedistributionFraction() string {
-	if m != nil {
-		return m.ConsumerRedistributionFraction
-	}
-	return ""
-}
-
-func (m *Params) GetHistoricalEntries() int64 {
-	if m != nil {
-		return m.HistoricalEntries
-	}
-	return 0
-}
-
-func (m *Params) GetUnbondingPeriod() time.Duration {
-	if m != nil {
-		return m.UnbondingPeriod
-	}
-	return 0
-}
-
-func (m *Params) GetSoftOptOutThreshold() string {
-	if m != nil {
-		return m.SoftOptOutThreshold
-	}
-	return ""
-}
-
-func (m *Params) GetRewardDenoms() []string {
-	if m != nil {
-		return m.RewardDenoms
-	}
-	return nil
-}
-
-func (m *Params) GetProviderRewardDenoms() []string {
-	if m != nil {
-		return m.ProviderRewardDenoms
-	}
-	return nil
-}
-
 // LastTransmissionBlockHeight is the last time validator holding
-// pools were transmitted to the provider chain
+// pools were transmitted to the provider chain.
+//
+// This type is only used internally to the consumer CCV module.
 type LastTransmissionBlockHeight struct {
 	Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"`
 }
@@ -203,7 +43,7 @@ func (m *LastTransmissionBlockHeight) Reset()         { *m = LastTransmissionBlo
 func (m *LastTransmissionBlockHeight) String() string { return proto.CompactTextString(m) }
 func (*LastTransmissionBlockHeight) ProtoMessage()    {}
 func (*LastTransmissionBlockHeight) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5b27a82b276e7f93, []int{1}
+	return fileDescriptor_5b27a82b276e7f93, []int{0}
 }
 func (m *LastTransmissionBlockHeight) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -239,7 +79,10 @@ func (m *LastTransmissionBlockHeight) GetHeight() int64 {
 	return 0
 }
 
-// CrossChainValidator defines the validators for CCV consumer module
+// CrossChainValidator defines the type used to store validator information internal
+// to the consumer CCV module.  Note one cross chain validator entry is persisted for
+// each consumer validator, where incoming VSC packets update this data, which is eventually
+// forwarded to comet for consumer chain consensus.
 type CrossChainValidator struct {
 	Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
 	Power   int64  `protobuf:"varint,2,opt,name=power,proto3" json:"power,omitempty"`
@@ -251,7 +94,7 @@ func (m *CrossChainValidator) Reset()         { *m = CrossChainValidator{} }
 func (m *CrossChainValidator) String() string { return proto.CompactTextString(m) }
 func (*CrossChainValidator) ProtoMessage()    {}
 func (*CrossChainValidator) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5b27a82b276e7f93, []int{2}
+	return fileDescriptor_5b27a82b276e7f93, []int{1}
 }
 func (m *CrossChainValidator) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -301,7 +144,9 @@ func (m *CrossChainValidator) GetPubkey() *types.Any {
 	return nil
 }
 
-// MaturingVSCPacket contains the maturing time of a received VSCPacket
+// MaturingVSCPacket represents a vsc packet that is maturing internal to the
+// consumer CCV module, where the consumer has not yet relayed a VSCMatured packet
+// back to the provider.
 type MaturingVSCPacket struct {
 	VscId        uint64    `protobuf:"varint,1,opt,name=vscId,proto3" json:"vscId,omitempty"`
 	MaturityTime time.Time `protobuf:"bytes,2,opt,name=maturity_time,json=maturityTime,proto3,stdtime" json:"maturity_time"`
@@ -311,7 +156,7 @@ func (m *MaturingVSCPacket) Reset()         { *m = MaturingVSCPacket{} }
 func (m *MaturingVSCPacket) String() string { return proto.CompactTextString(m) }
 func (*MaturingVSCPacket) ProtoMessage()    {}
 func (*MaturingVSCPacket) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5b27a82b276e7f93, []int{3}
+	return fileDescriptor_5b27a82b276e7f93, []int{2}
 }
 func (m *MaturingVSCPacket) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -355,7 +200,6 @@ func (m *MaturingVSCPacket) GetMaturityTime() time.Time {
 }
 
 func init() {
-	proto.RegisterType((*Params)(nil), "interchain_security.ccv.consumer.v1.Params")
 	proto.RegisterType((*LastTransmissionBlockHeight)(nil), "interchain_security.ccv.consumer.v1.LastTransmissionBlockHeight")
 	proto.RegisterType((*CrossChainValidator)(nil), "interchain_security.ccv.consumer.v1.CrossChainValidator")
 	proto.RegisterType((*MaturingVSCPacket)(nil), "interchain_security.ccv.consumer.v1.MaturingVSCPacket")
@@ -366,170 +210,36 @@ func init() {
 }
 
 var fileDescriptor_5b27a82b276e7f93 = []byte{
-	// 786 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcf, 0x6e, 0xdb, 0x36,
-	0x18, 0x8f, 0x96, 0xd6, 0x4d, 0x98, 0x14, 0x6b, 0x59, 0x2f, 0x55, 0x33, 0x40, 0x76, 0xdd, 0x1e,
-	0x7c, 0x89, 0x84, 0x26, 0xdb, 0xa5, 0xc0, 0x0e, 0xb5, 0xb3, 0xa2, 0xdd, 0xbf, 0x78, 0xaa, 0xd1,
-	0x01, 0xdb, 0x81, 0xa0, 0x28, 0x5a, 0x22, 0x22, 0x91, 0x02, 0x49, 0xa9, 0xd3, 0x7d, 0x0f, 0xd0,
-	0xe3, 0x1e, 0x61, 0x0f, 0xb0, 0x87, 0x28, 0x76, 0xea, 0x71, 0xa7, 0x6e, 0x48, 0xde, 0x60, 0x4f,
-	0x30, 0x90, 0x92, 0x5c, 0x3b, 0x6d, 0x80, 0xdc, 0xf8, 0xe9, 0xf7, 0xfb, 0x7e, 0xfa, 0xfe, 0x83,
-	0x43, 0xc6, 0x35, 0x95, 0x24, 0xc5, 0x8c, 0x23, 0x45, 0x49, 0x29, 0x99, 0xae, 0x03, 0x42, 0xaa,
-	0x80, 0x08, 0xae, 0xca, 0x9c, 0xca, 0xa0, 0x7a, 0xb4, 0x7c, 0xfb, 0x85, 0x14, 0x5a, 0xc0, 0x07,
-	0x1f, 0xf1, 0xf1, 0x09, 0xa9, 0xfc, 0x25, 0xaf, 0x7a, 0xb4, 0xff, 0xf0, 0x32, 0x61, 0xa3, 0x47,
-	0xaa, 0x46, 0x6a, 0xff, 0x5e, 0x22, 0x44, 0x92, 0xd1, 0xc0, 0x5a, 0x51, 0xb9, 0x08, 0x30, 0xaf,
-	0x5b, 0xa8, 0x9f, 0x88, 0x44, 0xd8, 0x67, 0x60, 0x5e, 0x9d, 0x03, 0x11, 0x2a, 0x17, 0x0a, 0x35,
-	0x40, 0x63, 0xb4, 0x90, 0x77, 0x51, 0x2b, 0x2e, 0x25, 0xd6, 0x4c, 0xf0, 0x16, 0x1f, 0x5c, 0xc4,
-	0x35, 0xcb, 0xa9, 0xd2, 0x38, 0x2f, 0x1a, 0xc2, 0xe8, 0xb7, 0x1e, 0xe8, 0xcd, 0xb0, 0xc4, 0xb9,
-	0x82, 0x2e, 0xb8, 0x41, 0x39, 0x8e, 0x32, 0x1a, 0xbb, 0xce, 0xd0, 0x19, 0x6f, 0x85, 0x9d, 0x09,
-	0x4f, 0xc0, 0xc3, 0x28, 0x13, 0xe4, 0x54, 0xa1, 0x82, 0x4a, 0x14, 0x33, 0xa5, 0x25, 0x8b, 0x4a,
-	0xf3, 0x1b, 0xa4, 0x25, 0xe6, 0x2a, 0x67, 0x4a, 0x31, 0xc1, 0xdd, 0x4f, 0x86, 0xce, 0x78, 0x33,
-	0xbc, 0xdf, 0x70, 0x67, 0x54, 0x1e, 0xaf, 0x30, 0xe7, 0x2b, 0x44, 0xf8, 0x0d, 0xb8, 0x7f, 0xa9,
-	0x0a, 0x22, 0x29, 0xe6, 0x9c, 0x66, 0xee, 0xe6, 0xd0, 0x19, 0x6f, 0x87, 0x83, 0xf8, 0x12, 0x91,
-	0x69, 0x43, 0x83, 0x8f, 0xc1, 0x7e, 0x21, 0x45, 0xc5, 0x62, 0x2a, 0xd1, 0x82, 0x52, 0x54, 0x08,
-	0x91, 0x21, 0x1c, 0xc7, 0x12, 0x29, 0x2d, 0xdd, 0x6b, 0x56, 0x64, 0xaf, 0x63, 0x3c, 0xa5, 0x74,
-	0x26, 0x44, 0xf6, 0x24, 0x8e, 0xe5, 0x0b, 0x2d, 0xe1, 0x8f, 0x00, 0x12, 0x52, 0x21, 0x53, 0x14,
-	0x51, 0x6a, 0x93, 0x1d, 0x13, 0xb1, 0x7b, 0x7d, 0xe8, 0x8c, 0x77, 0x0e, 0xef, 0xf9, 0x4d, 0xed,
-	0xfc, 0xae, 0x76, 0xfe, 0x71, 0x5b, 0xdb, 0xc9, 0xd6, 0x9b, 0x77, 0x83, 0x8d, 0xdf, 0xff, 0x19,
-	0x38, 0xe1, 0x2d, 0x42, 0xaa, 0x79, 0xe3, 0x3d, 0xb3, 0xce, 0xf0, 0x17, 0x70, 0xd7, 0x66, 0xb3,
-	0xa0, 0xf2, 0xa2, 0x6e, 0xef, 0xea, 0xba, 0x9f, 0x75, 0x1a, 0xeb, 0xe2, 0xcf, 0xc0, 0xb0, 0x9b,
-	0x37, 0x24, 0xe9, 0x5a, 0x09, 0x17, 0x12, 0x13, 0xf3, 0x70, 0x6f, 0xd8, 0x8c, 0xbd, 0x8e, 0x17,
-	0xae, 0xd1, 0x9e, 0xb6, 0x2c, 0x78, 0x00, 0x60, 0xca, 0x94, 0x16, 0x92, 0x11, 0x9c, 0x21, 0xca,
-	0xb5, 0x64, 0x54, 0xb9, 0x5b, 0xb6, 0x81, 0xb7, 0xdf, 0x23, 0x5f, 0x37, 0x00, 0xfc, 0x01, 0xdc,
-	0x2a, 0x79, 0x24, 0x78, 0xcc, 0x78, 0xd2, 0xa5, 0xb3, 0x7d, 0xf5, 0x74, 0x3e, 0x5d, 0x3a, 0xb7,
-	0x89, 0x1c, 0x81, 0x3d, 0x25, 0x16, 0x1a, 0x89, 0x42, 0x23, 0x53, 0x21, 0x9d, 0x4a, 0xaa, 0x52,
-	0x91, 0xc5, 0x2e, 0xb0, 0xe1, 0xdf, 0x31, 0xe8, 0x49, 0xa1, 0x4f, 0x4a, 0x3d, 0xef, 0x20, 0xf8,
-	0x00, 0xdc, 0x94, 0xf4, 0x15, 0x96, 0x31, 0x8a, 0x29, 0x17, 0xb9, 0x72, 0x77, 0x86, 0x9b, 0xe3,
-	0xed, 0x70, 0xb7, 0xf9, 0x78, 0x6c, 0xbf, 0xc1, 0x2f, 0xc0, 0xb2, 0xd9, 0x68, 0x9d, 0xbd, 0x6b,
-	0xd9, 0xfd, 0x0e, 0x0d, 0x57, 0xbc, 0x46, 0x5f, 0x82, 0xcf, 0xbf, 0xc3, 0x4a, 0xaf, 0xce, 0xd7,
-	0xc4, 0x4c, 0xf1, 0x33, 0xca, 0x92, 0x54, 0xc3, 0x3d, 0xd0, 0x4b, 0xed, 0xcb, 0x6e, 0xc6, 0x66,
-	0xd8, 0x5a, 0xa3, 0x3f, 0x1c, 0x70, 0x67, 0x2a, 0x85, 0x52, 0x53, 0xb3, 0xf3, 0x2f, 0x71, 0xc6,
-	0x62, 0xac, 0x85, 0x34, 0xab, 0x64, 0x26, 0x90, 0x2a, 0x65, 0x1d, 0x76, 0xc3, 0xce, 0x84, 0x7d,
-	0x70, 0xbd, 0x10, 0xaf, 0xa8, 0x6c, 0x77, 0xa5, 0x31, 0x20, 0x06, 0xbd, 0xa2, 0x8c, 0x4e, 0x69,
-	0x6d, 0x87, 0x7e, 0xe7, 0xb0, 0xff, 0x41, 0x51, 0x9f, 0xf0, 0x7a, 0x72, 0xf4, 0xdf, 0xbb, 0xc1,
-	0xdd, 0x1a, 0xe7, 0xd9, 0xe3, 0x91, 0xe9, 0x2e, 0xe5, 0xaa, 0x54, 0xa8, 0xf1, 0x1b, 0xfd, 0xf5,
-	0xe7, 0x41, 0xbf, 0xbd, 0x0c, 0x44, 0xd6, 0x85, 0x16, 0xfe, 0xac, 0x8c, 0xbe, 0xa5, 0x75, 0xd8,
-	0x0a, 0x8f, 0x34, 0xb8, 0xfd, 0x3d, 0xd6, 0xa5, 0x64, 0x3c, 0x79, 0xf9, 0x62, 0x3a, 0xc3, 0xe4,
-	0x94, 0x6a, 0x13, 0x4d, 0xa5, 0xc8, 0xf3, 0x66, 0xe1, 0xaf, 0x85, 0x8d, 0x01, 0x9f, 0x83, 0x9b,
-	0xb9, 0xa5, 0xea, 0xda, 0x8e, 0xb0, 0x8d, 0x75, 0xe7, 0x70, 0xff, 0x83, 0xa0, 0xe6, 0xdd, 0x31,
-	0x69, 0x5a, 0xfd, 0xda, 0xb4, 0x7a, 0xb7, 0x73, 0x35, 0xe0, 0xe4, 0xa7, 0x37, 0x67, 0x9e, 0xf3,
-	0xf6, 0xcc, 0x73, 0xfe, 0x3d, 0xf3, 0x9c, 0xd7, 0xe7, 0xde, 0xc6, 0xdb, 0x73, 0x6f, 0xe3, 0xef,
-	0x73, 0x6f, 0xe3, 0xe7, 0xaf, 0x12, 0xa6, 0xd3, 0x32, 0xf2, 0x89, 0xc8, 0xdb, 0x93, 0x16, 0xbc,
-	0xbf, 0x9e, 0x07, 0xcb, 0xeb, 0x59, 0x1d, 0x05, 0xbf, 0xae, 0xdf, 0x66, 0x5d, 0x17, 0x54, 0x45,
-	0x3d, 0x1b, 0xc4, 0xd1, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x26, 0xe0, 0xb8, 0xdf, 0xcc, 0x05,
-	0x00, 0x00,
-}
-
-func (m *Params) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *Params) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if len(m.ProviderRewardDenoms) > 0 {
-		for iNdEx := len(m.ProviderRewardDenoms) - 1; iNdEx >= 0; iNdEx-- {
-			i -= len(m.ProviderRewardDenoms[iNdEx])
-			copy(dAtA[i:], m.ProviderRewardDenoms[iNdEx])
-			i = encodeVarintConsumer(dAtA, i, uint64(len(m.ProviderRewardDenoms[iNdEx])))
-			i--
-			dAtA[i] = 0x62
-		}
-	}
-	if len(m.RewardDenoms) > 0 {
-		for iNdEx := len(m.RewardDenoms) - 1; iNdEx >= 0; iNdEx-- {
-			i -= len(m.RewardDenoms[iNdEx])
-			copy(dAtA[i:], m.RewardDenoms[iNdEx])
-			i = encodeVarintConsumer(dAtA, i, uint64(len(m.RewardDenoms[iNdEx])))
-			i--
-			dAtA[i] = 0x5a
-		}
-	}
-	if len(m.SoftOptOutThreshold) > 0 {
-		i -= len(m.SoftOptOutThreshold)
-		copy(dAtA[i:], m.SoftOptOutThreshold)
-		i = encodeVarintConsumer(dAtA, i, uint64(len(m.SoftOptOutThreshold)))
-		i--
-		dAtA[i] = 0x52
-	}
-	n1, err1 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.UnbondingPeriod, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.UnbondingPeriod):])
-	if err1 != nil {
-		return 0, err1
-	}
-	i -= n1
-	i = encodeVarintConsumer(dAtA, i, uint64(n1))
-	i--
-	dAtA[i] = 0x4a
-	if m.HistoricalEntries != 0 {
-		i = encodeVarintConsumer(dAtA, i, uint64(m.HistoricalEntries))
-		i--
-		dAtA[i] = 0x40
-	}
-	if len(m.ConsumerRedistributionFraction) > 0 {
-		i -= len(m.ConsumerRedistributionFraction)
-		copy(dAtA[i:], m.ConsumerRedistributionFraction)
-		i = encodeVarintConsumer(dAtA, i, uint64(len(m.ConsumerRedistributionFraction)))
-		i--
-		dAtA[i] = 0x3a
-	}
-	n2, err2 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.TransferTimeoutPeriod, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.TransferTimeoutPeriod):])
-	if err2 != nil {
-		return 0, err2
-	}
-	i -= n2
-	i = encodeVarintConsumer(dAtA, i, uint64(n2))
-	i--
-	dAtA[i] = 0x32
-	n3, err3 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.CcvTimeoutPeriod, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.CcvTimeoutPeriod):])
-	if err3 != nil {
-		return 0, err3
-	}
-	i -= n3
-	i = encodeVarintConsumer(dAtA, i, uint64(n3))
-	i--
-	dAtA[i] = 0x2a
-	if len(m.ProviderFeePoolAddrStr) > 0 {
-		i -= len(m.ProviderFeePoolAddrStr)
-		copy(dAtA[i:], m.ProviderFeePoolAddrStr)
-		i = encodeVarintConsumer(dAtA, i, uint64(len(m.ProviderFeePoolAddrStr)))
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.DistributionTransmissionChannel) > 0 {
-		i -= len(m.DistributionTransmissionChannel)
-		copy(dAtA[i:], m.DistributionTransmissionChannel)
-		i = encodeVarintConsumer(dAtA, i, uint64(len(m.DistributionTransmissionChannel)))
-		i--
-		dAtA[i] = 0x1a
-	}
-	if m.BlocksPerDistributionTransmission != 0 {
-		i = encodeVarintConsumer(dAtA, i, uint64(m.BlocksPerDistributionTransmission))
-		i--
-		dAtA[i] = 0x10
-	}
-	if m.Enabled {
-		i--
-		if m.Enabled {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i--
-		dAtA[i] = 0x8
-	}
-	return len(dAtA) - i, nil
+	// 458 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x41, 0x6e, 0xd3, 0x40,
+	0x14, 0x8d, 0x29, 0x04, 0x34, 0x2d, 0x0b, 0x4c, 0x04, 0x21, 0x48, 0x4e, 0x65, 0x84, 0xd4, 0x4d,
+	0x3d, 0x4a, 0x22, 0x36, 0x48, 0x2c, 0x48, 0x36, 0x54, 0x80, 0x54, 0x99, 0xaa, 0x48, 0x6c, 0xa2,
+	0xf1, 0x78, 0x70, 0x46, 0x89, 0x67, 0xac, 0xf9, 0x33, 0x2e, 0x73, 0x8b, 0x1e, 0x83, 0x03, 0x70,
+	0x88, 0x8a, 0x55, 0x97, 0xac, 0x0a, 0x4a, 0x6e, 0xc0, 0x09, 0x90, 0xc7, 0x76, 0x10, 0x05, 0x76,
+	0xff, 0xe9, 0xfd, 0xf7, 0xf4, 0xe6, 0xcd, 0x47, 0x63, 0x2e, 0x34, 0x53, 0x74, 0x41, 0xb8, 0x98,
+	0x03, 0xa3, 0x46, 0x71, 0x6d, 0x31, 0xa5, 0x25, 0xa6, 0x52, 0x80, 0xc9, 0x99, 0xc2, 0xe5, 0x68,
+	0x3b, 0x47, 0x85, 0x92, 0x5a, 0xfa, 0x4f, 0xfe, 0xa1, 0x89, 0x28, 0x2d, 0xa3, 0xed, 0x5e, 0x39,
+	0x1a, 0x3c, 0xfd, 0x9f, 0x71, 0x39, 0xc2, 0x67, 0x5c, 0xb1, 0xda, 0x6b, 0xf0, 0x28, 0x93, 0x32,
+	0x5b, 0x31, 0xec, 0x50, 0x62, 0x3e, 0x62, 0x22, 0x6c, 0x43, 0xf5, 0x32, 0x99, 0x49, 0x37, 0xe2,
+	0x6a, 0x6a, 0x05, 0x54, 0x42, 0x2e, 0x61, 0x5e, 0x13, 0x35, 0x68, 0xa8, 0xe0, 0xba, 0x57, 0x6a,
+	0x14, 0xd1, 0x5c, 0x8a, 0x86, 0x1f, 0x5e, 0xe7, 0x35, 0xcf, 0x19, 0x68, 0x92, 0x17, 0xf5, 0x42,
+	0xf8, 0x0c, 0x3d, 0x7e, 0x43, 0x40, 0x9f, 0x28, 0x22, 0x20, 0xe7, 0x00, 0x5c, 0x8a, 0xe9, 0x4a,
+	0xd2, 0xe5, 0x2b, 0xc6, 0xb3, 0x85, 0xf6, 0x1f, 0xa0, 0xee, 0xc2, 0x4d, 0x7d, 0x6f, 0xdf, 0x3b,
+	0xd8, 0x89, 0x1b, 0x14, 0x7e, 0xf6, 0xd0, 0xfd, 0x99, 0x92, 0x00, 0xb3, 0xea, 0xb5, 0xa7, 0x64,
+	0xc5, 0x53, 0xa2, 0xa5, 0xf2, 0xfb, 0xe8, 0x36, 0x49, 0x53, 0xc5, 0x00, 0x9c, 0x60, 0x2f, 0x6e,
+	0xa1, 0xdf, 0x43, 0xb7, 0x0a, 0x79, 0xc6, 0x54, 0xff, 0x86, 0x33, 0xaa, 0x81, 0x4f, 0x50, 0xb7,
+	0x30, 0xc9, 0x92, 0xd9, 0xfe, 0xce, 0xbe, 0x77, 0xb0, 0x3b, 0xee, 0x45, 0x75, 0xe0, 0xa8, 0x0d,
+	0x1c, 0xbd, 0x14, 0x76, 0x3a, 0xf9, 0x79, 0x35, 0x7c, 0x68, 0x49, 0xbe, 0x7a, 0x1e, 0x56, 0x7d,
+	0x33, 0x01, 0x06, 0xe6, 0xb5, 0x2e, 0xfc, 0xfa, 0xe5, 0xb0, 0xd7, 0x54, 0x42, 0x95, 0x2d, 0xb4,
+	0x8c, 0x8e, 0x4d, 0xf2, 0x9a, 0xd9, 0xb8, 0x31, 0x0e, 0x35, 0xba, 0xf7, 0x96, 0x68, 0xa3, 0xb8,
+	0xc8, 0x4e, 0xdf, 0xcd, 0x8e, 0x09, 0x5d, 0x32, 0x5d, 0xa5, 0x29, 0x81, 0x1e, 0xa5, 0x2e, 0xe5,
+	0xcd, 0xb8, 0x06, 0xfe, 0x11, 0xba, 0x9b, 0xbb, 0x55, 0x6d, 0xe7, 0x55, 0x51, 0x2e, 0xeb, 0xee,
+	0x78, 0xf0, 0x57, 0xa8, 0x93, 0xb6, 0xc5, 0xe9, 0x9d, 0x8b, 0xab, 0x61, 0xe7, 0xfc, 0xfb, 0xd0,
+	0x8b, 0xf7, 0x5a, 0x69, 0x45, 0x4e, 0xdf, 0x5f, 0xac, 0x03, 0xef, 0x72, 0x1d, 0x78, 0x3f, 0xd6,
+	0x81, 0x77, 0xbe, 0x09, 0x3a, 0x97, 0x9b, 0xa0, 0xf3, 0x6d, 0x13, 0x74, 0x3e, 0xbc, 0xc8, 0xb8,
+	0x5e, 0x98, 0x24, 0xa2, 0x32, 0x6f, 0xfe, 0x12, 0xff, 0xbe, 0x9b, 0xc3, 0xed, 0xdd, 0x94, 0x13,
+	0xfc, 0xe9, 0xcf, 0xab, 0xd4, 0xb6, 0x60, 0x90, 0x74, 0x5d, 0x88, 0xc9, 0xaf, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xc7, 0xac, 0x19, 0xc6, 0x02, 0x00, 0x00,
 }
 
 func (m *LastTransmissionBlockHeight) Marshal() (dAtA []byte, err error) {
@@ -627,12 +337,12 @@ func (m *MaturingVSCPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	n5, err5 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.MaturityTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.MaturityTime):])
-	if err5 != nil {
-		return 0, err5
+	n2, err2 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.MaturityTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.MaturityTime):])
+	if err2 != nil {
+		return 0, err2
 	}
-	i -= n5
-	i = encodeVarintConsumer(dAtA, i, uint64(n5))
+	i -= n2
+	i = encodeVarintConsumer(dAtA, i, uint64(n2))
 	i--
 	dAtA[i] = 0x12
 	if m.VscId != 0 {
@@ -654,58 +364,6 @@ func encodeVarintConsumer(dAtA []byte, offset int, v uint64) int {
 	dAtA[offset] = uint8(v)
 	return base
 }
-func (m *Params) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.Enabled {
-		n += 2
-	}
-	if m.BlocksPerDistributionTransmission != 0 {
-		n += 1 + sovConsumer(uint64(m.BlocksPerDistributionTransmission))
-	}
-	l = len(m.DistributionTransmissionChannel)
-	if l > 0 {
-		n += 1 + l + sovConsumer(uint64(l))
-	}
-	l = len(m.ProviderFeePoolAddrStr)
-	if l > 0 {
-		n += 1 + l + sovConsumer(uint64(l))
-	}
-	l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.CcvTimeoutPeriod)
-	n += 1 + l + sovConsumer(uint64(l))
-	l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.TransferTimeoutPeriod)
-	n += 1 + l + sovConsumer(uint64(l))
-	l = len(m.ConsumerRedistributionFraction)
-	if l > 0 {
-		n += 1 + l + sovConsumer(uint64(l))
-	}
-	if m.HistoricalEntries != 0 {
-		n += 1 + sovConsumer(uint64(m.HistoricalEntries))
-	}
-	l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.UnbondingPeriod)
-	n += 1 + l + sovConsumer(uint64(l))
-	l = len(m.SoftOptOutThreshold)
-	if l > 0 {
-		n += 1 + l + sovConsumer(uint64(l))
-	}
-	if len(m.RewardDenoms) > 0 {
-		for _, s := range m.RewardDenoms {
-			l = len(s)
-			n += 1 + l + sovConsumer(uint64(l))
-		}
-	}
-	if len(m.ProviderRewardDenoms) > 0 {
-		for _, s := range m.ProviderRewardDenoms {
-			l = len(s)
-			n += 1 + l + sovConsumer(uint64(l))
-		}
-	}
-	return n
-}
-
 func (m *LastTransmissionBlockHeight) Size() (n int) {
 	if m == nil {
 		return 0
@@ -758,405 +416,6 @@ func sovConsumer(x uint64) (n int) {
 func sozConsumer(x uint64) (n int) {
 	return sovConsumer(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
-func (m *Params) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowConsumer
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: Params: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Enabled", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.Enabled = bool(v != 0)
-		case 2:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field BlocksPerDistributionTransmission", wireType)
-			}
-			m.BlocksPerDistributionTransmission = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.BlocksPerDistributionTransmission |= int64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field DistributionTransmissionChannel", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				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 ErrInvalidLengthConsumer
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.DistributionTransmissionChannel = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 4:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ProviderFeePoolAddrStr", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				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 ErrInvalidLengthConsumer
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.ProviderFeePoolAddrStr = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 5:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field CcvTimeoutPeriod", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.CcvTimeoutPeriod, dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 6:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field TransferTimeoutPeriod", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.TransferTimeoutPeriod, dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 7:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ConsumerRedistributionFraction", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				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 ErrInvalidLengthConsumer
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.ConsumerRedistributionFraction = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 8:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field HistoricalEntries", wireType)
-			}
-			m.HistoricalEntries = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.HistoricalEntries |= int64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 9:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field UnbondingPeriod", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.UnbondingPeriod, dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 10:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field SoftOptOutThreshold", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				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 ErrInvalidLengthConsumer
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.SoftOptOutThreshold = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 11:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field RewardDenoms", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				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 ErrInvalidLengthConsumer
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.RewardDenoms = append(m.RewardDenoms, string(dAtA[iNdEx:postIndex]))
-			iNdEx = postIndex
-		case 12:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ProviderRewardDenoms", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				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 ErrInvalidLengthConsumer
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.ProviderRewardDenoms = append(m.ProviderRewardDenoms, string(dAtA[iNdEx:postIndex]))
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipConsumer(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
 func (m *LastTransmissionBlockHeight) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/x/ccv/consumer/types/genesis.pb.go b/x/ccv/consumer/types/genesis.pb.go
deleted file mode 100644
index 7a503f0e77..0000000000
--- a/x/ccv/consumer/types/genesis.pb.go
+++ /dev/null
@@ -1,1394 +0,0 @@
-// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: interchain_security/ccv/consumer/v1/genesis.proto
-
-package types
-
-import (
-	fmt "fmt"
-	types "github.com/cometbft/cometbft/abci/types"
-	_ "github.com/cosmos/gogoproto/gogoproto"
-	proto "github.com/cosmos/gogoproto/proto"
-	_ "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
-	_07_tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
-	types1 "github.com/cosmos/interchain-security/v3/x/ccv/types"
-	_ "google.golang.org/protobuf/types/known/durationpb"
-	io "io"
-	math "math"
-	math_bits "math/bits"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
-
-// GenesisState defines the CCV consumer chain genesis state
-type GenesisState struct {
-	Params            Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
-	ProviderClientId  string `protobuf:"bytes,2,opt,name=provider_client_id,json=providerClientId,proto3" json:"provider_client_id,omitempty"`
-	ProviderChannelId string `protobuf:"bytes,3,opt,name=provider_channel_id,json=providerChannelId,proto3" json:"provider_channel_id,omitempty"`
-	NewChain          bool   `protobuf:"varint,4,opt,name=new_chain,json=newChain,proto3" json:"new_chain,omitempty"`
-	// ProviderClientState filled in on new chain, nil on restart.
-	ProviderClientState *_07_tendermint.ClientState `protobuf:"bytes,5,opt,name=provider_client_state,json=providerClientState,proto3" json:"provider_client_state,omitempty"`
-	// ProviderConsensusState filled in on new chain, nil on restart.
-	ProviderConsensusState *_07_tendermint.ConsensusState `protobuf:"bytes,6,opt,name=provider_consensus_state,json=providerConsensusState,proto3" json:"provider_consensus_state,omitempty"`
-	// MaturingPackets nil on new chain, filled in on restart.
-	MaturingPackets []MaturingVSCPacket `protobuf:"bytes,7,rep,name=maturing_packets,json=maturingPackets,proto3" json:"maturing_packets"`
-	// InitialValset filled in on new chain and on restart.
-	InitialValSet []types.ValidatorUpdate `protobuf:"bytes,8,rep,name=initial_val_set,json=initialValSet,proto3" json:"initial_val_set"`
-	// HeightToValsetUpdateId nil on new chain, filled in on restart.
-	HeightToValsetUpdateId []HeightToValsetUpdateID `protobuf:"bytes,9,rep,name=height_to_valset_update_id,json=heightToValsetUpdateId,proto3" json:"height_to_valset_update_id"`
-	// OutstandingDowntimes nil on new chain, filled  in on restart.
-	OutstandingDowntimeSlashing []OutstandingDowntime `protobuf:"bytes,10,rep,name=outstanding_downtime_slashing,json=outstandingDowntimeSlashing,proto3" json:"outstanding_downtime_slashing"`
-	// PendingConsumerPackets nil on new chain, filled in on restart.
-	PendingConsumerPackets types1.ConsumerPacketDataList `protobuf:"bytes,11,opt,name=pending_consumer_packets,json=pendingConsumerPackets,proto3" json:"pending_consumer_packets"`
-	// LastTransmissionBlockHeight nil on new chain, filled in on restart.
-	LastTransmissionBlockHeight LastTransmissionBlockHeight `protobuf:"bytes,12,opt,name=last_transmission_block_height,json=lastTransmissionBlockHeight,proto3" json:"last_transmission_block_height"`
-	PreCCV                      bool                        `protobuf:"varint,13,opt,name=preCCV,proto3" json:"preCCV,omitempty"`
-}
-
-func (m *GenesisState) Reset()         { *m = GenesisState{} }
-func (m *GenesisState) String() string { return proto.CompactTextString(m) }
-func (*GenesisState) ProtoMessage()    {}
-func (*GenesisState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2db73a6057a27482, []int{0}
-}
-func (m *GenesisState) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *GenesisState) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenesisState.Merge(m, src)
-}
-func (m *GenesisState) XXX_Size() int {
-	return m.Size()
-}
-func (m *GenesisState) XXX_DiscardUnknown() {
-	xxx_messageInfo_GenesisState.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_GenesisState proto.InternalMessageInfo
-
-func (m *GenesisState) GetParams() Params {
-	if m != nil {
-		return m.Params
-	}
-	return Params{}
-}
-
-func (m *GenesisState) GetProviderClientId() string {
-	if m != nil {
-		return m.ProviderClientId
-	}
-	return ""
-}
-
-func (m *GenesisState) GetProviderChannelId() string {
-	if m != nil {
-		return m.ProviderChannelId
-	}
-	return ""
-}
-
-func (m *GenesisState) GetNewChain() bool {
-	if m != nil {
-		return m.NewChain
-	}
-	return false
-}
-
-func (m *GenesisState) GetProviderClientState() *_07_tendermint.ClientState {
-	if m != nil {
-		return m.ProviderClientState
-	}
-	return nil
-}
-
-func (m *GenesisState) GetProviderConsensusState() *_07_tendermint.ConsensusState {
-	if m != nil {
-		return m.ProviderConsensusState
-	}
-	return nil
-}
-
-func (m *GenesisState) GetMaturingPackets() []MaturingVSCPacket {
-	if m != nil {
-		return m.MaturingPackets
-	}
-	return nil
-}
-
-func (m *GenesisState) GetInitialValSet() []types.ValidatorUpdate {
-	if m != nil {
-		return m.InitialValSet
-	}
-	return nil
-}
-
-func (m *GenesisState) GetHeightToValsetUpdateId() []HeightToValsetUpdateID {
-	if m != nil {
-		return m.HeightToValsetUpdateId
-	}
-	return nil
-}
-
-func (m *GenesisState) GetOutstandingDowntimeSlashing() []OutstandingDowntime {
-	if m != nil {
-		return m.OutstandingDowntimeSlashing
-	}
-	return nil
-}
-
-func (m *GenesisState) GetPendingConsumerPackets() types1.ConsumerPacketDataList {
-	if m != nil {
-		return m.PendingConsumerPackets
-	}
-	return types1.ConsumerPacketDataList{}
-}
-
-func (m *GenesisState) GetLastTransmissionBlockHeight() LastTransmissionBlockHeight {
-	if m != nil {
-		return m.LastTransmissionBlockHeight
-	}
-	return LastTransmissionBlockHeight{}
-}
-
-func (m *GenesisState) GetPreCCV() bool {
-	if m != nil {
-		return m.PreCCV
-	}
-	return false
-}
-
-// HeightValsetUpdateID defines the genesis information for the mapping
-// of each block height to a valset update id
-type HeightToValsetUpdateID struct {
-	Height         uint64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"`
-	ValsetUpdateId uint64 `protobuf:"varint,2,opt,name=valset_update_id,json=valsetUpdateId,proto3" json:"valset_update_id,omitempty"`
-}
-
-func (m *HeightToValsetUpdateID) Reset()         { *m = HeightToValsetUpdateID{} }
-func (m *HeightToValsetUpdateID) String() string { return proto.CompactTextString(m) }
-func (*HeightToValsetUpdateID) ProtoMessage()    {}
-func (*HeightToValsetUpdateID) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2db73a6057a27482, []int{1}
-}
-func (m *HeightToValsetUpdateID) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *HeightToValsetUpdateID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_HeightToValsetUpdateID.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *HeightToValsetUpdateID) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HeightToValsetUpdateID.Merge(m, src)
-}
-func (m *HeightToValsetUpdateID) XXX_Size() int {
-	return m.Size()
-}
-func (m *HeightToValsetUpdateID) XXX_DiscardUnknown() {
-	xxx_messageInfo_HeightToValsetUpdateID.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_HeightToValsetUpdateID proto.InternalMessageInfo
-
-func (m *HeightToValsetUpdateID) GetHeight() uint64 {
-	if m != nil {
-		return m.Height
-	}
-	return 0
-}
-
-func (m *HeightToValsetUpdateID) GetValsetUpdateId() uint64 {
-	if m != nil {
-		return m.ValsetUpdateId
-	}
-	return 0
-}
-
-// OutstandingDowntime defines the genesis information for each validator
-// flagged with an outstanding downtime slashing.
-type OutstandingDowntime struct {
-	ValidatorConsensusAddress string `protobuf:"bytes,1,opt,name=validator_consensus_address,json=validatorConsensusAddress,proto3" json:"validator_consensus_address,omitempty"`
-}
-
-func (m *OutstandingDowntime) Reset()         { *m = OutstandingDowntime{} }
-func (m *OutstandingDowntime) String() string { return proto.CompactTextString(m) }
-func (*OutstandingDowntime) ProtoMessage()    {}
-func (*OutstandingDowntime) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2db73a6057a27482, []int{2}
-}
-func (m *OutstandingDowntime) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *OutstandingDowntime) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_OutstandingDowntime.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *OutstandingDowntime) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_OutstandingDowntime.Merge(m, src)
-}
-func (m *OutstandingDowntime) XXX_Size() int {
-	return m.Size()
-}
-func (m *OutstandingDowntime) XXX_DiscardUnknown() {
-	xxx_messageInfo_OutstandingDowntime.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_OutstandingDowntime proto.InternalMessageInfo
-
-func (m *OutstandingDowntime) GetValidatorConsensusAddress() string {
-	if m != nil {
-		return m.ValidatorConsensusAddress
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*GenesisState)(nil), "interchain_security.ccv.consumer.v1.GenesisState")
-	proto.RegisterType((*HeightToValsetUpdateID)(nil), "interchain_security.ccv.consumer.v1.HeightToValsetUpdateID")
-	proto.RegisterType((*OutstandingDowntime)(nil), "interchain_security.ccv.consumer.v1.OutstandingDowntime")
-}
-
-func init() {
-	proto.RegisterFile("interchain_security/ccv/consumer/v1/genesis.proto", fileDescriptor_2db73a6057a27482)
-}
-
-var fileDescriptor_2db73a6057a27482 = []byte{
-	// 786 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x4b, 0x8f, 0xe3, 0x34,
-	0x1c, 0x6f, 0x76, 0x87, 0xd2, 0x7a, 0x76, 0xd9, 0xc1, 0x03, 0x55, 0x68, 0x45, 0x28, 0x03, 0x87,
-	0x4a, 0x40, 0xac, 0x76, 0x25, 0x84, 0x84, 0x40, 0x30, 0x1d, 0x09, 0x2a, 0x2d, 0xb0, 0x6a, 0x77,
-	0x8b, 0xb4, 0x97, 0xc8, 0x75, 0x4c, 0x62, 0x6d, 0x62, 0x47, 0xb6, 0x93, 0x61, 0x0f, 0x5c, 0xb8,
-	0x72, 0xe1, 0x63, 0xed, 0x71, 0x8f, 0x9c, 0x10, 0x9a, 0xf9, 0x0e, 0x9c, 0x51, 0x6c, 0xa7, 0x0f,
-	0xa6, 0xa3, 0xed, 0x29, 0x71, 0xfe, 0xbf, 0xc7, 0xff, 0xe1, 0xd8, 0x60, 0xcc, 0xb8, 0xa6, 0x92,
-	0xa4, 0x98, 0xf1, 0x48, 0x51, 0x52, 0x4a, 0xa6, 0x5f, 0x20, 0x42, 0x2a, 0x44, 0x04, 0x57, 0x65,
-	0x4e, 0x25, 0xaa, 0xc6, 0x28, 0xa1, 0x9c, 0x2a, 0xa6, 0xc2, 0x42, 0x0a, 0x2d, 0xe0, 0x47, 0x7b,
-	0x28, 0x21, 0x21, 0x55, 0xd8, 0x50, 0xc2, 0x6a, 0xdc, 0xff, 0xf8, 0x36, 0xdd, 0x6a, 0x5c, 0x3f,
-	0xac, 0x54, 0x7f, 0x72, 0x88, 0xfb, 0x5a, 0xd6, 0x72, 0x06, 0x9a, 0xf2, 0x98, 0xca, 0x9c, 0x71,
-	0x8d, 0xf0, 0x8a, 0x30, 0xa4, 0x5f, 0x14, 0xd4, 0xe5, 0xd6, 0x47, 0x6c, 0x45, 0x50, 0xc6, 0x92,
-	0x54, 0x93, 0x8c, 0x51, 0xae, 0x15, 0xda, 0x42, 0x57, 0xe3, 0xad, 0x95, 0x23, 0x7c, 0x58, 0x13,
-	0x88, 0x90, 0x14, 0x91, 0x14, 0x73, 0x4e, 0x33, 0xe3, 0x68, 0x5f, 0x1d, 0x24, 0x48, 0x84, 0x48,
-	0x32, 0x8a, 0xcc, 0x6a, 0x55, 0xfe, 0x82, 0xe2, 0x52, 0x62, 0xcd, 0x04, 0x77, 0xf1, 0x77, 0x12,
-	0x91, 0x08, 0xf3, 0x8a, 0xea, 0x37, 0xfb, 0xf5, 0xec, 0xdf, 0x0e, 0xb8, 0xf7, 0x9d, 0xed, 0xdb,
-	0x42, 0x63, 0x4d, 0xe1, 0x0c, 0xb4, 0x0b, 0x2c, 0x71, 0xae, 0x7c, 0x6f, 0xe8, 0x8d, 0x8e, 0x27,
-	0x9f, 0x84, 0x07, 0xf4, 0x31, 0x7c, 0x6c, 0x28, 0xe7, 0x47, 0x2f, 0xff, 0xfe, 0xa0, 0x35, 0x77,
-	0x02, 0xf0, 0x53, 0x00, 0x0b, 0x29, 0x2a, 0x16, 0x53, 0x19, 0xd9, 0x3a, 0x23, 0x16, 0xfb, 0x77,
-	0x86, 0xde, 0xa8, 0x3b, 0x3f, 0x69, 0x22, 0x53, 0x13, 0x98, 0xc5, 0x30, 0x04, 0xa7, 0x1b, 0xb4,
-	0xad, 0xac, 0x86, 0xdf, 0x35, 0xf0, 0xb7, 0xd7, 0x70, 0x1b, 0x99, 0xc5, 0x70, 0x00, 0xba, 0x9c,
-	0x5e, 0x46, 0x26, 0x31, 0xff, 0x68, 0xe8, 0x8d, 0x3a, 0xf3, 0x0e, 0xa7, 0x97, 0xd3, 0x7a, 0x0d,
-	0x23, 0xf0, 0xee, 0xff, 0xad, 0x55, 0x5d, 0x9e, 0xff, 0x46, 0x53, 0xd4, 0x8a, 0x84, 0xdb, 0x03,
-	0x08, 0xb7, 0x5a, 0x5e, 0x8d, 0x43, 0x9b, 0x95, 0xe9, 0xc8, 0xfc, 0x74, 0x37, 0x55, 0xdb, 0xa6,
-	0x14, 0xf8, 0x1b, 0x03, 0xc1, 0x15, 0xe5, 0xaa, 0x54, 0xce, 0xa3, 0x6d, 0x3c, 0xc2, 0xd7, 0x7a,
-	0x34, 0x34, 0x6b, 0xd3, 0x5b, 0xdb, 0xec, 0x7c, 0x87, 0x09, 0x38, 0xc9, 0xb1, 0x2e, 0x25, 0xe3,
-	0x49, 0x54, 0x60, 0xf2, 0x9c, 0x6a, 0xe5, 0xbf, 0x39, 0xbc, 0x3b, 0x3a, 0x9e, 0x7c, 0x7e, 0xd0,
-	0x68, 0x7e, 0x70, 0xe4, 0xe5, 0x62, 0xfa, 0xd8, 0xd0, 0xdd, 0x94, 0x1e, 0x34, 0xaa, 0xf6, 0xab,
-	0x82, 0x3f, 0x82, 0x07, 0x8c, 0x33, 0xcd, 0x70, 0x16, 0x55, 0x38, 0x8b, 0x14, 0xd5, 0x7e, 0xc7,
-	0xf8, 0x0c, 0xb7, 0x13, 0xaf, 0xf7, 0x72, 0xb8, 0xc4, 0x19, 0x8b, 0xb1, 0x16, 0xf2, 0x69, 0x11,
-	0x63, 0x4d, 0x9d, 0xe2, 0x7d, 0x47, 0x5f, 0xe2, 0x6c, 0x41, 0x35, 0xfc, 0x0d, 0xf4, 0x53, 0x5a,
-	0x97, 0x1f, 0x69, 0x51, 0x2b, 0x2a, 0xaa, 0xa3, 0xd2, 0xe0, 0xeb, 0xb9, 0x76, 0x8d, 0xf4, 0x97,
-	0x07, 0x95, 0xf0, 0xbd, 0x91, 0x79, 0x22, 0x96, 0x46, 0xc4, 0x7a, 0xce, 0x2e, 0x9c, 0x6b, 0x2f,
-	0xdd, 0x17, 0x8d, 0xe1, 0xef, 0x1e, 0x78, 0x5f, 0x94, 0x5a, 0x69, 0xcc, 0xe3, 0xba, 0x77, 0xb1,
-	0xb8, 0xe4, 0x9a, 0xe5, 0x34, 0x52, 0x19, 0x56, 0x29, 0xe3, 0x89, 0x0f, 0x4c, 0x0a, 0x5f, 0x1c,
-	0x94, 0xc2, 0x4f, 0x1b, 0xa5, 0x0b, 0x27, 0xe4, 0xfc, 0x07, 0xe2, 0x66, 0x68, 0xe1, 0x2c, 0xa0,
-	0x04, 0x7e, 0x41, 0xad, 0x7f, 0xa3, 0xb6, 0x1e, 0xe2, 0xb1, 0xd9, 0x26, 0x93, 0x5b, 0xed, 0xdd,
-	0x16, 0xa9, 0x39, 0x76, 0x44, 0x17, 0x58, 0xe3, 0x47, 0x4c, 0x35, 0x03, 0xec, 0x39, 0xe5, 0x5d,
-	0x90, 0x82, 0x7f, 0x78, 0x20, 0xc8, 0xb0, 0xd2, 0x91, 0x96, 0x98, 0xab, 0x9c, 0x29, 0xc5, 0x04,
-	0x8f, 0x56, 0x99, 0x20, 0xcf, 0x23, 0xdb, 0x2b, 0xff, 0x9e, 0xb1, 0xfe, 0xe6, 0xa0, 0xca, 0x1f,
-	0x61, 0xa5, 0x9f, 0x6c, 0x29, 0x9d, 0xd7, 0x42, 0x76, 0x22, 0x4d, 0x07, 0xb2, 0xdb, 0x21, 0xb0,
-	0x07, 0xda, 0x85, 0xa4, 0xd3, 0xe9, 0xd2, 0xbf, 0x6f, 0xfe, 0x51, 0xb7, 0x3a, 0x7b, 0x06, 0x7a,
-	0xfb, 0xc7, 0x5a, 0x33, 0x5c, 0x9a, 0xf5, 0x09, 0x74, 0x34, 0x77, 0x2b, 0x38, 0x02, 0x27, 0x37,
-	0x76, 0xd1, 0x1d, 0x83, 0x78, 0xab, 0xda, 0x19, 0xfd, 0xd9, 0x53, 0x70, 0xba, 0x67, 0x5e, 0xf0,
-	0x6b, 0x30, 0xa8, 0x9a, 0x8d, 0xbb, 0xf5, 0xd3, 0xe2, 0x38, 0x96, 0x54, 0xd9, 0xf3, 0xae, 0x3b,
-	0x7f, 0x6f, 0x0d, 0x59, 0xff, 0x87, 0xdf, 0x5a, 0xc0, 0xf9, 0xcf, 0x2f, 0xaf, 0x02, 0xef, 0xd5,
-	0x55, 0xe0, 0xfd, 0x73, 0x15, 0x78, 0x7f, 0x5e, 0x07, 0xad, 0x57, 0xd7, 0x41, 0xeb, 0xaf, 0xeb,
-	0xa0, 0xf5, 0xec, 0xab, 0x84, 0xe9, 0xb4, 0x5c, 0x85, 0x44, 0xe4, 0x88, 0x08, 0x95, 0x0b, 0x85,
-	0x36, 0xad, 0xfd, 0x6c, 0x7d, 0x65, 0x54, 0x0f, 0xd1, 0xaf, 0xbb, 0xf7, 0x86, 0xb9, 0x14, 0x56,
-	0x6d, 0x73, 0x16, 0x3f, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x8e, 0xd4, 0xcb, 0xc1, 0xe6, 0x06,
-	0x00, 0x00,
-}
-
-func (m *GenesisState) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *GenesisState) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.PreCCV {
-		i--
-		if m.PreCCV {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i--
-		dAtA[i] = 0x68
-	}
-	{
-		size, err := m.LastTransmissionBlockHeight.MarshalToSizedBuffer(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = encodeVarintGenesis(dAtA, i, uint64(size))
-	}
-	i--
-	dAtA[i] = 0x62
-	{
-		size, err := m.PendingConsumerPackets.MarshalToSizedBuffer(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = encodeVarintGenesis(dAtA, i, uint64(size))
-	}
-	i--
-	dAtA[i] = 0x5a
-	if len(m.OutstandingDowntimeSlashing) > 0 {
-		for iNdEx := len(m.OutstandingDowntimeSlashing) - 1; iNdEx >= 0; iNdEx-- {
-			{
-				size, err := m.OutstandingDowntimeSlashing[iNdEx].MarshalToSizedBuffer(dAtA[:i])
-				if err != nil {
-					return 0, err
-				}
-				i -= size
-				i = encodeVarintGenesis(dAtA, i, uint64(size))
-			}
-			i--
-			dAtA[i] = 0x52
-		}
-	}
-	if len(m.HeightToValsetUpdateId) > 0 {
-		for iNdEx := len(m.HeightToValsetUpdateId) - 1; iNdEx >= 0; iNdEx-- {
-			{
-				size, err := m.HeightToValsetUpdateId[iNdEx].MarshalToSizedBuffer(dAtA[:i])
-				if err != nil {
-					return 0, err
-				}
-				i -= size
-				i = encodeVarintGenesis(dAtA, i, uint64(size))
-			}
-			i--
-			dAtA[i] = 0x4a
-		}
-	}
-	if len(m.InitialValSet) > 0 {
-		for iNdEx := len(m.InitialValSet) - 1; iNdEx >= 0; iNdEx-- {
-			{
-				size, err := m.InitialValSet[iNdEx].MarshalToSizedBuffer(dAtA[:i])
-				if err != nil {
-					return 0, err
-				}
-				i -= size
-				i = encodeVarintGenesis(dAtA, i, uint64(size))
-			}
-			i--
-			dAtA[i] = 0x42
-		}
-	}
-	if len(m.MaturingPackets) > 0 {
-		for iNdEx := len(m.MaturingPackets) - 1; iNdEx >= 0; iNdEx-- {
-			{
-				size, err := m.MaturingPackets[iNdEx].MarshalToSizedBuffer(dAtA[:i])
-				if err != nil {
-					return 0, err
-				}
-				i -= size
-				i = encodeVarintGenesis(dAtA, i, uint64(size))
-			}
-			i--
-			dAtA[i] = 0x3a
-		}
-	}
-	if m.ProviderConsensusState != nil {
-		{
-			size, err := m.ProviderConsensusState.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintGenesis(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x32
-	}
-	if m.ProviderClientState != nil {
-		{
-			size, err := m.ProviderClientState.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintGenesis(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x2a
-	}
-	if m.NewChain {
-		i--
-		if m.NewChain {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i--
-		dAtA[i] = 0x20
-	}
-	if len(m.ProviderChannelId) > 0 {
-		i -= len(m.ProviderChannelId)
-		copy(dAtA[i:], m.ProviderChannelId)
-		i = encodeVarintGenesis(dAtA, i, uint64(len(m.ProviderChannelId)))
-		i--
-		dAtA[i] = 0x1a
-	}
-	if len(m.ProviderClientId) > 0 {
-		i -= len(m.ProviderClientId)
-		copy(dAtA[i:], m.ProviderClientId)
-		i = encodeVarintGenesis(dAtA, i, uint64(len(m.ProviderClientId)))
-		i--
-		dAtA[i] = 0x12
-	}
-	{
-		size, err := m.Params.MarshalToSizedBuffer(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = encodeVarintGenesis(dAtA, i, uint64(size))
-	}
-	i--
-	dAtA[i] = 0xa
-	return len(dAtA) - i, nil
-}
-
-func (m *HeightToValsetUpdateID) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *HeightToValsetUpdateID) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *HeightToValsetUpdateID) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.ValsetUpdateId != 0 {
-		i = encodeVarintGenesis(dAtA, i, uint64(m.ValsetUpdateId))
-		i--
-		dAtA[i] = 0x10
-	}
-	if m.Height != 0 {
-		i = encodeVarintGenesis(dAtA, i, uint64(m.Height))
-		i--
-		dAtA[i] = 0x8
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *OutstandingDowntime) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *OutstandingDowntime) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *OutstandingDowntime) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if len(m.ValidatorConsensusAddress) > 0 {
-		i -= len(m.ValidatorConsensusAddress)
-		copy(dAtA[i:], m.ValidatorConsensusAddress)
-		i = encodeVarintGenesis(dAtA, i, uint64(len(m.ValidatorConsensusAddress)))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
-func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int {
-	offset -= sovGenesis(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dAtA[offset] = uint8(v)
-	return base
-}
-func (m *GenesisState) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = m.Params.Size()
-	n += 1 + l + sovGenesis(uint64(l))
-	l = len(m.ProviderClientId)
-	if l > 0 {
-		n += 1 + l + sovGenesis(uint64(l))
-	}
-	l = len(m.ProviderChannelId)
-	if l > 0 {
-		n += 1 + l + sovGenesis(uint64(l))
-	}
-	if m.NewChain {
-		n += 2
-	}
-	if m.ProviderClientState != nil {
-		l = m.ProviderClientState.Size()
-		n += 1 + l + sovGenesis(uint64(l))
-	}
-	if m.ProviderConsensusState != nil {
-		l = m.ProviderConsensusState.Size()
-		n += 1 + l + sovGenesis(uint64(l))
-	}
-	if len(m.MaturingPackets) > 0 {
-		for _, e := range m.MaturingPackets {
-			l = e.Size()
-			n += 1 + l + sovGenesis(uint64(l))
-		}
-	}
-	if len(m.InitialValSet) > 0 {
-		for _, e := range m.InitialValSet {
-			l = e.Size()
-			n += 1 + l + sovGenesis(uint64(l))
-		}
-	}
-	if len(m.HeightToValsetUpdateId) > 0 {
-		for _, e := range m.HeightToValsetUpdateId {
-			l = e.Size()
-			n += 1 + l + sovGenesis(uint64(l))
-		}
-	}
-	if len(m.OutstandingDowntimeSlashing) > 0 {
-		for _, e := range m.OutstandingDowntimeSlashing {
-			l = e.Size()
-			n += 1 + l + sovGenesis(uint64(l))
-		}
-	}
-	l = m.PendingConsumerPackets.Size()
-	n += 1 + l + sovGenesis(uint64(l))
-	l = m.LastTransmissionBlockHeight.Size()
-	n += 1 + l + sovGenesis(uint64(l))
-	if m.PreCCV {
-		n += 2
-	}
-	return n
-}
-
-func (m *HeightToValsetUpdateID) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.Height != 0 {
-		n += 1 + sovGenesis(uint64(m.Height))
-	}
-	if m.ValsetUpdateId != 0 {
-		n += 1 + sovGenesis(uint64(m.ValsetUpdateId))
-	}
-	return n
-}
-
-func (m *OutstandingDowntime) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.ValidatorConsensusAddress)
-	if l > 0 {
-		n += 1 + l + sovGenesis(uint64(l))
-	}
-	return n
-}
-
-func sovGenesis(x uint64) (n int) {
-	return (math_bits.Len64(x|1) + 6) / 7
-}
-func sozGenesis(x uint64) (n int) {
-	return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *GenesisState) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowGenesis
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: GenesisState: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: GenesisState: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ProviderClientId", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				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 ErrInvalidLengthGenesis
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.ProviderClientId = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ProviderChannelId", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				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 ErrInvalidLengthGenesis
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.ProviderChannelId = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 4:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field NewChain", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.NewChain = bool(v != 0)
-		case 5:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ProviderClientState", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.ProviderClientState == nil {
-				m.ProviderClientState = &_07_tendermint.ClientState{}
-			}
-			if err := m.ProviderClientState.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 6:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ProviderConsensusState", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.ProviderConsensusState == nil {
-				m.ProviderConsensusState = &_07_tendermint.ConsensusState{}
-			}
-			if err := m.ProviderConsensusState.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 7:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field MaturingPackets", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.MaturingPackets = append(m.MaturingPackets, MaturingVSCPacket{})
-			if err := m.MaturingPackets[len(m.MaturingPackets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 8:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field InitialValSet", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.InitialValSet = append(m.InitialValSet, types.ValidatorUpdate{})
-			if err := m.InitialValSet[len(m.InitialValSet)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 9:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field HeightToValsetUpdateId", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.HeightToValsetUpdateId = append(m.HeightToValsetUpdateId, HeightToValsetUpdateID{})
-			if err := m.HeightToValsetUpdateId[len(m.HeightToValsetUpdateId)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 10:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field OutstandingDowntimeSlashing", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.OutstandingDowntimeSlashing = append(m.OutstandingDowntimeSlashing, OutstandingDowntime{})
-			if err := m.OutstandingDowntimeSlashing[len(m.OutstandingDowntimeSlashing)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 11:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field PendingConsumerPackets", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := m.PendingConsumerPackets.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 12:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field LastTransmissionBlockHeight", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := m.LastTransmissionBlockHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 13:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field PreCCV", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.PreCCV = bool(v != 0)
-		default:
-			iNdEx = preIndex
-			skippy, err := skipGenesis(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *HeightToValsetUpdateID) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowGenesis
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: HeightToValsetUpdateID: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: HeightToValsetUpdateID: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
-			}
-			m.Height = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.Height |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 2:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ValsetUpdateId", wireType)
-			}
-			m.ValsetUpdateId = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.ValsetUpdateId |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		default:
-			iNdEx = preIndex
-			skippy, err := skipGenesis(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *OutstandingDowntime) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowGenesis
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: OutstandingDowntime: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: OutstandingDowntime: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ValidatorConsensusAddress", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenesis
-				}
-				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 ErrInvalidLengthGenesis
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.ValidatorConsensusAddress = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipGenesis(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthGenesis
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func skipGenesis(dAtA []byte) (n int, err error) {
-	l := len(dAtA)
-	iNdEx := 0
-	depth := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowGenesis
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if dAtA[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-		case 1:
-			iNdEx += 8
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowGenesis
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if length < 0 {
-				return 0, ErrInvalidLengthGenesis
-			}
-			iNdEx += length
-		case 3:
-			depth++
-		case 4:
-			if depth == 0 {
-				return 0, ErrUnexpectedEndOfGroupGenesis
-			}
-			depth--
-		case 5:
-			iNdEx += 4
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-		if iNdEx < 0 {
-			return 0, ErrInvalidLengthGenesis
-		}
-		if depth == 0 {
-			return iNdEx, nil
-		}
-	}
-	return 0, io.ErrUnexpectedEOF
-}
-
-var (
-	ErrInvalidLengthGenesis        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowGenesis          = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroupGenesis = fmt.Errorf("proto: unexpected end of group")
-)
diff --git a/x/ccv/consumer/types/query.pb.go b/x/ccv/consumer/types/query.pb.go
index 5b9c52d962..391bf5e6a6 100644
--- a/x/ccv/consumer/types/query.pb.go
+++ b/x/ccv/consumer/types/query.pb.go
@@ -9,6 +9,7 @@ import (
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	grpc1 "github.com/cosmos/gogoproto/grpc"
 	proto "github.com/cosmos/gogoproto/proto"
+	types "github.com/cosmos/interchain-security/v3/x/ccv/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -252,7 +253,7 @@ var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo
 // QueryParamsResponse is response type for the Query/Params RPC method.
 type QueryParamsResponse struct {
 	// params holds all the parameters of this module.
-	Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
+	Params types.Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
 }
 
 func (m *QueryParamsResponse) Reset()         { *m = QueryParamsResponse{} }
@@ -288,11 +289,11 @@ func (m *QueryParamsResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryParamsResponse proto.InternalMessageInfo
 
-func (m *QueryParamsResponse) GetParams() Params {
+func (m *QueryParamsResponse) GetParams() types.Params {
 	if m != nil {
 		return m.Params
 	}
-	return Params{}
+	return types.Params{}
 }
 
 func init() {
@@ -308,40 +309,41 @@ func init() {
 }
 
 var fileDescriptor_f627751d3cc10225 = []byte{
-	// 521 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x8b, 0xd3, 0x40,
-	0x14, 0x6e, 0xfa, 0x4b, 0x9c, 0xc5, 0xcb, 0x58, 0x21, 0x54, 0x89, 0x4b, 0x15, 0xac, 0x4a, 0x33,
-	0x6e, 0x7b, 0x58, 0x3d, 0x88, 0xb2, 0xea, 0xa2, 0xa0, 0xb2, 0x16, 0x41, 0xf0, 0xb2, 0x4e, 0xa7,
-	0x6f, 0xd3, 0x81, 0x26, 0x93, 0x9d, 0x99, 0x84, 0xf6, 0x26, 0xfe, 0x01, 0x22, 0xf8, 0x9f, 0x78,
-	0xf1, 0x5f, 0xd8, 0xe3, 0x82, 0x17, 0x4f, 0x22, 0xad, 0x7f, 0x84, 0x47, 0xc9, 0x24, 0x59, 0x53,
-	0xd0, 0x6d, 0x04, 0x6f, 0xd3, 0xef, 0x7b, 0xef, 0x7b, 0xdf, 0x7c, 0xf3, 0x1a, 0x44, 0x78, 0xa0,
-	0x41, 0xb2, 0x09, 0xe5, 0xc1, 0xbe, 0x02, 0x16, 0x49, 0xae, 0xe7, 0x84, 0xb1, 0x98, 0x30, 0x11,
-	0xa8, 0xc8, 0x07, 0x49, 0xe2, 0x2d, 0x72, 0x18, 0x81, 0x9c, 0xbb, 0xa1, 0x14, 0x5a, 0xe0, 0x2b,
-	0x7f, 0x68, 0x70, 0x19, 0x8b, 0xdd, 0xbc, 0xc1, 0x8d, 0xb7, 0xda, 0x2d, 0x4f, 0x78, 0xc2, 0xd4,
-	0x93, 0xe4, 0x94, 0xb6, 0xb6, 0x2f, 0x79, 0x42, 0x78, 0x53, 0x20, 0x34, 0xe4, 0x84, 0x06, 0x81,
-	0xd0, 0x54, 0x73, 0x11, 0xa8, 0x8c, 0xed, 0x97, 0x71, 0x72, 0x32, 0xc4, 0xf4, 0x74, 0xde, 0x57,
-	0xd1, 0xc5, 0xe7, 0x30, 0xd3, 0xbb, 0x00, 0x0f, 0xb9, 0xd2, 0x92, 0x8f, 0xa2, 0x44, 0xf2, 0x91,
-	0xd2, 0xdc, 0xa7, 0x1a, 0xf0, 0x55, 0x74, 0x8e, 0x45, 0x52, 0x42, 0xa0, 0x1f, 0x03, 0xf7, 0x26,
-	0xda, 0xb6, 0x36, 0xad, 0x6e, 0x6d, 0xb8, 0x0a, 0x62, 0x07, 0xa1, 0x29, 0x55, 0x79, 0x49, 0xd5,
-	0x94, 0x14, 0x90, 0x84, 0x0f, 0x60, 0x96, 0xf3, 0xb5, 0x94, 0xff, 0x8d, 0xe0, 0x01, 0xba, 0x30,
-	0x2e, 0x4c, 0xdf, 0x3f, 0x90, 0x94, 0x25, 0x07, 0xbb, 0xbe, 0x69, 0x75, 0xcf, 0x0e, 0x5b, 0x45,
-	0x72, 0x37, 0xe3, 0x70, 0x0b, 0x35, 0xb4, 0xd0, 0x74, 0x6a, 0x37, 0x4c, 0x51, 0xfa, 0x23, 0x19,
-	0xa5, 0xc5, 0x9e, 0x14, 0x31, 0x1f, 0x83, 0xb4, 0x9b, 0x86, 0x2a, 0x20, 0x29, 0xff, 0x20, 0x0b,
-	0xc1, 0x3e, 0x93, 0xf3, 0x39, 0xd2, 0xb9, 0x8e, 0xae, 0xbd, 0x48, 0x1e, 0xeb, 0x94, 0x50, 0x86,
-	0x70, 0x18, 0x81, 0xd2, 0x9d, 0xb7, 0x16, 0xea, 0xae, 0xaf, 0x55, 0xa1, 0x08, 0x14, 0xe0, 0x97,
-	0xa8, 0x3e, 0xa6, 0x9a, 0x9a, 0xfc, 0x36, 0xfa, 0xf7, 0xdd, 0x12, 0x4b, 0xe0, 0x9e, 0xa6, 0x6b,
-	0xd4, 0x3a, 0x2d, 0x84, 0x8d, 0x83, 0x3d, 0x2a, 0xa9, 0xaf, 0x72, 0x63, 0x6f, 0xd0, 0xf9, 0x15,
-	0x34, 0xb3, 0xf0, 0x04, 0x35, 0x43, 0x83, 0x64, 0x26, 0x6e, 0x96, 0x32, 0x91, 0x8a, 0xec, 0xd4,
-	0x8f, 0xbe, 0x5d, 0xae, 0x0c, 0x33, 0x81, 0xfe, 0xe7, 0x1a, 0x6a, 0x98, 0x11, 0xf8, 0xa7, 0x85,
-	0xec, 0xbf, 0x85, 0x80, 0x9f, 0x96, 0x9a, 0x50, 0x32, 0xef, 0xf6, 0xb3, 0xff, 0xa4, 0x96, 0xc6,
-	0xd1, 0xb9, 0xf7, 0xee, 0xcb, 0x8f, 0x8f, 0xd5, 0x3b, 0x78, 0x7b, 0xfd, 0x3f, 0x38, 0x59, 0xd5,
-	0xde, 0x01, 0x40, 0xaf, 0xb8, 0x88, 0xf8, 0x93, 0x85, 0x36, 0x0a, 0x39, 0xe3, 0xed, 0xf2, 0xfe,
-	0x56, 0xde, 0xab, 0x7d, 0xfb, 0xdf, 0x1b, 0xb3, 0x3b, 0xdc, 0x32, 0x77, 0xb8, 0x81, 0xbb, 0xeb,
-	0xef, 0x90, 0xbe, 0xdc, 0xce, 0xab, 0xa3, 0x85, 0x63, 0x1d, 0x2f, 0x1c, 0xeb, 0xfb, 0xc2, 0xb1,
-	0x3e, 0x2c, 0x9d, 0xca, 0xf1, 0xd2, 0xa9, 0x7c, 0x5d, 0x3a, 0x95, 0xd7, 0x77, 0x3d, 0xae, 0x27,
-	0xd1, 0xc8, 0x65, 0xc2, 0x27, 0x4c, 0x28, 0x5f, 0xa8, 0x82, 0x68, 0xef, 0x44, 0x34, 0x1e, 0x90,
-	0xd9, 0xaa, 0xb2, 0x9e, 0x87, 0xa0, 0x46, 0x4d, 0xf3, 0x41, 0x19, 0xfc, 0x0a, 0x00, 0x00, 0xff,
-	0xff, 0xcc, 0x57, 0x2e, 0xd6, 0x10, 0x05, 0x00, 0x00,
+	// 536 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x6b, 0x13, 0x41,
+	0x14, 0xce, 0xe6, 0x97, 0x38, 0xc5, 0xcb, 0x18, 0x61, 0x89, 0xb2, 0x96, 0x55, 0x30, 0x0a, 0xd9,
+	0x69, 0x92, 0x43, 0xf5, 0x20, 0x96, 0xaa, 0xc5, 0x83, 0x4a, 0x0d, 0x42, 0xc1, 0x4b, 0x98, 0x4c,
+	0x5e, 0x37, 0x03, 0xc9, 0x4e, 0x3a, 0x33, 0xbb, 0x24, 0x37, 0xf1, 0x0f, 0x10, 0xc1, 0xff, 0xc4,
+	0x8b, 0xff, 0x42, 0x8f, 0x05, 0x2f, 0x9e, 0x44, 0x12, 0xff, 0x08, 0x8f, 0xb2, 0xb3, 0xbb, 0x75,
+	0x03, 0xa6, 0x89, 0xd0, 0xdb, 0xe4, 0xfb, 0xde, 0xfb, 0xe6, 0x7b, 0xdf, 0xbc, 0x2c, 0x22, 0x3c,
+	0xd0, 0x20, 0xd9, 0x90, 0xf2, 0xa0, 0xa7, 0x80, 0x85, 0x92, 0xeb, 0x19, 0x61, 0x2c, 0x22, 0x4c,
+	0x04, 0x2a, 0x1c, 0x83, 0x24, 0x51, 0x8b, 0x9c, 0x84, 0x20, 0x67, 0xde, 0x44, 0x0a, 0x2d, 0xf0,
+	0x9d, 0x7f, 0x34, 0x78, 0x8c, 0x45, 0x5e, 0xd6, 0xe0, 0x45, 0xad, 0xfa, 0xce, 0x2a, 0xd5, 0xa8,
+	0x45, 0xd4, 0x90, 0x4a, 0x18, 0xf4, 0xce, 0xcb, 0x8d, 0x6c, 0xbd, 0xe6, 0x0b, 0x5f, 0x98, 0x23,
+	0x89, 0x4f, 0x29, 0x7a, 0xcb, 0x17, 0xc2, 0x1f, 0x01, 0xa1, 0x13, 0x4e, 0x68, 0x10, 0x08, 0x4d,
+	0x35, 0x17, 0x81, 0x4a, 0xd9, 0xf6, 0x26, 0xde, 0x97, 0xef, 0x71, 0x3f, 0x16, 0xd1, 0xcd, 0xd7,
+	0x30, 0xd5, 0x07, 0x00, 0xcf, 0xb8, 0xd2, 0x92, 0xf7, 0xc3, 0x58, 0xf2, 0xb9, 0xd2, 0x7c, 0x4c,
+	0x35, 0xe0, 0xbb, 0xe8, 0x1a, 0x0b, 0xa5, 0x84, 0x40, 0xbf, 0x00, 0xee, 0x0f, 0xb5, 0x6d, 0x6d,
+	0x5b, 0x8d, 0x52, 0x77, 0x19, 0xc4, 0x0e, 0x42, 0x23, 0xaa, 0xb2, 0x92, 0xa2, 0x29, 0xc9, 0x21,
+	0x31, 0x1f, 0xc0, 0x34, 0xe3, 0x4b, 0x09, 0xff, 0x17, 0xc1, 0x1d, 0x74, 0x63, 0x90, 0xbb, 0xbd,
+	0x77, 0x2c, 0x29, 0x8b, 0x0f, 0x76, 0x79, 0xdb, 0x6a, 0x5c, 0xed, 0xd6, 0xf2, 0xe4, 0x41, 0xca,
+	0xe1, 0x1a, 0xaa, 0x68, 0xa1, 0xe9, 0xc8, 0xae, 0x98, 0xa2, 0xe4, 0x47, 0x7c, 0x95, 0x16, 0x87,
+	0x52, 0x44, 0x7c, 0x00, 0xd2, 0xae, 0x1a, 0x2a, 0x87, 0x24, 0xfc, 0xd3, 0x34, 0x04, 0xfb, 0x4a,
+	0xc6, 0x67, 0x88, 0x7b, 0x1f, 0xdd, 0x7b, 0x13, 0x3f, 0xef, 0x05, 0xa1, 0x74, 0xe1, 0x24, 0x04,
+	0xa5, 0xdd, 0xf7, 0x16, 0x6a, 0xac, 0xaf, 0x55, 0x13, 0x11, 0x28, 0xc0, 0x6f, 0x51, 0x79, 0x40,
+	0x35, 0x35, 0xf9, 0x6d, 0xb5, 0xf7, 0xbc, 0x0d, 0xd6, 0xc6, 0xbb, 0x48, 0xd7, 0xa8, 0xb9, 0x35,
+	0x84, 0x8d, 0x83, 0x43, 0x2a, 0xe9, 0x58, 0x65, 0xc6, 0x8e, 0xd0, 0xf5, 0x25, 0x34, 0xb5, 0xb0,
+	0x87, 0xaa, 0x13, 0x83, 0xa4, 0x26, 0xdc, 0x95, 0x26, 0xa2, 0x96, 0x97, 0xf4, 0xee, 0x97, 0x4f,
+	0x7f, 0xdc, 0x2e, 0x74, 0xd3, 0xbe, 0xf6, 0xd7, 0x12, 0xaa, 0x18, 0x65, 0xfc, 0xdb, 0x42, 0xf6,
+	0xaa, 0xd9, 0xf1, 0xcb, 0x8d, 0xa6, 0xdb, 0x30, 0xe6, 0xfa, 0xab, 0x4b, 0x52, 0x4b, 0x52, 0x70,
+	0x9f, 0x7c, 0xf8, 0xf6, 0xeb, 0x73, 0xf1, 0x11, 0xde, 0x5d, 0xff, 0x57, 0x8f, 0x37, 0xb4, 0x79,
+	0x0c, 0xd0, 0xcc, 0xef, 0x1f, 0xfe, 0x62, 0xa1, 0xad, 0x5c, 0xbc, 0x78, 0x77, 0x73, 0x7f, 0x4b,
+	0xcf, 0x54, 0x7f, 0xf8, 0xff, 0x8d, 0xe9, 0x0c, 0x3b, 0x66, 0x86, 0x07, 0xb8, 0xb1, 0x7e, 0x86,
+	0xe4, 0xe5, 0xf6, 0x8f, 0x4e, 0xe7, 0x8e, 0x75, 0x36, 0x77, 0xac, 0x9f, 0x73, 0xc7, 0xfa, 0xb4,
+	0x70, 0x0a, 0x67, 0x0b, 0xa7, 0xf0, 0x7d, 0xe1, 0x14, 0xde, 0x3d, 0xf6, 0xb9, 0x1e, 0x86, 0x7d,
+	0x8f, 0x89, 0x31, 0x61, 0x42, 0x8d, 0x85, 0xca, 0x89, 0x36, 0xcf, 0x45, 0xa3, 0x0e, 0x99, 0x2e,
+	0x2b, 0xeb, 0xd9, 0x04, 0x54, 0xbf, 0x6a, 0xbe, 0x23, 0x9d, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0xd5, 0xeb, 0x88, 0x17, 0x39, 0x05, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/ccv/provider/types/genesis.pb.go b/x/ccv/provider/types/genesis.pb.go
index 0e4e4f2cf3..79d09f7b0f 100644
--- a/x/ccv/provider/types/genesis.pb.go
+++ b/x/ccv/provider/types/genesis.pb.go
@@ -8,7 +8,6 @@ import (
 	_ "github.com/cometbft/cometbft/proto/tendermint/crypto"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
-	types1 "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	types "github.com/cosmos/interchain-security/v3/x/ccv/types"
 	io "io"
 	math "math"
@@ -35,7 +34,7 @@ type GenesisState struct {
 	// empty for a new chain
 	UnbondingOps []UnbondingOp `protobuf:"bytes,3,rep,name=unbonding_ops,json=unbondingOps,proto3" json:"unbonding_ops"`
 	// empty for a new chain
-	MatureUnbondingOps *types.MaturedUnbondingOps `protobuf:"bytes,4,opt,name=mature_unbonding_ops,json=matureUnbondingOps,proto3" json:"mature_unbonding_ops,omitempty"`
+	MatureUnbondingOps *MaturedUnbondingOps `protobuf:"bytes,4,opt,name=mature_unbonding_ops,json=matureUnbondingOps,proto3" json:"mature_unbonding_ops,omitempty"`
 	// empty for a new chain
 	ValsetUpdateIdToHeight []ValsetUpdateIdToHeight `protobuf:"bytes,5,rep,name=valset_update_id_to_height,json=valsetUpdateIdToHeight,proto3" json:"valset_update_id_to_height"`
 	// empty for a new chain
@@ -105,7 +104,7 @@ func (m *GenesisState) GetUnbondingOps() []UnbondingOp {
 	return nil
 }
 
-func (m *GenesisState) GetMatureUnbondingOps() *types.MaturedUnbondingOps {
+func (m *GenesisState) GetMatureUnbondingOps() *MaturedUnbondingOps {
 	if m != nil {
 		return m.MatureUnbondingOps
 	}
@@ -161,7 +160,9 @@ func (m *GenesisState) GetConsumerAddrsToPrune() []ConsumerAddrsToPrune {
 	return nil
 }
 
-// consumer chain
+// The provider CCV module's knowledge of consumer state.
+//
+// Note this type is only used internally to the provider CCV module.
 type ConsumerState struct {
 	// ChainID defines the chain ID for the consumer chain
 	ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
@@ -172,7 +173,7 @@ type ConsumerState struct {
 	// InitalHeight defines the initial block height for the consumer chain
 	InitialHeight uint64 `protobuf:"varint,4,opt,name=initial_height,json=initialHeight,proto3" json:"initial_height,omitempty"`
 	// ConsumerGenesis defines the initial consumer chain genesis states
-	ConsumerGenesis types1.GenesisState `protobuf:"bytes,5,opt,name=consumer_genesis,json=consumerGenesis,proto3" json:"consumer_genesis"`
+	ConsumerGenesis types.GenesisState `protobuf:"bytes,5,opt,name=consumer_genesis,json=consumerGenesis,proto3" json:"consumer_genesis"`
 	// PendingValsetChanges defines the pending validator set changes for the
 	// consumer chain
 	PendingValsetChanges []types.ValidatorSetChangePacketData `protobuf:"bytes,6,rep,name=pending_valset_changes,json=pendingValsetChanges,proto3" json:"pending_valset_changes"`
@@ -243,11 +244,11 @@ func (m *ConsumerState) GetInitialHeight() uint64 {
 	return 0
 }
 
-func (m *ConsumerState) GetConsumerGenesis() types1.GenesisState {
+func (m *ConsumerState) GetConsumerGenesis() types.GenesisState {
 	if m != nil {
 		return m.ConsumerGenesis
 	}
-	return types1.GenesisState{}
+	return types.GenesisState{}
 }
 
 func (m *ConsumerState) GetPendingValsetChanges() []types.ValidatorSetChangePacketData {
@@ -336,61 +337,61 @@ func init() {
 }
 
 var fileDescriptor_48411d9c7900d48e = []byte{
-	// 856 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x8e, 0xdb, 0x44,
-	0x14, 0x5e, 0xef, 0xa6, 0xdb, 0xcd, 0x6c, 0x77, 0x59, 0x86, 0x55, 0x70, 0xb3, 0x90, 0xae, 0x02,
-	0x48, 0x91, 0x00, 0x1b, 0xa7, 0x5c, 0xf0, 0xd7, 0x8b, 0xa6, 0x95, 0x20, 0x42, 0x88, 0x28, 0xfd,
-	0x41, 0x2a, 0x17, 0xd6, 0x64, 0x3c, 0x4a, 0x86, 0xd8, 0x33, 0xd6, 0xcc, 0xd8, 0xd4, 0x42, 0x48,
-	0x54, 0xbc, 0x00, 0x6f, 0x45, 0x2f, 0x7b, 0xc9, 0x55, 0x85, 0x76, 0xdf, 0x80, 0x27, 0x40, 0x1e,
-	0x8f, 0x5d, 0x7b, 0x49, 0x20, 0xe1, 0x2e, 0x3e, 0xdf, 0x9c, 0xef, 0x3b, 0x67, 0xce, 0xcc, 0x37,
-	0x01, 0x1e, 0x65, 0x8a, 0x08, 0xbc, 0x40, 0x94, 0xf9, 0x92, 0xe0, 0x44, 0x50, 0x95, 0xb9, 0x18,
-	0xa7, 0x6e, 0x2c, 0x78, 0x4a, 0x03, 0x22, 0xdc, 0xd4, 0x73, 0xe7, 0x84, 0x11, 0x49, 0xa5, 0x13,
-	0x0b, 0xae, 0x38, 0x7c, 0x67, 0x45, 0x8a, 0x83, 0x71, 0xea, 0x94, 0x29, 0x4e, 0xea, 0x75, 0x4f,
-	0xe7, 0x7c, 0xce, 0xf5, 0x7a, 0x37, 0xff, 0x55, 0xa4, 0x76, 0xdf, 0x5d, 0xa7, 0x96, 0x7a, 0xae,
-	0x61, 0x50, 0xbc, 0x3b, 0xdc, 0xa4, 0xa6, 0x4a, 0xec, 0x3f, 0x72, 0x30, 0x67, 0x32, 0x89, 0x8a,
-	0x9c, 0xf2, 0xb7, 0xc9, 0xf1, 0x36, 0xc9, 0x69, 0xf4, 0xde, 0x7d, 0x4b, 0x11, 0x16, 0x10, 0x11,
-	0x51, 0xa6, 0x5c, 0x2c, 0xb2, 0x58, 0x71, 0x77, 0x49, 0x32, 0x83, 0xf6, 0x7f, 0x6f, 0x83, 0x1b,
-	0x5f, 0x16, 0xeb, 0x1f, 0x28, 0xa4, 0x08, 0x1c, 0x80, 0x93, 0x14, 0x85, 0x92, 0x28, 0x3f, 0x89,
-	0x03, 0xa4, 0x88, 0x4f, 0x03, 0xdb, 0x3a, 0xb7, 0x06, 0xad, 0xe9, 0x71, 0x11, 0x7f, 0xa4, 0xc3,
-	0xe3, 0x00, 0xfe, 0x04, 0x5e, 0x2b, 0x55, 0x7d, 0x99, 0xe7, 0x4a, 0x7b, 0xf7, 0x7c, 0x6f, 0x70,
-	0x38, 0x1c, 0x3a, 0x1b, 0x6c, 0xb7, 0x73, 0xcf, 0xe4, 0x6a, 0xd9, 0x51, 0xef, 0xf9, 0xcb, 0x5b,
-	0x3b, 0x7f, 0xbd, 0xbc, 0xd5, 0xc9, 0x50, 0x14, 0x7e, 0xd6, 0xbf, 0x42, 0xdc, 0x9f, 0x1e, 0xe3,
-	0xfa, 0x72, 0x09, 0xbf, 0x07, 0x47, 0x09, 0x9b, 0x71, 0x16, 0x50, 0x36, 0xf7, 0x79, 0x2c, 0xed,
-	0x3d, 0x2d, 0xfd, 0xd1, 0x46, 0xd2, 0x8f, 0xca, 0xcc, 0x6f, 0xe3, 0x51, 0x2b, 0x17, 0x9e, 0xde,
-	0x48, 0x5e, 0x85, 0x24, 0x44, 0xe0, 0x34, 0x42, 0x2a, 0x11, 0xc4, 0x6f, 0x6a, 0xb4, 0xce, 0xad,
-	0xc1, 0xe1, 0xd0, 0x5d, 0xab, 0x91, 0x7a, 0xce, 0x37, 0x3a, 0x2f, 0xa8, 0x29, 0xc8, 0x29, 0x2c,
-	0xc8, 0xea, 0x31, 0xf8, 0x33, 0xe8, 0x5e, 0xdd, 0x66, 0x5f, 0x71, 0x7f, 0x41, 0xe8, 0x7c, 0xa1,
-	0xec, 0x6b, 0xba, 0x99, 0xcf, 0x37, 0x6a, 0xe6, 0x71, 0x63, 0x2a, 0x0f, 0xf9, 0x57, 0x9a, 0xc2,
-	0xf4, 0xd5, 0x49, 0x57, 0xa2, 0xf0, 0x57, 0x0b, 0x9c, 0x55, 0x7b, 0x8c, 0x82, 0x80, 0x2a, 0xca,
-	0x99, 0x1f, 0x0b, 0x1e, 0x73, 0x89, 0x42, 0x69, 0xef, 0xeb, 0x02, 0xee, 0x6c, 0x35, 0xc8, 0xbb,
-	0x86, 0x66, 0x62, 0x58, 0x4c, 0x09, 0x37, 0xf1, 0x1a, 0x5c, 0xc2, 0x5f, 0x2c, 0xd0, 0xad, 0xaa,
-	0x10, 0x24, 0xe2, 0x29, 0x0a, 0x6b, 0x45, 0x5c, 0xd7, 0x45, 0x7c, 0xb1, 0x55, 0x11, 0xd3, 0x82,
-	0xe5, 0x4a, 0x0d, 0x36, 0x5e, 0x0d, 0x4b, 0x38, 0x06, 0xfb, 0x31, 0x12, 0x28, 0x92, 0xf6, 0x81,
-	0x1e, 0xee, 0xfb, 0x1b, 0xa9, 0x4d, 0x74, 0x8a, 0x21, 0x37, 0x04, 0xba, 0x9b, 0x14, 0x85, 0x34,
-	0x40, 0x8a, 0x0b, 0xbf, 0xea, 0x2b, 0x4e, 0x66, 0xf9, 0x7d, 0xb3, 0xdb, 0x5b, 0x74, 0xf3, 0xb8,
-	0xa4, 0x29, 0xdb, 0x9a, 0x24, 0xb3, 0xaf, 0x49, 0x56, 0x76, 0x93, 0xae, 0x80, 0x73, 0x0d, 0xf8,
-	0xcc, 0x02, 0x67, 0x15, 0x28, 0xfd, 0x59, 0xe6, 0xd7, 0x87, 0x2c, 0x6c, 0xf0, 0x7f, 0x6a, 0x18,
-	0x65, 0xb5, 0x09, 0x8b, 0x7f, 0xd4, 0x20, 0x9b, 0x38, 0x4c, 0xc1, 0x9b, 0x0d, 0x51, 0x99, 0x9f,
-	0xeb, 0x58, 0x24, 0x8c, 0xd8, 0x87, 0x5a, 0xfe, 0xd3, 0x6d, 0x4f, 0x95, 0x90, 0x0f, 0xf9, 0x24,
-	0x27, 0x30, 0xda, 0xa7, 0x78, 0x05, 0xd6, 0x7f, 0xd6, 0x02, 0x47, 0x0d, 0x4f, 0x81, 0x37, 0xc1,
-	0x41, 0x21, 0x62, 0x2c, 0xac, 0x3d, 0xbd, 0xae, 0xbf, 0xc7, 0x01, 0x7c, 0x1b, 0x00, 0xbc, 0x40,
-	0x8c, 0x91, 0x30, 0x07, 0x77, 0x35, 0xd8, 0x36, 0x91, 0x71, 0x00, 0xcf, 0x40, 0x1b, 0x87, 0x94,
-	0x30, 0x95, 0xa3, 0x7b, 0x1a, 0x3d, 0x28, 0x02, 0xe3, 0x00, 0xbe, 0x07, 0x8e, 0x29, 0xa3, 0x8a,
-	0xa2, 0xb0, 0xbc, 0xae, 0x2d, 0xed, 0x8f, 0x47, 0x26, 0x6a, 0xae, 0xd8, 0x0c, 0x9c, 0x54, 0xfb,
-	0x60, 0x1c, 0xd9, 0xbe, 0xa6, 0xcf, 0x98, 0xb7, 0x76, 0x03, 0x2a, 0xb7, 0x4f, 0x3d, 0xa7, 0xee,
-	0xca, 0xa6, 0xf1, 0xca, 0x6f, 0x0d, 0x06, 0x15, 0xe8, 0xc4, 0xa4, 0xf0, 0x27, 0xe3, 0x26, 0x79,
-	0x0f, 0x73, 0x52, 0x5e, 0xe0, 0x4f, 0xfe, 0xcd, 0xaa, 0xaa, 0x01, 0x3f, 0x20, 0xea, 0x9e, 0x4e,
-	0x9b, 0x20, 0xbc, 0x24, 0xea, 0x3e, 0x52, 0xa8, 0xdc, 0x69, 0xc3, 0x5e, 0x78, 0x4c, 0xb1, 0x48,
-	0xc2, 0x0f, 0x00, 0x94, 0x21, 0x92, 0x0b, 0x3f, 0xe0, 0x3f, 0x32, 0x45, 0x23, 0xe2, 0x23, 0xbc,
-	0xd4, 0xb7, 0xb5, 0x3d, 0x3d, 0xd1, 0xc8, 0x7d, 0x03, 0xdc, 0xc5, 0x4b, 0xf8, 0x03, 0x78, 0xa3,
-	0xe1, 0xa2, 0x3e, 0x65, 0x01, 0x79, 0x6a, 0x1f, 0xe8, 0x02, 0x3f, 0xde, 0xec, 0x28, 0x4a, 0x5c,
-	0x37, 0x4f, 0x53, 0xdc, 0xeb, 0x75, 0xcf, 0x1e, 0xe7, 0xa4, 0xfd, 0x27, 0xa0, 0xb3, 0xda, 0x0e,
-	0xb7, 0x78, 0xd6, 0x3a, 0x60, 0xdf, 0x8c, 0x75, 0x57, 0xe3, 0xe6, 0x6b, 0xf4, 0xdd, 0xf3, 0x8b,
-	0x9e, 0xf5, 0xe2, 0xa2, 0x67, 0xfd, 0x79, 0xd1, 0xb3, 0x7e, 0xbb, 0xec, 0xed, 0xbc, 0xb8, 0xec,
-	0xed, 0xfc, 0x71, 0xd9, 0xdb, 0x79, 0x72, 0x67, 0x4e, 0xd5, 0x22, 0x99, 0x39, 0x98, 0x47, 0x2e,
-	0xe6, 0x32, 0xe2, 0xd2, 0x7d, 0xd5, 0xd5, 0x87, 0xd5, 0x33, 0x9d, 0xde, 0x76, 0x9f, 0x36, 0xff,
-	0x13, 0xa8, 0x2c, 0x26, 0x72, 0xb6, 0xaf, 0x5f, 0xe2, 0xdb, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff,
-	0xa6, 0x98, 0xf7, 0xad, 0xd8, 0x08, 0x00, 0x00,
+	// 854 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x6f, 0x1c, 0x35,
+	0x14, 0xce, 0x24, 0x69, 0x9a, 0x75, 0x9a, 0x10, 0x4c, 0xb4, 0x4c, 0x13, 0xd8, 0x46, 0x8b, 0x2a,
+	0xad, 0x04, 0xcc, 0x74, 0x53, 0x0e, 0xe5, 0x47, 0x0f, 0x4d, 0x2b, 0xc1, 0x0a, 0x21, 0x56, 0xdb,
+	0x1f, 0x88, 0x72, 0xb0, 0xbc, 0xb6, 0xb5, 0xeb, 0x66, 0xc6, 0x1e, 0xd9, 0x9e, 0x69, 0x47, 0x08,
+	0x09, 0xc4, 0x3f, 0xc0, 0x9f, 0xd5, 0x63, 0x8e, 0x9c, 0x2a, 0x94, 0xfc, 0x07, 0x9c, 0x38, 0xa2,
+	0xf1, 0x78, 0xa6, 0xb3, 0x61, 0x13, 0xed, 0x72, 0x9b, 0x79, 0x9f, 0xdf, 0xf7, 0x7d, 0xcf, 0xcf,
+	0x7e, 0x06, 0x7d, 0x2e, 0x0c, 0x53, 0x64, 0x8a, 0xb9, 0x40, 0x9a, 0x91, 0x54, 0x71, 0x93, 0x87,
+	0x84, 0x64, 0x61, 0xa2, 0x64, 0xc6, 0x29, 0x53, 0x61, 0xd6, 0x0f, 0x27, 0x4c, 0x30, 0xcd, 0x75,
+	0x90, 0x28, 0x69, 0x24, 0xfc, 0x68, 0x4e, 0x4a, 0x40, 0x48, 0x16, 0x54, 0x29, 0x41, 0xd6, 0xdf,
+	0xdf, 0x9b, 0xc8, 0x89, 0xb4, 0xeb, 0xc3, 0xe2, 0xab, 0x4c, 0xdd, 0xbf, 0x73, 0x99, 0x5a, 0xd6,
+	0x0f, 0xf5, 0x14, 0x2b, 0x46, 0x11, 0x91, 0x42, 0xa7, 0x31, 0x53, 0x2e, 0xe3, 0xf6, 0x15, 0x19,
+	0x2f, 0xb9, 0x62, 0x6e, 0xd9, 0xd1, 0x22, 0x65, 0xd4, 0xfe, 0xca, 0x9c, 0x0f, 0x0c, 0x13, 0x94,
+	0xa9, 0x98, 0x0b, 0x13, 0x12, 0x95, 0x27, 0x46, 0x86, 0x27, 0x2c, 0x77, 0x55, 0x76, 0x4f, 0x5b,
+	0xe0, 0xc6, 0xd7, 0x65, 0xdd, 0x8f, 0x0d, 0x36, 0x0c, 0xf6, 0xc0, 0x6e, 0x86, 0x23, 0xcd, 0x0c,
+	0x4a, 0x13, 0x8a, 0x0d, 0x43, 0x9c, 0xfa, 0xde, 0xa1, 0xd7, 0x5b, 0x1f, 0xed, 0x94, 0xf1, 0xa7,
+	0x36, 0x3c, 0xa0, 0xf0, 0x67, 0xf0, 0x4e, 0x55, 0x05, 0xd2, 0x45, 0xae, 0xf6, 0x57, 0x0f, 0xd7,
+	0x7a, 0x5b, 0x47, 0x47, 0xc1, 0x02, 0x5b, 0x17, 0x3c, 0x74, 0xb9, 0x56, 0xf6, 0xb8, 0xf3, 0xfa,
+	0xcd, 0xad, 0x95, 0xbf, 0xdf, 0xdc, 0x6a, 0xe7, 0x38, 0x8e, 0xbe, 0xe8, 0x5e, 0x20, 0xee, 0x8e,
+	0x76, 0x48, 0x73, 0xb9, 0x86, 0x3f, 0x81, 0xed, 0x54, 0x8c, 0xa5, 0xa0, 0x5c, 0x4c, 0x90, 0x4c,
+	0xb4, 0xbf, 0x66, 0xa5, 0xef, 0x2c, 0x24, 0xfd, 0xb4, 0xca, 0xfc, 0x3e, 0x39, 0x5e, 0x2f, 0x84,
+	0x47, 0x37, 0xd2, 0xb7, 0x21, 0x0d, 0x5f, 0x80, 0xbd, 0x18, 0x9b, 0x54, 0x31, 0x34, 0xab, 0xb1,
+	0x7e, 0xe8, 0xf5, 0xb6, 0x8e, 0xee, 0x2d, 0xa4, 0xf1, 0x9d, 0x25, 0xa0, 0x0d, 0x29, 0x3d, 0x82,
+	0x25, 0x6b, 0x33, 0x06, 0x7f, 0x01, 0xfb, 0x17, 0xf7, 0x1b, 0x19, 0x89, 0xa6, 0x8c, 0x4f, 0xa6,
+	0xc6, 0xbf, 0x66, 0xab, 0xfa, 0x72, 0x21, 0xc5, 0x67, 0x33, 0xed, 0x79, 0x22, 0xbf, 0xb1, 0x14,
+	0xae, 0xc0, 0x76, 0x36, 0x17, 0x85, 0xbf, 0x7b, 0xe0, 0xa0, 0xde, 0x6c, 0x4c, 0x29, 0x37, 0x5c,
+	0x0a, 0x94, 0x28, 0x99, 0x48, 0x8d, 0x23, 0xed, 0x6f, 0x58, 0x03, 0xf7, 0x97, 0xea, 0xe8, 0x03,
+	0x47, 0x33, 0x74, 0x2c, 0xce, 0xc2, 0x4d, 0x72, 0x09, 0xae, 0xe1, 0xaf, 0x1e, 0xd8, 0xaf, 0x5d,
+	0x28, 0x16, 0xcb, 0x0c, 0x47, 0x0d, 0x13, 0xd7, 0xad, 0x89, 0xaf, 0x96, 0x32, 0x31, 0x2a, 0x59,
+	0x2e, 0x78, 0xf0, 0xc9, 0x7c, 0x58, 0xc3, 0x01, 0xd8, 0x48, 0xb0, 0xc2, 0xb1, 0xf6, 0x37, 0x6d,
+	0x97, 0x3f, 0x5e, 0x48, 0x6d, 0x68, 0x53, 0x1c, 0xb9, 0x23, 0xb0, 0xd5, 0x64, 0x38, 0xe2, 0x14,
+	0x1b, 0xa9, 0xea, 0x9b, 0x8e, 0x92, 0x74, 0x5c, 0x5c, 0x3c, 0xbf, 0xb5, 0x44, 0x35, 0xcf, 0x2a,
+	0x9a, 0xaa, 0xac, 0x61, 0x3a, 0xfe, 0x96, 0xe5, 0x55, 0x35, 0xd9, 0x1c, 0xb8, 0xd0, 0x80, 0xbf,
+	0x79, 0xe0, 0xa0, 0x06, 0x35, 0x1a, 0xe7, 0xa8, 0xd9, 0x64, 0xe5, 0x83, 0xff, 0xe3, 0xe1, 0x38,
+	0x6f, 0x74, 0x58, 0xfd, 0xc7, 0x83, 0x9e, 0xc5, 0x61, 0x06, 0xde, 0x9f, 0x11, 0xd5, 0xc5, 0xb9,
+	0x4e, 0x54, 0x2a, 0x98, 0xbf, 0x65, 0xe5, 0x3f, 0x5f, 0xf6, 0x54, 0x29, 0xfd, 0x44, 0x0e, 0x0b,
+	0x02, 0xa7, 0xbd, 0x47, 0xe6, 0x60, 0xdd, 0x7f, 0xd6, 0xc0, 0xf6, 0xcc, 0x70, 0x81, 0x37, 0xc1,
+	0x66, 0x29, 0xe2, 0x66, 0x59, 0x6b, 0x74, 0xdd, 0xfe, 0x0f, 0x28, 0xfc, 0x10, 0x00, 0x32, 0xc5,
+	0x42, 0xb0, 0xa8, 0x00, 0x57, 0x2d, 0xd8, 0x72, 0x91, 0x01, 0x85, 0x07, 0xa0, 0x45, 0x22, 0xce,
+	0x84, 0x29, 0xd0, 0x35, 0x8b, 0x6e, 0x96, 0x81, 0x01, 0x85, 0xb7, 0xc1, 0x0e, 0x17, 0xdc, 0x70,
+	0x1c, 0x55, 0xd7, 0x75, 0xdd, 0x0e, 0xca, 0x6d, 0x17, 0x75, 0x57, 0xec, 0x47, 0xb0, 0x5b, 0xef,
+	0x83, 0x7b, 0x62, 0xfc, 0x6b, 0xf6, 0x8c, 0xf5, 0x2e, 0xdd, 0x80, 0xac, 0x1f, 0x34, 0xa7, 0xb2,
+	0xab, 0xb7, 0x9e, 0xb7, 0x0e, 0x83, 0x06, 0xb4, 0x13, 0x56, 0xce, 0x27, 0x37, 0x44, 0x0a, 0xeb,
+	0x13, 0x56, 0xdd, 0xdb, 0x7b, 0x57, 0x09, 0xd4, 0x7d, 0x7d, 0xcc, 0xcc, 0x43, 0x9b, 0x36, 0xc4,
+	0xe4, 0x84, 0x99, 0x47, 0xd8, 0xe0, 0x6a, 0x83, 0x1d, 0x7b, 0x39, 0x5a, 0xca, 0x45, 0x1a, 0x7e,
+	0x02, 0xa0, 0x8e, 0xb0, 0x9e, 0x22, 0x2a, 0x5f, 0x0a, 0xc3, 0x63, 0x86, 0x30, 0x39, 0xb1, 0x97,
+	0xb4, 0x35, 0xda, 0xb5, 0xc8, 0x23, 0x07, 0x3c, 0x20, 0x27, 0xf0, 0x05, 0x78, 0x6f, 0x66, 0x8a,
+	0x22, 0x2e, 0x28, 0x7b, 0xe5, 0x6f, 0x5a, 0x83, 0x9f, 0x2d, 0x76, 0x02, 0x35, 0x69, 0xce, 0x4c,
+	0x67, 0xee, 0xdd, 0xe6, 0xcc, 0x1e, 0x14, 0xa4, 0xdd, 0xe7, 0xa0, 0x3d, 0x7f, 0x0a, 0x2e, 0xf1,
+	0xac, 0xb5, 0xc1, 0x86, 0xeb, 0xe6, 0xaa, 0xc5, 0xdd, 0xdf, 0xf1, 0x0f, 0xaf, 0xcf, 0x3a, 0xde,
+	0xe9, 0x59, 0xc7, 0xfb, 0xeb, 0xac, 0xe3, 0xfd, 0x71, 0xde, 0x59, 0x39, 0x3d, 0xef, 0xac, 0xfc,
+	0x79, 0xde, 0x59, 0x79, 0x7e, 0x7f, 0xc2, 0xcd, 0x34, 0x1d, 0x07, 0x44, 0xc6, 0x21, 0x91, 0x3a,
+	0x96, 0x3a, 0x7c, 0x5b, 0xd5, 0xa7, 0xf5, 0x3b, 0x9d, 0xdd, 0x0d, 0x5f, 0xcd, 0x3e, 0xd6, 0x26,
+	0x4f, 0x98, 0x1e, 0x6f, 0xd8, 0x97, 0xf8, 0xee, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc8, 0xca,
+	0xbf, 0x7b, 0xa4, 0x08, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
@@ -972,7 +973,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.MatureUnbondingOps == nil {
-				m.MatureUnbondingOps = &types.MaturedUnbondingOps{}
+				m.MatureUnbondingOps = &MaturedUnbondingOps{}
 			}
 			if err := m.MatureUnbondingOps.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
diff --git a/x/ccv/provider/types/provider.pb.go b/x/ccv/provider/types/provider.pb.go
index e651a5415c..faff1ec8e3 100644
--- a/x/ccv/provider/types/provider.pb.go
+++ b/x/ccv/provider/types/provider.pb.go
@@ -13,6 +13,7 @@ import (
 	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
 	types "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
 	_07_tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
+	types3 "github.com/cosmos/interchain-security/v3/x/ccv/types"
 	_ "google.golang.org/protobuf/types/known/durationpb"
 	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
@@ -38,6 +39,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // chain are expected to validate the consumer chain at spawn time or get
 // slashed. It is recommended that spawn time occurs after the proposal end
 // time.
+//
+// Note this type is only used internally to the provider CCV module.
 type ConsumerAdditionProposal struct {
 	// the title of the proposal
 	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
@@ -127,6 +130,8 @@ var xxx_messageInfo_ConsumerAdditionProposal proto.InternalMessageInfo
 // remove (and stop) a consumer chain. If it passes, all the consumer chain's
 // state is removed from the provider chain. The outstanding unbonding operation
 // funds are released.
+//
+// Note this type is only used internally to the provider CCV module.
 type ConsumerRemovalProposal struct {
 	// the title of the proposal
 	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
@@ -200,6 +205,10 @@ func (m *ConsumerRemovalProposal) GetStopTime() time.Time {
 	return time.Time{}
 }
 
+// EquivocationProposal is a governance proposal on the provider chain to
+// punish a validator for equivocation on a consumer chain.
+//
+// This type is only used internally to the consumer CCV module.
 type EquivocationProposal struct {
 	// the title of the proposal
 	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
@@ -266,6 +275,8 @@ func (m *EquivocationProposal) GetEquivocations() []*types1.Equivocation {
 // A persisted queue entry indicating that a slash packet data instance needs to
 // be handled. This type belongs in the "global" queue, to coordinate slash
 // packet handling times between consumers.
+//
+// Soon to be depreicated
 type GlobalSlashEntry struct {
 	// Block time that slash packet was received by provider chain.
 	// This field is used for store key iteration ordering.
@@ -345,6 +356,8 @@ func (m *GlobalSlashEntry) GetProviderValConsAddr() []byte {
 }
 
 // Params defines the parameters for CCV Provider module
+//
+// Note this type is only used internally to the provider CCV module.
 type Params struct {
 	TemplateClient *_07_tendermint.ClientState `protobuf:"bytes,1,opt,name=template_client,json=templateClient,proto3" json:"template_client,omitempty"`
 	// TrustingPeriodFraction is used to compute the consumer and provider IBC
@@ -469,60 +482,10 @@ func (m *Params) GetConsumerRewardDenomRegistrationFee() types2.Coin {
 	return types2.Coin{}
 }
 
-type HandshakeMetadata struct {
-	ProviderFeePoolAddr string `protobuf:"bytes,1,opt,name=provider_fee_pool_addr,json=providerFeePoolAddr,proto3" json:"provider_fee_pool_addr,omitempty"`
-	Version             string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
-}
-
-func (m *HandshakeMetadata) Reset()         { *m = HandshakeMetadata{} }
-func (m *HandshakeMetadata) String() string { return proto.CompactTextString(m) }
-func (*HandshakeMetadata) ProtoMessage()    {}
-func (*HandshakeMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{5}
-}
-func (m *HandshakeMetadata) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *HandshakeMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_HandshakeMetadata.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *HandshakeMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HandshakeMetadata.Merge(m, src)
-}
-func (m *HandshakeMetadata) XXX_Size() int {
-	return m.Size()
-}
-func (m *HandshakeMetadata) XXX_DiscardUnknown() {
-	xxx_messageInfo_HandshakeMetadata.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_HandshakeMetadata proto.InternalMessageInfo
-
-func (m *HandshakeMetadata) GetProviderFeePoolAddr() string {
-	if m != nil {
-		return m.ProviderFeePoolAddr
-	}
-	return ""
-}
-
-func (m *HandshakeMetadata) GetVersion() string {
-	if m != nil {
-		return m.Version
-	}
-	return ""
-}
-
 // SlashAcks contains cons addresses of consumer chain validators
-// successfully slashed on the provider chain
+// successfully slashed on the provider chain.
+//
+// Note this type is only used internally to the provider CCV module.
 type SlashAcks struct {
 	Addresses []string `protobuf:"bytes,1,rep,name=addresses,proto3" json:"addresses,omitempty"`
 }
@@ -531,7 +494,7 @@ func (m *SlashAcks) Reset()         { *m = SlashAcks{} }
 func (m *SlashAcks) String() string { return proto.CompactTextString(m) }
 func (*SlashAcks) ProtoMessage()    {}
 func (*SlashAcks) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{6}
+	return fileDescriptor_f22ec409a72b7b72, []int{5}
 }
 func (m *SlashAcks) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -569,6 +532,8 @@ func (m *SlashAcks) GetAddresses() []string {
 
 // ConsumerAdditionProposals holds pending governance proposals on the provider
 // chain to spawn a new chain.
+//
+// Note this type is only used internally to the provider CCV module.
 type ConsumerAdditionProposals struct {
 	// proposals waiting for spawn_time to pass
 	Pending []*ConsumerAdditionProposal `protobuf:"bytes,1,rep,name=pending,proto3" json:"pending,omitempty"`
@@ -578,7 +543,7 @@ func (m *ConsumerAdditionProposals) Reset()         { *m = ConsumerAdditionPropo
 func (m *ConsumerAdditionProposals) String() string { return proto.CompactTextString(m) }
 func (*ConsumerAdditionProposals) ProtoMessage()    {}
 func (*ConsumerAdditionProposals) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{7}
+	return fileDescriptor_f22ec409a72b7b72, []int{6}
 }
 func (m *ConsumerAdditionProposals) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -616,6 +581,8 @@ func (m *ConsumerAdditionProposals) GetPending() []*ConsumerAdditionProposal {
 
 // ConsumerRemovalProposals holds pending governance proposals on the provider
 // chain to remove (and stop) a consumer chain.
+//
+// Note this type is only used internally to the provider CCV module.
 type ConsumerRemovalProposals struct {
 	// proposals waiting for stop_time to pass
 	Pending []*ConsumerRemovalProposal `protobuf:"bytes,1,rep,name=pending,proto3" json:"pending,omitempty"`
@@ -625,7 +592,7 @@ func (m *ConsumerRemovalProposals) Reset()         { *m = ConsumerRemovalProposa
 func (m *ConsumerRemovalProposals) String() string { return proto.CompactTextString(m) }
 func (*ConsumerRemovalProposals) ProtoMessage()    {}
 func (*ConsumerRemovalProposals) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{8}
+	return fileDescriptor_f22ec409a72b7b72, []int{7}
 }
 func (m *ConsumerRemovalProposals) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -662,6 +629,8 @@ func (m *ConsumerRemovalProposals) GetPending() []*ConsumerRemovalProposal {
 }
 
 // AddressList contains a list of consensus addresses
+//
+// Note this type is only used internally to the provider CCV module.
 type AddressList struct {
 	Addresses [][]byte `protobuf:"bytes,1,rep,name=addresses,proto3" json:"addresses,omitempty"`
 }
@@ -670,7 +639,7 @@ func (m *AddressList) Reset()         { *m = AddressList{} }
 func (m *AddressList) String() string { return proto.CompactTextString(m) }
 func (*AddressList) ProtoMessage()    {}
 func (*AddressList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{9}
+	return fileDescriptor_f22ec409a72b7b72, []int{8}
 }
 func (m *AddressList) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -706,6 +675,7 @@ func (m *AddressList) GetAddresses() [][]byte {
 	return nil
 }
 
+// Note this type is only used internally to the provider CCV module.
 type ChannelToChain struct {
 	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	ChainId   string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
@@ -715,7 +685,7 @@ func (m *ChannelToChain) Reset()         { *m = ChannelToChain{} }
 func (m *ChannelToChain) String() string { return proto.CompactTextString(m) }
 func (*ChannelToChain) ProtoMessage()    {}
 func (*ChannelToChain) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{10}
+	return fileDescriptor_f22ec409a72b7b72, []int{9}
 }
 func (m *ChannelToChain) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -760,6 +730,8 @@ func (m *ChannelToChain) GetChainId() string {
 
 // VscUnbondingOps contains the IDs of unbonding operations that are waiting for
 // at least one VSCMaturedPacket with vscID from a consumer chain
+//
+// Note this type is only used internally to the provider CCV module  .
 type VscUnbondingOps struct {
 	VscId          uint64   `protobuf:"varint,1,opt,name=vsc_id,json=vscId,proto3" json:"vsc_id,omitempty"`
 	UnbondingOpIds []uint64 `protobuf:"varint,2,rep,packed,name=unbonding_op_ids,json=unbondingOpIds,proto3" json:"unbonding_op_ids,omitempty"`
@@ -769,7 +741,7 @@ func (m *VscUnbondingOps) Reset()         { *m = VscUnbondingOps{} }
 func (m *VscUnbondingOps) String() string { return proto.CompactTextString(m) }
 func (*VscUnbondingOps) ProtoMessage()    {}
 func (*VscUnbondingOps) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{11}
+	return fileDescriptor_f22ec409a72b7b72, []int{10}
 }
 func (m *VscUnbondingOps) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -814,6 +786,8 @@ func (m *VscUnbondingOps) GetUnbondingOpIds() []uint64 {
 
 // UnbondingOp contains the ids of consumer chains that need to unbond before
 // the unbonding operation with the given ID can unbond
+//
+// Note this type is only used internally to the provider CCV module.
 type UnbondingOp struct {
 	Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
 	// consumer chains that are still unbonding
@@ -824,7 +798,7 @@ func (m *UnbondingOp) Reset()         { *m = UnbondingOp{} }
 func (m *UnbondingOp) String() string { return proto.CompactTextString(m) }
 func (*UnbondingOp) ProtoMessage()    {}
 func (*UnbondingOp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{12}
+	return fileDescriptor_f22ec409a72b7b72, []int{11}
 }
 func (m *UnbondingOp) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -867,6 +841,7 @@ func (m *UnbondingOp) GetUnbondingConsumerChains() []string {
 	return nil
 }
 
+// Note this type is only used internally to the provider CCV module.
 type InitTimeoutTimestamp struct {
 	ChainId   string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
 	Timestamp uint64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
@@ -876,7 +851,7 @@ func (m *InitTimeoutTimestamp) Reset()         { *m = InitTimeoutTimestamp{} }
 func (m *InitTimeoutTimestamp) String() string { return proto.CompactTextString(m) }
 func (*InitTimeoutTimestamp) ProtoMessage()    {}
 func (*InitTimeoutTimestamp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{13}
+	return fileDescriptor_f22ec409a72b7b72, []int{12}
 }
 func (m *InitTimeoutTimestamp) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -919,6 +894,7 @@ func (m *InitTimeoutTimestamp) GetTimestamp() uint64 {
 	return 0
 }
 
+// Note this type is only used internally to the provider CCV module.
 type VscSendTimestamp struct {
 	VscId     uint64    `protobuf:"varint,1,opt,name=vsc_id,json=vscId,proto3" json:"vsc_id,omitempty"`
 	Timestamp time.Time `protobuf:"bytes,2,opt,name=timestamp,proto3,stdtime" json:"timestamp"`
@@ -928,7 +904,7 @@ func (m *VscSendTimestamp) Reset()         { *m = VscSendTimestamp{} }
 func (m *VscSendTimestamp) String() string { return proto.CompactTextString(m) }
 func (*VscSendTimestamp) ProtoMessage()    {}
 func (*VscSendTimestamp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{14}
+	return fileDescriptor_f22ec409a72b7b72, []int{13}
 }
 func (m *VscSendTimestamp) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -971,6 +947,102 @@ func (m *VscSendTimestamp) GetTimestamp() time.Time {
 	return time.Time{}
 }
 
+// ValidatorSetChangePackets is a pb list of ccv.ValidatorSetChangePacketData.
+//
+// Note this type is only used internally to the provider CCV module.
+type ValidatorSetChangePackets struct {
+	List []types3.ValidatorSetChangePacketData `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
+}
+
+func (m *ValidatorSetChangePackets) Reset()         { *m = ValidatorSetChangePackets{} }
+func (m *ValidatorSetChangePackets) String() string { return proto.CompactTextString(m) }
+func (*ValidatorSetChangePackets) ProtoMessage()    {}
+func (*ValidatorSetChangePackets) Descriptor() ([]byte, []int) {
+	return fileDescriptor_f22ec409a72b7b72, []int{14}
+}
+func (m *ValidatorSetChangePackets) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ValidatorSetChangePackets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_ValidatorSetChangePackets.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *ValidatorSetChangePackets) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ValidatorSetChangePackets.Merge(m, src)
+}
+func (m *ValidatorSetChangePackets) XXX_Size() int {
+	return m.Size()
+}
+func (m *ValidatorSetChangePackets) XXX_DiscardUnknown() {
+	xxx_messageInfo_ValidatorSetChangePackets.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ValidatorSetChangePackets proto.InternalMessageInfo
+
+func (m *ValidatorSetChangePackets) GetList() []types3.ValidatorSetChangePacketData {
+	if m != nil {
+		return m.List
+	}
+	return nil
+}
+
+// MaturedUnbondingOps defines a list of ids corresponding to ids of matured
+// unbonding operations.
+//
+// Note this type is only used internally to the provider CCV module.
+type MaturedUnbondingOps struct {
+	Ids []uint64 `protobuf:"varint,1,rep,packed,name=ids,proto3" json:"ids,omitempty"`
+}
+
+func (m *MaturedUnbondingOps) Reset()         { *m = MaturedUnbondingOps{} }
+func (m *MaturedUnbondingOps) String() string { return proto.CompactTextString(m) }
+func (*MaturedUnbondingOps) ProtoMessage()    {}
+func (*MaturedUnbondingOps) Descriptor() ([]byte, []int) {
+	return fileDescriptor_f22ec409a72b7b72, []int{15}
+}
+func (m *MaturedUnbondingOps) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MaturedUnbondingOps) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MaturedUnbondingOps.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MaturedUnbondingOps) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaturedUnbondingOps.Merge(m, src)
+}
+func (m *MaturedUnbondingOps) XXX_Size() int {
+	return m.Size()
+}
+func (m *MaturedUnbondingOps) XXX_DiscardUnknown() {
+	xxx_messageInfo_MaturedUnbondingOps.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MaturedUnbondingOps proto.InternalMessageInfo
+
+func (m *MaturedUnbondingOps) GetIds() []uint64 {
+	if m != nil {
+		return m.Ids
+	}
+	return nil
+}
+
+// Note this type is only used internally to the provider CCV module.
 type KeyAssignmentReplacement struct {
 	ProviderAddr []byte            `protobuf:"bytes,1,opt,name=provider_addr,json=providerAddr,proto3" json:"provider_addr,omitempty"`
 	PrevCKey     *crypto.PublicKey `protobuf:"bytes,2,opt,name=prev_c_key,json=prevCKey,proto3" json:"prev_c_key,omitempty"`
@@ -981,7 +1053,7 @@ func (m *KeyAssignmentReplacement) Reset()         { *m = KeyAssignmentReplaceme
 func (m *KeyAssignmentReplacement) String() string { return proto.CompactTextString(m) }
 func (*KeyAssignmentReplacement) ProtoMessage()    {}
 func (*KeyAssignmentReplacement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{15}
+	return fileDescriptor_f22ec409a72b7b72, []int{16}
 }
 func (m *KeyAssignmentReplacement) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1034,6 +1106,8 @@ func (m *KeyAssignmentReplacement) GetPower() int64 {
 // Used to serialize the ValidatorConsumerPubKey index from key assignment
 // ValidatorConsumerPubKey: (chainID, providerAddr consAddr) -> consumerKey
 // tmprotocrypto.PublicKey
+//
+// Note this type is only used internally to the provider CCV module.
 type ValidatorConsumerPubKey struct {
 	ChainId      string            `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
 	ProviderAddr []byte            `protobuf:"bytes,2,opt,name=provider_addr,json=providerAddr,proto3" json:"provider_addr,omitempty"`
@@ -1044,7 +1118,7 @@ func (m *ValidatorConsumerPubKey) Reset()         { *m = ValidatorConsumerPubKey
 func (m *ValidatorConsumerPubKey) String() string { return proto.CompactTextString(m) }
 func (*ValidatorConsumerPubKey) ProtoMessage()    {}
 func (*ValidatorConsumerPubKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{16}
+	return fileDescriptor_f22ec409a72b7b72, []int{17}
 }
 func (m *ValidatorConsumerPubKey) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1097,6 +1171,8 @@ func (m *ValidatorConsumerPubKey) GetConsumerKey() *crypto.PublicKey {
 // Used to serialize the ValidatorConsumerAddr index from key assignment
 // ValidatorByConsumerAddr: (chainID, consumerAddr consAddr) -> providerAddr
 // consAddr
+//
+// Note this type is only used internally to the provider CCV module.
 type ValidatorByConsumerAddr struct {
 	ChainId      string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
 	ConsumerAddr []byte `protobuf:"bytes,2,opt,name=consumer_addr,json=consumerAddr,proto3" json:"consumer_addr,omitempty"`
@@ -1107,7 +1183,7 @@ func (m *ValidatorByConsumerAddr) Reset()         { *m = ValidatorByConsumerAddr
 func (m *ValidatorByConsumerAddr) String() string { return proto.CompactTextString(m) }
 func (*ValidatorByConsumerAddr) ProtoMessage()    {}
 func (*ValidatorByConsumerAddr) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{17}
+	return fileDescriptor_f22ec409a72b7b72, []int{18}
 }
 func (m *ValidatorByConsumerAddr) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1159,6 +1235,8 @@ func (m *ValidatorByConsumerAddr) GetProviderAddr() []byte {
 
 // Used to serialize the ConsumerAddrsToPrune index from key assignment
 // ConsumerAddrsToPrune: (chainID, vscID uint64) -> consumerAddrs AddressList
+//
+// Note this type is only used internally to the provider CCV module.
 type ConsumerAddrsToPrune struct {
 	ChainId       string       `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
 	VscId         uint64       `protobuf:"varint,2,opt,name=vsc_id,json=vscId,proto3" json:"vsc_id,omitempty"`
@@ -1169,7 +1247,7 @@ func (m *ConsumerAddrsToPrune) Reset()         { *m = ConsumerAddrsToPrune{} }
 func (m *ConsumerAddrsToPrune) String() string { return proto.CompactTextString(m) }
 func (*ConsumerAddrsToPrune) ProtoMessage()    {}
 func (*ConsumerAddrsToPrune) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{18}
+	return fileDescriptor_f22ec409a72b7b72, []int{19}
 }
 func (m *ConsumerAddrsToPrune) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1225,7 +1303,6 @@ func init() {
 	proto.RegisterType((*EquivocationProposal)(nil), "interchain_security.ccv.provider.v1.EquivocationProposal")
 	proto.RegisterType((*GlobalSlashEntry)(nil), "interchain_security.ccv.provider.v1.GlobalSlashEntry")
 	proto.RegisterType((*Params)(nil), "interchain_security.ccv.provider.v1.Params")
-	proto.RegisterType((*HandshakeMetadata)(nil), "interchain_security.ccv.provider.v1.HandshakeMetadata")
 	proto.RegisterType((*SlashAcks)(nil), "interchain_security.ccv.provider.v1.SlashAcks")
 	proto.RegisterType((*ConsumerAdditionProposals)(nil), "interchain_security.ccv.provider.v1.ConsumerAdditionProposals")
 	proto.RegisterType((*ConsumerRemovalProposals)(nil), "interchain_security.ccv.provider.v1.ConsumerRemovalProposals")
@@ -1235,6 +1312,8 @@ func init() {
 	proto.RegisterType((*UnbondingOp)(nil), "interchain_security.ccv.provider.v1.UnbondingOp")
 	proto.RegisterType((*InitTimeoutTimestamp)(nil), "interchain_security.ccv.provider.v1.InitTimeoutTimestamp")
 	proto.RegisterType((*VscSendTimestamp)(nil), "interchain_security.ccv.provider.v1.VscSendTimestamp")
+	proto.RegisterType((*ValidatorSetChangePackets)(nil), "interchain_security.ccv.provider.v1.ValidatorSetChangePackets")
+	proto.RegisterType((*MaturedUnbondingOps)(nil), "interchain_security.ccv.provider.v1.MaturedUnbondingOps")
 	proto.RegisterType((*KeyAssignmentReplacement)(nil), "interchain_security.ccv.provider.v1.KeyAssignmentReplacement")
 	proto.RegisterType((*ValidatorConsumerPubKey)(nil), "interchain_security.ccv.provider.v1.ValidatorConsumerPubKey")
 	proto.RegisterType((*ValidatorByConsumerAddr)(nil), "interchain_security.ccv.provider.v1.ValidatorByConsumerAddr")
@@ -1246,107 +1325,109 @@ func init() {
 }
 
 var fileDescriptor_f22ec409a72b7b72 = []byte{
-	// 1598 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4b, 0x73, 0xdc, 0xc6,
-	0x11, 0x26, 0xb8, 0x7c, 0xed, 0x2c, 0x1f, 0x12, 0x44, 0x59, 0x4b, 0x85, 0x59, 0xae, 0xe0, 0xc4,
-	0xc5, 0x94, 0xcb, 0xd8, 0x90, 0xba, 0xa4, 0x54, 0x71, 0xb9, 0xc8, 0x95, 0x65, 0xd1, 0x8c, 0xad,
-	0x35, 0xc8, 0x50, 0x95, 0xe4, 0x80, 0x1a, 0x0c, 0x5a, 0xbb, 0x53, 0x04, 0x30, 0xd0, 0xcc, 0x00,
-	0xd2, 0x5e, 0x72, 0xce, 0xd1, 0xb9, 0xb9, 0x92, 0x8b, 0xf3, 0x0b, 0xf2, 0x37, 0x7c, 0xf4, 0x31,
-	0x27, 0x3b, 0x45, 0x1d, 0x72, 0xc8, 0x9f, 0x48, 0xcd, 0xe0, 0xcd, 0x87, 0xb3, 0xaa, 0xc4, 0x37,
-	0xcc, 0x4c, 0xf7, 0xd7, 0xdd, 0xd3, 0xdd, 0x5f, 0x0f, 0xd0, 0x3e, 0x8d, 0x24, 0x70, 0x32, 0xc1,
-	0x34, 0x72, 0x05, 0x90, 0x84, 0x53, 0x39, 0x1d, 0x10, 0x92, 0x0e, 0x62, 0xce, 0x52, 0xea, 0x03,
-	0x1f, 0xa4, 0x7b, 0xe5, 0xb7, 0x1d, 0x73, 0x26, 0x99, 0xf9, 0xee, 0x35, 0x3a, 0x36, 0x21, 0xa9,
-	0x5d, 0xca, 0xa5, 0x7b, 0xf7, 0x37, 0xc7, 0x6c, 0xcc, 0xb4, 0xfc, 0x40, 0x7d, 0x65, 0xaa, 0xf7,
-	0x77, 0xc6, 0x8c, 0x8d, 0x03, 0x18, 0xe8, 0x95, 0x97, 0xbc, 0x18, 0x48, 0x1a, 0x82, 0x90, 0x38,
-	0x8c, 0x73, 0x81, 0xde, 0x65, 0x01, 0x3f, 0xe1, 0x58, 0x52, 0x16, 0x15, 0x00, 0xd4, 0x23, 0x03,
-	0xc2, 0x38, 0x0c, 0x48, 0x40, 0x21, 0x92, 0xca, 0xbd, 0xec, 0x2b, 0x17, 0x18, 0x28, 0x81, 0x80,
-	0x8e, 0x27, 0x32, 0xdb, 0x16, 0x03, 0x09, 0x91, 0x0f, 0x3c, 0xa4, 0x99, 0x70, 0xb5, 0xca, 0x15,
-	0xb6, 0x6b, 0xe7, 0x84, 0x4f, 0x63, 0xc9, 0x06, 0xe7, 0x30, 0x15, 0xf9, 0xe9, 0x7b, 0x84, 0x89,
-	0x90, 0x89, 0x01, 0xa8, 0xc0, 0x22, 0x02, 0x83, 0x74, 0xcf, 0x03, 0x89, 0xf7, 0xca, 0x8d, 0xc2,
-	0xef, 0x5c, 0xce, 0xc3, 0xa2, 0x92, 0x21, 0x8c, 0xe6, 0x7e, 0x5b, 0xdf, 0x2f, 0xa1, 0xee, 0x90,
-	0x45, 0x22, 0x09, 0x81, 0x1f, 0xf8, 0x3e, 0x55, 0x21, 0x8d, 0x38, 0x8b, 0x99, 0xc0, 0x81, 0xb9,
-	0x89, 0x16, 0x25, 0x95, 0x01, 0x74, 0x8d, 0xbe, 0xb1, 0xdb, 0x76, 0xb2, 0x85, 0xd9, 0x47, 0x1d,
-	0x1f, 0x04, 0xe1, 0x34, 0x56, 0xc2, 0xdd, 0x79, 0x7d, 0x56, 0xdf, 0x32, 0xb7, 0xd0, 0x4a, 0x96,
-	0x05, 0xea, 0x77, 0x5b, 0xfa, 0x78, 0x59, 0xaf, 0x8f, 0x7c, 0xf3, 0x13, 0xb4, 0x4e, 0x23, 0x2a,
-	0x29, 0x0e, 0xdc, 0x09, 0xa8, 0xdb, 0xe8, 0x2e, 0xf4, 0x8d, 0xdd, 0xce, 0xfe, 0x7d, 0x9b, 0x7a,
-	0xc4, 0x56, 0x17, 0x68, 0xe7, 0xd7, 0x96, 0xee, 0xd9, 0x4f, 0xb5, 0xc4, 0xe1, 0xc2, 0x37, 0xdf,
-	0xed, 0xcc, 0x39, 0x6b, 0xb9, 0x5e, 0xb6, 0x69, 0x3e, 0x40, 0xab, 0x63, 0x88, 0x40, 0x50, 0xe1,
-	0x4e, 0xb0, 0x98, 0x74, 0x17, 0xfb, 0xc6, 0xee, 0xaa, 0xd3, 0xc9, 0xf7, 0x9e, 0x62, 0x31, 0x31,
-	0x77, 0x50, 0xc7, 0xa3, 0x11, 0xe6, 0xd3, 0x4c, 0x62, 0x49, 0x4b, 0xa0, 0x6c, 0x4b, 0x0b, 0x0c,
-	0x11, 0x12, 0x31, 0x7e, 0x15, 0xb9, 0x2a, 0xdb, 0xdd, 0xe5, 0xdc, 0x91, 0x2c, 0xd3, 0x76, 0x91,
-	0x69, 0xfb, 0xb4, 0x28, 0x85, 0xc3, 0x15, 0xe5, 0xc8, 0x97, 0xdf, 0xef, 0x18, 0x4e, 0x5b, 0xeb,
-	0xa9, 0x13, 0xf3, 0x73, 0x74, 0x2b, 0x89, 0x3c, 0x16, 0xf9, 0x34, 0x1a, 0xbb, 0x31, 0x70, 0xca,
-	0xfc, 0xee, 0x8a, 0x86, 0xda, 0xba, 0x02, 0xf5, 0x38, 0x2f, 0x9a, 0x0c, 0xe9, 0x2b, 0x85, 0xb4,
-	0x51, 0x2a, 0x8f, 0xb4, 0xae, 0xf9, 0x05, 0x32, 0x09, 0x49, 0xb5, 0x4b, 0x2c, 0x91, 0x05, 0x62,
-	0x7b, 0x76, 0xc4, 0x5b, 0x84, 0xa4, 0xa7, 0x99, 0x76, 0x0e, 0xf9, 0x07, 0x74, 0x4f, 0x72, 0x1c,
-	0x89, 0x17, 0xc0, 0x2f, 0xe3, 0xa2, 0xd9, 0x71, 0xef, 0x16, 0x18, 0x4d, 0xf0, 0xa7, 0xa8, 0x4f,
-	0xf2, 0x02, 0x72, 0x39, 0xf8, 0x54, 0x48, 0x4e, 0xbd, 0x44, 0xe9, 0xba, 0x2f, 0x38, 0x26, 0xba,
-	0x46, 0x3a, 0xba, 0x08, 0x7a, 0x85, 0x9c, 0xd3, 0x10, 0x7b, 0x92, 0x4b, 0x99, 0xcf, 0xd0, 0xcf,
-	0xbc, 0x80, 0x91, 0x73, 0xa1, 0x9c, 0x73, 0x1b, 0x48, 0xda, 0x74, 0x48, 0x85, 0x50, 0x68, 0xab,
-	0x7d, 0x63, 0xb7, 0xe5, 0x3c, 0xc8, 0x64, 0x47, 0xc0, 0x1f, 0xd7, 0x24, 0x4f, 0x6b, 0x82, 0xe6,
-	0x07, 0xc8, 0x9c, 0x50, 0x21, 0x19, 0xa7, 0x04, 0x07, 0x2e, 0x44, 0x92, 0x53, 0x10, 0xdd, 0x35,
-	0xad, 0x7e, 0xbb, 0x3a, 0xf9, 0x38, 0x3b, 0x30, 0x3f, 0x45, 0x0f, 0x6e, 0x34, 0xea, 0x92, 0x09,
-	0x8e, 0x22, 0x08, 0xba, 0xeb, 0x3a, 0x94, 0x1d, 0xff, 0x06, 0x9b, 0xc3, 0x4c, 0xec, 0xd1, 0xca,
-	0x9f, 0xbe, 0xde, 0x99, 0xfb, 0xea, 0xeb, 0x9d, 0x39, 0xeb, 0xef, 0x06, 0xba, 0x37, 0x2c, 0x03,
-	0x0f, 0x59, 0x8a, 0x83, 0x1f, 0xb3, 0xc1, 0x0e, 0x50, 0x5b, 0x48, 0x16, 0x67, 0x25, 0xbd, 0xf0,
-	0x16, 0x25, 0xbd, 0xa2, 0xd4, 0xd4, 0x81, 0xf5, 0x57, 0x03, 0x6d, 0x7e, 0xfc, 0x32, 0xa1, 0x29,
-	0x23, 0xf8, 0xff, 0xc2, 0x07, 0xc7, 0x68, 0x0d, 0x6a, 0x78, 0xa2, 0xdb, 0xea, 0xb7, 0x76, 0x3b,
-	0xfb, 0x3f, 0xb7, 0x33, 0x72, 0xb2, 0x4b, 0xce, 0xca, 0x09, 0xca, 0xae, 0x5b, 0x77, 0x9a, 0xba,
-	0xd6, 0xbf, 0x0d, 0x74, 0xeb, 0x93, 0x80, 0x79, 0x38, 0x38, 0x09, 0xb0, 0x98, 0xa8, 0xe4, 0x4d,
-	0x55, 0xd4, 0x1c, 0xf2, 0xae, 0xd1, 0xde, 0xcd, 0x1c, 0xb5, 0x52, 0xd3, 0x7d, 0xfc, 0x11, 0xba,
-	0x5d, 0xd6, 0x71, 0x79, 0xb9, 0x3a, 0x98, 0xc3, 0x3b, 0x17, 0xdf, 0xed, 0x6c, 0x14, 0x39, 0x1c,
-	0xea, 0x8b, 0x7e, 0xec, 0x6c, 0x90, 0xc6, 0x86, 0x6f, 0xf6, 0x50, 0x87, 0x7a, 0xc4, 0x15, 0xf0,
-	0xd2, 0x8d, 0x92, 0x50, 0xe7, 0x65, 0xc1, 0x69, 0x53, 0x8f, 0x9c, 0xc0, 0xcb, 0xcf, 0x93, 0xd0,
-	0x7c, 0x88, 0xde, 0x29, 0x06, 0x91, 0x9b, 0xe2, 0xc0, 0x55, 0xfa, 0x2e, 0xf6, 0x7d, 0xae, 0xd3,
-	0xb4, 0xea, 0xdc, 0x29, 0x4e, 0xcf, 0x70, 0xa0, 0x8c, 0x1d, 0xf8, 0x3e, 0xb7, 0xfe, 0xb5, 0x88,
-	0x96, 0x46, 0x98, 0xe3, 0x50, 0x98, 0xa7, 0x68, 0x43, 0x42, 0x18, 0x07, 0x58, 0x82, 0x9b, 0x71,
-	0x64, 0x1e, 0xe9, 0xfb, 0x9a, 0x3b, 0xeb, 0xb3, 0xc5, 0xae, 0x4d, 0x93, 0x74, 0xcf, 0x1e, 0xea,
-	0xdd, 0x13, 0x89, 0x25, 0x38, 0xeb, 0x05, 0x46, 0xb6, 0x69, 0xfe, 0x0a, 0x75, 0x25, 0x4f, 0x84,
-	0xac, 0xd8, 0xab, 0x6a, 0xdb, 0x2c, 0x95, 0xef, 0x14, 0xe7, 0x59, 0xc3, 0x97, 0xed, 0x7a, 0x3d,
-	0x51, 0xb5, 0xfe, 0x17, 0xa2, 0x3a, 0x41, 0x77, 0x14, 0xcb, 0x5f, 0xc6, 0x5c, 0x98, 0x1d, 0xf3,
-	0xb6, 0xd2, 0x6f, 0x82, 0x7e, 0x81, 0xcc, 0x54, 0x90, 0xcb, 0x98, 0x8b, 0x6f, 0xe1, 0x67, 0x2a,
-	0x48, 0x13, 0xd2, 0x47, 0xdb, 0x42, 0x15, 0x9f, 0x1b, 0x82, 0xd4, 0xb4, 0x17, 0x07, 0x10, 0x51,
-	0x31, 0x29, 0xc0, 0x97, 0x66, 0x07, 0xdf, 0xd2, 0x40, 0x9f, 0x29, 0x1c, 0xa7, 0x80, 0xc9, 0xad,
-	0x0c, 0x51, 0xef, 0x7a, 0x2b, 0x65, 0x82, 0x96, 0x75, 0x82, 0x7e, 0x72, 0x0d, 0x44, 0x99, 0xa5,
-	0x7d, 0x74, 0x37, 0xc4, 0xaf, 0x5d, 0x39, 0xe1, 0x4c, 0xca, 0x00, 0x7c, 0x37, 0xc6, 0xe4, 0x1c,
-	0xa4, 0xd0, 0x33, 0xaa, 0xe5, 0xdc, 0x09, 0xf1, 0xeb, 0xd3, 0xe2, 0x6c, 0x94, 0x1d, 0x99, 0x02,
-	0xbd, 0x57, 0xa3, 0xf4, 0x57, 0x98, 0xfb, 0xae, 0x0f, 0x11, 0x0b, 0x5d, 0x0e, 0x63, 0xc5, 0x7b,
-	0x38, 0x63, 0x77, 0x80, 0x72, 0x2c, 0xe5, 0x8d, 0xac, 0x5e, 0x19, 0x65, 0x13, 0x0f, 0x19, 0x8d,
-	0xf2, 0xd9, 0x6d, 0x55, 0xcc, 0xaf, 0xd0, 0x1e, 0x2b, 0x30, 0xa7, 0x86, 0xf5, 0x04, 0xc0, 0xf2,
-	0xd0, 0xed, 0xa7, 0x38, 0xf2, 0xc5, 0x04, 0x9f, 0xc3, 0x67, 0x20, 0xb1, 0x8f, 0x25, 0x6e, 0xf4,
-	0xcc, 0x0b, 0x00, 0x37, 0x66, 0x2c, 0xc8, 0x7a, 0x26, 0xa3, 0xa0, 0xb2, 0x67, 0x9e, 0x00, 0x8c,
-	0x18, 0x0b, 0x54, 0xcf, 0x98, 0x5d, 0xb4, 0x9c, 0x02, 0x17, 0x55, 0x05, 0x17, 0x4b, 0xeb, 0x17,
-	0xa8, 0xad, 0x49, 0xe3, 0x80, 0x9c, 0x0b, 0x73, 0x1b, 0xb5, 0x15, 0x12, 0x08, 0x01, 0xa2, 0x6b,
-	0xf4, 0x5b, 0xbb, 0x6d, 0xa7, 0xda, 0xb0, 0x24, 0xda, 0xba, 0xe9, 0x5d, 0x24, 0xcc, 0xe7, 0x68,
-	0x39, 0x06, 0x3d, 0xb4, 0xb5, 0x62, 0x67, 0xff, 0x43, 0x7b, 0x86, 0xb7, 0xa7, 0x7d, 0x13, 0xa0,
-	0x53, 0xa0, 0x59, 0xbc, 0x7a, 0x8d, 0x5d, 0x9a, 0x15, 0xc2, 0x3c, 0xbb, 0x6c, 0xf4, 0xd7, 0x6f,
-	0x65, 0xf4, 0x12, 0x5e, 0x65, 0xf3, 0x7d, 0xd4, 0x39, 0xc8, 0xc2, 0xfe, 0x0d, 0x15, 0xf2, 0xea,
-	0xb5, 0xac, 0xd6, 0xaf, 0xe5, 0x53, 0xb4, 0x9e, 0x8f, 0xb8, 0x53, 0xa6, 0x89, 0xcf, 0xfc, 0x29,
-	0x42, 0xf9, 0x6c, 0x54, 0x84, 0x99, 0xa5, 0xa5, 0x9d, 0xef, 0x1c, 0xf9, 0x8d, 0x51, 0x35, 0xdf,
-	0x18, 0x55, 0x96, 0x83, 0x36, 0xce, 0x04, 0xf9, 0x6d, 0xf1, 0xfe, 0x79, 0x16, 0x0b, 0xf3, 0x2e,
-	0x5a, 0x52, 0xbd, 0x9a, 0x03, 0x2d, 0x38, 0x8b, 0xa9, 0x20, 0x47, 0xbe, 0xb9, 0x5b, 0x7f, 0x63,
-	0xb1, 0xd8, 0xa5, 0xbe, 0xe8, 0xce, 0xf7, 0x5b, 0xbb, 0x0b, 0xce, 0x7a, 0x52, 0xa9, 0x1f, 0xf9,
-	0xc2, 0xfa, 0x1d, 0xea, 0xd4, 0x00, 0xcd, 0x75, 0x34, 0x5f, 0x62, 0xcd, 0x53, 0xdf, 0x7c, 0x84,
-	0xb6, 0x2a, 0xa0, 0x26, 0xdd, 0x67, 0x88, 0x6d, 0xe7, 0x5e, 0x29, 0xd0, 0x60, 0x7c, 0x61, 0x3d,
-	0x43, 0x9b, 0x47, 0x15, 0xb9, 0x94, 0xc3, 0xa4, 0x11, 0xa1, 0xd1, 0x1c, 0xc6, 0xdb, 0xa8, 0x5d,
-	0xfe, 0x48, 0xe8, 0xe8, 0x17, 0x9c, 0x6a, 0xc3, 0x0a, 0xd1, 0xad, 0x33, 0x41, 0x4e, 0x20, 0xf2,
-	0x2b, 0xb0, 0x1b, 0x2e, 0xe0, 0xf0, 0x32, 0xd0, 0xcc, 0x0f, 0xd5, 0xca, 0xdc, 0x9f, 0x0d, 0xd4,
-	0x3d, 0x86, 0xe9, 0x81, 0x10, 0x74, 0x1c, 0x85, 0x10, 0x49, 0x45, 0x16, 0x98, 0x80, 0xfa, 0x34,
-	0xdf, 0x45, 0x6b, 0x65, 0xa3, 0x95, 0xfd, 0xb5, 0xea, 0xac, 0x16, 0x9b, 0xba, 0xb1, 0x1e, 0x21,
-	0x14, 0x73, 0x48, 0x5d, 0xe2, 0x9e, 0xc3, 0x34, 0x77, 0x63, 0xbb, 0x3e, 0x6b, 0xb2, 0xff, 0x14,
-	0x7b, 0x94, 0x78, 0x01, 0x25, 0xc7, 0x30, 0x75, 0x56, 0x94, 0xfc, 0xf0, 0x18, 0xa6, 0xea, 0xed,
-	0x10, 0xb3, 0x57, 0xc0, 0xf5, 0x80, 0x68, 0x39, 0xd9, 0xc2, 0xfa, 0x8b, 0x81, 0xee, 0x9d, 0xe1,
-	0x80, 0xfa, 0x58, 0x32, 0x5e, 0xdc, 0xf7, 0x28, 0xf1, 0x94, 0xc6, 0x0f, 0xdc, 0xeb, 0x15, 0x6f,
-	0xe7, 0xaf, 0xf1, 0xf6, 0x23, 0xb4, 0x5a, 0x66, 0x58, 0xf9, 0xdb, 0x9a, 0xc1, 0xdf, 0x4e, 0xa1,
-	0x71, 0x0c, 0x53, 0xeb, 0x8f, 0x35, 0xdf, 0x0e, 0xa7, 0xb5, 0xe6, 0xe5, 0xff, 0xc5, 0xb7, 0xd2,
-	0x6c, 0xdd, 0x37, 0x52, 0xd7, 0xbf, 0x12, 0x40, 0xeb, 0x6a, 0x00, 0xd6, 0xdf, 0x0c, 0xb4, 0x59,
-	0xb7, 0x2a, 0x4e, 0xd9, 0x88, 0x27, 0x11, 0xfc, 0x90, 0xf5, 0xaa, 0x7e, 0xe6, 0xeb, 0xf5, 0xf3,
-	0x1c, 0xad, 0x37, 0x9c, 0x12, 0xf9, 0x6d, 0xfc, 0x72, 0x26, 0x0a, 0xa9, 0xd1, 0x83, 0xb3, 0x56,
-	0x8f, 0x43, 0x1c, 0x3e, 0xff, 0xe6, 0xa2, 0x67, 0x7c, 0x7b, 0xd1, 0x33, 0xfe, 0x79, 0xd1, 0x33,
-	0xbe, 0x7c, 0xd3, 0x9b, 0xfb, 0xf6, 0x4d, 0x6f, 0xee, 0x1f, 0x6f, 0x7a, 0x73, 0xbf, 0xff, 0x70,
-	0x4c, 0xe5, 0x24, 0xf1, 0x6c, 0xc2, 0xc2, 0x41, 0xfe, 0x13, 0x5a, 0xd9, 0xfa, 0xa0, 0xfc, 0xa7,
-	0x4f, 0x1f, 0x0e, 0x5e, 0x37, 0x7f, 0xec, 0xe5, 0x34, 0x06, 0xe1, 0x2d, 0xe9, 0xb2, 0x7e, 0xf8,
-	0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x73, 0xaf, 0xd0, 0x18, 0x09, 0x10, 0x00, 0x00,
+	// 1632 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x72, 0x1b, 0xc7,
+	0x11, 0xe6, 0x12, 0x20, 0x45, 0x34, 0xf8, 0xa7, 0x25, 0x65, 0x81, 0x0a, 0x03, 0x42, 0xeb, 0xd8,
+	0x61, 0xca, 0xe5, 0x85, 0x49, 0x5d, 0x5c, 0xaa, 0xb8, 0x5c, 0x24, 0x68, 0x5b, 0x34, 0x63, 0x8b,
+	0x5e, 0x32, 0x54, 0x25, 0x39, 0x6c, 0x0d, 0x66, 0x47, 0xc0, 0x14, 0x77, 0x77, 0x56, 0x33, 0xb3,
+	0x2b, 0xe1, 0x92, 0x73, 0x8e, 0xce, 0xcd, 0x95, 0x5c, 0x9c, 0x27, 0xc8, 0x6b, 0xf8, 0xe8, 0x63,
+	0x4e, 0x76, 0x4a, 0x3a, 0xe4, 0x90, 0x97, 0x48, 0xcd, 0xec, 0x3f, 0x49, 0x28, 0x50, 0x25, 0xbe,
+	0xcd, 0xce, 0x74, 0x7f, 0xdd, 0x3d, 0xdd, 0xfd, 0xf5, 0x00, 0xb0, 0x4f, 0x43, 0x49, 0x38, 0x1e,
+	0x23, 0x1a, 0xba, 0x82, 0xe0, 0x98, 0x53, 0x39, 0xe9, 0x63, 0x9c, 0xf4, 0x23, 0xce, 0x12, 0xea,
+	0x11, 0xde, 0x4f, 0xf6, 0x8a, 0xb5, 0x1d, 0x71, 0x26, 0x99, 0xf9, 0xf6, 0x0d, 0x3a, 0x36, 0xc6,
+	0x89, 0x5d, 0xc8, 0x25, 0x7b, 0xf7, 0x3e, 0x98, 0x06, 0x9c, 0xec, 0xf5, 0xc5, 0x18, 0x71, 0xe2,
+	0xb9, 0x98, 0x85, 0x22, 0x0e, 0x72, 0xd8, 0x7b, 0xef, 0xbc, 0x46, 0xe3, 0x39, 0xe5, 0x24, 0x13,
+	0xdb, 0x1c, 0xb1, 0x11, 0xd3, 0xcb, 0xbe, 0x5a, 0x65, 0xbb, 0x3b, 0x23, 0xc6, 0x46, 0x3e, 0xe9,
+	0xeb, 0xaf, 0x61, 0xfc, 0xb4, 0x2f, 0x69, 0x40, 0x84, 0x44, 0x41, 0x94, 0x09, 0x74, 0xaf, 0x0a,
+	0x78, 0x31, 0x47, 0x92, 0xb2, 0x30, 0x07, 0xa0, 0x43, 0xdc, 0xc7, 0x8c, 0x93, 0x3e, 0xf6, 0x29,
+	0x09, 0xa5, 0xb2, 0x9a, 0xae, 0x32, 0x81, 0xbe, 0x12, 0xf0, 0xe9, 0x68, 0x2c, 0xd3, 0x6d, 0xd1,
+	0x97, 0x24, 0xf4, 0x08, 0x0f, 0x68, 0x2a, 0x5c, 0x7e, 0x65, 0x0a, 0xdb, 0x95, 0x73, 0xcc, 0x27,
+	0x91, 0x64, 0xfd, 0x4b, 0x32, 0x11, 0xd9, 0xe9, 0xbb, 0x98, 0x89, 0x80, 0x89, 0x3e, 0x51, 0x37,
+	0x16, 0x62, 0xd2, 0x4f, 0xf6, 0x86, 0x44, 0xa2, 0xbd, 0x62, 0x23, 0xf7, 0x3b, 0x93, 0x1b, 0x22,
+	0x51, 0xca, 0x60, 0x46, 0x33, 0xbf, 0xad, 0x1f, 0x17, 0xa1, 0x33, 0xc8, 0x2e, 0xf2, 0xc0, 0xf3,
+	0xa8, 0x0a, 0xe9, 0x94, 0xb3, 0x88, 0x09, 0xe4, 0x9b, 0x9b, 0xb0, 0x20, 0xa9, 0xf4, 0x49, 0xc7,
+	0xe8, 0x19, 0xbb, 0x2d, 0x27, 0xfd, 0x30, 0x7b, 0xd0, 0xf6, 0x88, 0xc0, 0x9c, 0x46, 0x4a, 0xb8,
+	0x33, 0xaf, 0xcf, 0xaa, 0x5b, 0xe6, 0x16, 0x2c, 0xa5, 0x79, 0xa0, 0x5e, 0xa7, 0xa1, 0x8f, 0x6f,
+	0xe9, 0xef, 0x63, 0xcf, 0xfc, 0x0c, 0x56, 0x69, 0x48, 0x25, 0x45, 0xbe, 0x3b, 0x26, 0xea, 0x36,
+	0x3a, 0xcd, 0x9e, 0xb1, 0xdb, 0xde, 0xbf, 0x67, 0xd3, 0x21, 0xb6, 0xd5, 0x05, 0xda, 0xd9, 0xb5,
+	0x25, 0x7b, 0xf6, 0x23, 0x2d, 0x71, 0xd8, 0xfc, 0xee, 0x87, 0x9d, 0x39, 0x67, 0x25, 0xd3, 0x4b,
+	0x37, 0xcd, 0xfb, 0xb0, 0x3c, 0x22, 0x21, 0x11, 0x54, 0xb8, 0x63, 0x24, 0xc6, 0x9d, 0x85, 0x9e,
+	0xb1, 0xbb, 0xec, 0xb4, 0xb3, 0xbd, 0x47, 0x48, 0x8c, 0xcd, 0x1d, 0x68, 0x0f, 0x69, 0x88, 0xf8,
+	0x24, 0x95, 0x58, 0xd4, 0x12, 0x90, 0x6e, 0x69, 0x81, 0x01, 0x80, 0x88, 0xd0, 0xf3, 0xd0, 0x55,
+	0xd9, 0xee, 0xdc, 0xca, 0x1c, 0x49, 0x33, 0x6d, 0xe7, 0x99, 0xb6, 0xcf, 0xf3, 0x52, 0x38, 0x5c,
+	0x52, 0x8e, 0x7c, 0xfd, 0xe3, 0x8e, 0xe1, 0xb4, 0xb4, 0x9e, 0x3a, 0x31, 0xbf, 0x84, 0xf5, 0x38,
+	0x1c, 0xb2, 0xd0, 0xa3, 0xe1, 0xc8, 0x8d, 0x08, 0xa7, 0xcc, 0xeb, 0x2c, 0x69, 0xa8, 0xad, 0x6b,
+	0x50, 0x47, 0x59, 0xd1, 0xa4, 0x48, 0xdf, 0x28, 0xa4, 0xb5, 0x42, 0xf9, 0x54, 0xeb, 0x9a, 0x5f,
+	0x81, 0x89, 0x71, 0xa2, 0x5d, 0x62, 0xb1, 0xcc, 0x11, 0x5b, 0xb3, 0x23, 0xae, 0x63, 0x9c, 0x9c,
+	0xa7, 0xda, 0x19, 0xe4, 0x1f, 0xe0, 0xae, 0xe4, 0x28, 0x14, 0x4f, 0x09, 0xbf, 0x8a, 0x0b, 0xb3,
+	0xe3, 0xde, 0xc9, 0x31, 0xea, 0xe0, 0x8f, 0xa0, 0x97, 0x77, 0xa2, 0xcb, 0x89, 0x47, 0x85, 0xe4,
+	0x74, 0x18, 0x2b, 0x5d, 0xf7, 0x29, 0x47, 0x58, 0xd7, 0x48, 0x5b, 0x17, 0x41, 0x37, 0x97, 0x73,
+	0x6a, 0x62, 0x9f, 0x66, 0x52, 0xe6, 0x63, 0xf8, 0xc5, 0xd0, 0x67, 0xf8, 0x52, 0x28, 0xe7, 0xdc,
+	0x1a, 0x92, 0x36, 0x1d, 0x50, 0x21, 0x14, 0xda, 0x72, 0xcf, 0xd8, 0x6d, 0x38, 0xf7, 0x53, 0xd9,
+	0x53, 0xc2, 0x8f, 0x2a, 0x92, 0xe7, 0x15, 0x41, 0xf3, 0x7d, 0x30, 0xc7, 0x54, 0x48, 0xc6, 0x29,
+	0x46, 0xbe, 0x4b, 0x42, 0xc9, 0x29, 0x11, 0x9d, 0x15, 0xad, 0x7e, 0xbb, 0x3c, 0xf9, 0x24, 0x3d,
+	0x30, 0x3f, 0x87, 0xfb, 0x53, 0x8d, 0xba, 0x78, 0x8c, 0xc2, 0x90, 0xf8, 0x9d, 0x55, 0x1d, 0xca,
+	0x8e, 0x37, 0xc5, 0xe6, 0x20, 0x15, 0x7b, 0xb8, 0xf4, 0xa7, 0x6f, 0x77, 0xe6, 0xbe, 0xf9, 0x76,
+	0x67, 0xce, 0xfa, 0xbb, 0x01, 0x77, 0x07, 0x45, 0xe0, 0x01, 0x4b, 0x90, 0xff, 0x53, 0x36, 0xd8,
+	0x01, 0xb4, 0x84, 0x64, 0x51, 0x5a, 0xd2, 0xcd, 0x37, 0x28, 0xe9, 0x25, 0xa5, 0xa6, 0x0e, 0xac,
+	0xbf, 0x1a, 0xb0, 0xf9, 0xc9, 0xb3, 0x98, 0x26, 0x0c, 0xa3, 0xff, 0x0b, 0x1f, 0x9c, 0xc0, 0x0a,
+	0xa9, 0xe0, 0x89, 0x4e, 0xa3, 0xd7, 0xd8, 0x6d, 0xef, 0xbf, 0x63, 0xa7, 0xe4, 0x64, 0x17, 0x9c,
+	0x95, 0x11, 0x94, 0x5d, 0xb5, 0xee, 0xd4, 0x75, 0xad, 0x7f, 0x1b, 0xb0, 0xfe, 0x99, 0xcf, 0x86,
+	0xc8, 0x3f, 0xf3, 0x91, 0x18, 0xab, 0xe4, 0x4d, 0x54, 0xd4, 0x9c, 0x64, 0x5d, 0xa3, 0xbd, 0x9b,
+	0x39, 0x6a, 0xa5, 0xa6, 0xfb, 0xf8, 0x63, 0xb8, 0x5d, 0xd4, 0x71, 0x71, 0xb9, 0x3a, 0x98, 0xc3,
+	0x8d, 0x97, 0x3f, 0xec, 0xac, 0xe5, 0x39, 0x1c, 0xe8, 0x8b, 0x3e, 0x72, 0xd6, 0x70, 0x6d, 0xc3,
+	0x33, 0xbb, 0xd0, 0xa6, 0x43, 0xec, 0x0a, 0xf2, 0xcc, 0x0d, 0xe3, 0x40, 0xe7, 0xa5, 0xe9, 0xb4,
+	0xe8, 0x10, 0x9f, 0x91, 0x67, 0x5f, 0xc6, 0x81, 0xf9, 0x00, 0xde, 0xca, 0x27, 0x9c, 0x9b, 0x20,
+	0x5f, 0xcf, 0x2f, 0x17, 0x79, 0x1e, 0xd7, 0x69, 0x5a, 0x76, 0x36, 0xf2, 0xd3, 0x0b, 0xe4, 0x2b,
+	0x63, 0x07, 0x9e, 0xc7, 0xad, 0x7f, 0x2d, 0xc0, 0xe2, 0x29, 0xe2, 0x28, 0x10, 0xe6, 0x39, 0xac,
+	0x49, 0x12, 0x44, 0x3e, 0x92, 0xc4, 0x4d, 0x39, 0x32, 0x8b, 0xf4, 0x3d, 0xcd, 0x9d, 0xd5, 0xd9,
+	0x62, 0x57, 0xa6, 0x49, 0xb2, 0x67, 0x0f, 0xf4, 0xee, 0x99, 0x44, 0x92, 0x38, 0xab, 0x39, 0x46,
+	0xba, 0x69, 0x7e, 0x08, 0x1d, 0xc9, 0x63, 0x21, 0x4b, 0xf6, 0x2a, 0xdb, 0x36, 0x4d, 0xe5, 0x5b,
+	0xf9, 0x79, 0xda, 0xf0, 0x45, 0xbb, 0xde, 0x4c, 0x54, 0x8d, 0xff, 0x85, 0xa8, 0xce, 0x60, 0x43,
+	0xb1, 0xfc, 0x55, 0xcc, 0xe6, 0xec, 0x98, 0xb7, 0x95, 0x7e, 0x1d, 0xf4, 0x2b, 0x30, 0x13, 0x81,
+	0xaf, 0x62, 0x2e, 0xbc, 0x81, 0x9f, 0x89, 0xc0, 0x75, 0x48, 0x0f, 0xb6, 0x85, 0x2a, 0x3e, 0x37,
+	0x20, 0x52, 0xd3, 0x5e, 0xe4, 0x93, 0x90, 0x8a, 0x71, 0x0e, 0xbe, 0x38, 0x3b, 0xf8, 0x96, 0x06,
+	0xfa, 0x42, 0xe1, 0x38, 0x39, 0x4c, 0x66, 0x65, 0x00, 0xdd, 0x9b, 0xad, 0x14, 0x09, 0xba, 0xa5,
+	0x13, 0xf4, 0xb3, 0x1b, 0x20, 0x8a, 0x2c, 0xed, 0xc3, 0x9d, 0x00, 0xbd, 0x70, 0xe5, 0x98, 0x33,
+	0x29, 0x7d, 0xe2, 0xb9, 0x11, 0xc2, 0x97, 0x44, 0x0a, 0x3d, 0xa3, 0x1a, 0xce, 0x46, 0x80, 0x5e,
+	0x9c, 0xe7, 0x67, 0xa7, 0xe9, 0x91, 0x29, 0xe0, 0xdd, 0x0a, 0xa5, 0x3f, 0x47, 0xdc, 0x73, 0x3d,
+	0x12, 0xb2, 0xc0, 0xe5, 0x64, 0xa4, 0x78, 0x0f, 0xa5, 0xec, 0x4e, 0x48, 0x31, 0x96, 0xb2, 0x46,
+	0x56, 0xaf, 0x8c, 0xa2, 0x89, 0x07, 0x8c, 0x86, 0xd9, 0xec, 0xb6, 0x4a, 0xe6, 0x57, 0x68, 0x47,
+	0x0a, 0xcc, 0xa9, 0x60, 0x7d, 0x4a, 0x88, 0xf5, 0x2b, 0x68, 0xe9, 0x86, 0x3e, 0xc0, 0x97, 0xc2,
+	0xdc, 0x86, 0x96, 0xea, 0x0c, 0x22, 0x04, 0x11, 0x1d, 0xa3, 0xd7, 0xd8, 0x6d, 0x39, 0xe5, 0x86,
+	0x25, 0x61, 0x6b, 0xda, 0x9b, 0x45, 0x98, 0x4f, 0xe0, 0x56, 0x44, 0xf4, 0x40, 0xd5, 0x8a, 0xed,
+	0xfd, 0x8f, 0xec, 0x19, 0x1e, 0x9c, 0xf6, 0x34, 0x40, 0x27, 0x47, 0xb3, 0x78, 0xf9, 0x52, 0xba,
+	0xc2, 0xe3, 0xc2, 0xbc, 0xb8, 0x6a, 0xf4, 0xd7, 0x6f, 0x64, 0xf4, 0x0a, 0x5e, 0x69, 0xf3, 0x3d,
+	0x68, 0x1f, 0xa4, 0x61, 0xff, 0x86, 0x0a, 0x79, 0xfd, 0x5a, 0x96, 0xab, 0xd7, 0xf2, 0x39, 0xac,
+	0x66, 0xe3, 0xe7, 0x9c, 0x69, 0x52, 0x32, 0x7f, 0x0e, 0x90, 0xcd, 0x2d, 0x45, 0x66, 0x29, 0x6b,
+	0xb7, 0xb2, 0x9d, 0x63, 0xaf, 0x36, 0x46, 0xe6, 0x6b, 0x63, 0xc4, 0x72, 0x60, 0xed, 0x42, 0xe0,
+	0xdf, 0xe6, 0x6f, 0x93, 0xc7, 0x91, 0x30, 0xef, 0xc0, 0xa2, 0xea, 0xa3, 0x0c, 0xa8, 0xe9, 0x2c,
+	0x24, 0x02, 0x1f, 0x7b, 0xe6, 0x6e, 0xf5, 0xfd, 0xc3, 0x22, 0x97, 0x7a, 0xa2, 0x33, 0xdf, 0x6b,
+	0xec, 0x36, 0x9d, 0xd5, 0xb8, 0x54, 0x3f, 0xf6, 0x84, 0xf5, 0x3b, 0x68, 0x57, 0x00, 0xcd, 0x55,
+	0x98, 0x2f, 0xb0, 0xe6, 0xa9, 0x67, 0x3e, 0x84, 0xad, 0x12, 0xa8, 0x4e, 0xc5, 0x29, 0x62, 0xcb,
+	0xb9, 0x5b, 0x08, 0xd4, 0xd8, 0x58, 0x58, 0x8f, 0x61, 0xf3, 0xb8, 0x6c, 0xfc, 0x82, 0xe8, 0x6b,
+	0x11, 0x1a, 0xf5, 0x41, 0xb9, 0x0d, 0xad, 0xe2, 0x91, 0xaf, 0xa3, 0x6f, 0x3a, 0xe5, 0x86, 0x15,
+	0xc0, 0xfa, 0x85, 0xc0, 0x67, 0x24, 0xf4, 0x4a, 0xb0, 0x29, 0x17, 0x70, 0x78, 0x15, 0x68, 0xe6,
+	0x47, 0x64, 0x69, 0x8e, 0xc1, 0xd6, 0x05, 0xf2, 0xa9, 0x87, 0x24, 0xe3, 0x67, 0x44, 0xaa, 0x34,
+	0x8e, 0x48, 0xde, 0x8e, 0x0e, 0x34, 0x7d, 0x2a, 0x64, 0x56, 0x59, 0x1f, 0x4e, 0xad, 0xac, 0x64,
+	0xcf, 0x9e, 0x06, 0x72, 0x84, 0x24, 0xca, 0x7a, 0x51, 0x63, 0x59, 0xbf, 0x84, 0x8d, 0x2f, 0x90,
+	0x8c, 0x39, 0xf1, 0x6a, 0x39, 0x5e, 0x87, 0x86, 0xca, 0x9f, 0xa1, 0xf3, 0xa7, 0x96, 0xd6, 0x9f,
+	0x0d, 0xe8, 0x9c, 0x90, 0xc9, 0x81, 0x10, 0x74, 0x14, 0x06, 0x24, 0x94, 0x8a, 0x62, 0x10, 0x26,
+	0x6a, 0x69, 0xbe, 0x0d, 0x2b, 0xc5, 0x48, 0xd3, 0x93, 0xcc, 0xd0, 0x93, 0x6c, 0x39, 0xdf, 0x54,
+	0xb5, 0x6b, 0x3e, 0x04, 0x88, 0x38, 0x49, 0x5c, 0xec, 0x5e, 0x92, 0x49, 0x76, 0x41, 0xdb, 0xd5,
+	0x09, 0x95, 0xfe, 0xba, 0xb1, 0x4f, 0xe3, 0xa1, 0x4f, 0xf1, 0x09, 0x99, 0x38, 0x4b, 0x4a, 0x7e,
+	0x70, 0x42, 0x26, 0xea, 0xc5, 0x11, 0xb1, 0xe7, 0x84, 0xeb, 0xb1, 0xd2, 0x70, 0xd2, 0x0f, 0xeb,
+	0x2f, 0x06, 0xdc, 0x2d, 0x22, 0xcd, 0x2b, 0xe1, 0x34, 0x1e, 0x2a, 0x8d, 0xd7, 0x64, 0xfc, 0x9a,
+	0xb7, 0xf3, 0x37, 0x78, 0xfb, 0x31, 0x2c, 0x17, 0xb5, 0xa7, 0xfc, 0x6d, 0xcc, 0xe0, 0x6f, 0x3b,
+	0xd7, 0x38, 0x21, 0x13, 0xeb, 0x8f, 0x15, 0xdf, 0x0e, 0x27, 0x15, 0x5a, 0xe1, 0xff, 0xc5, 0xb7,
+	0xc2, 0x6c, 0xd5, 0x37, 0x5c, 0xd5, 0xbf, 0x16, 0x40, 0xe3, 0x7a, 0x00, 0xd6, 0xdf, 0x0c, 0xd8,
+	0xac, 0x5a, 0x15, 0xe7, 0xec, 0x94, 0xc7, 0x21, 0x79, 0x9d, 0xf5, 0xb2, 0xb2, 0xe7, 0xab, 0x95,
+	0xfd, 0x04, 0x56, 0x6b, 0x4e, 0x89, 0xec, 0x36, 0x3e, 0x98, 0x89, 0xdc, 0x2a, 0xc4, 0xe5, 0xac,
+	0x54, 0xe3, 0x10, 0x87, 0x4f, 0xbe, 0x7b, 0xd9, 0x35, 0xbe, 0x7f, 0xd9, 0x35, 0xfe, 0xf9, 0xb2,
+	0x6b, 0x7c, 0xfd, 0xaa, 0x3b, 0xf7, 0xfd, 0xab, 0xee, 0xdc, 0x3f, 0x5e, 0x75, 0xe7, 0x7e, 0xff,
+	0xd1, 0x88, 0xca, 0x71, 0x3c, 0xb4, 0x31, 0x0b, 0xfa, 0xd9, 0x4f, 0xd7, 0xd2, 0xd6, 0xfb, 0xc5,
+	0xef, 0xfa, 0xe4, 0x41, 0xff, 0x45, 0xfd, 0x7f, 0x06, 0x39, 0x89, 0x88, 0x18, 0x2e, 0xea, 0x86,
+	0x7b, 0xf0, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x42, 0xfe, 0x8b, 0x98, 0x10, 0x00, 0x00,
 }
 
 func (m *ConsumerAdditionProposal) Marshal() (dAtA []byte, err error) {
@@ -1722,43 +1803,6 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *HandshakeMetadata) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *HandshakeMetadata) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *HandshakeMetadata) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if len(m.Version) > 0 {
-		i -= len(m.Version)
-		copy(dAtA[i:], m.Version)
-		i = encodeVarintProvider(dAtA, i, uint64(len(m.Version)))
-		i--
-		dAtA[i] = 0x12
-	}
-	if len(m.ProviderFeePoolAddr) > 0 {
-		i -= len(m.ProviderFeePoolAddr)
-		copy(dAtA[i:], m.ProviderFeePoolAddr)
-		i = encodeVarintProvider(dAtA, i, uint64(len(m.ProviderFeePoolAddr)))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
 func (m *SlashAcks) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -2088,6 +2132,84 @@ func (m *VscSendTimestamp) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
+func (m *ValidatorSetChangePackets) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *ValidatorSetChangePackets) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ValidatorSetChangePackets) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.List) > 0 {
+		for iNdEx := len(m.List) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.List[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintProvider(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0xa
+		}
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *MaturedUnbondingOps) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MaturedUnbondingOps) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MaturedUnbondingOps) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.Ids) > 0 {
+		dAtA18 := make([]byte, len(m.Ids)*10)
+		var j17 int
+		for _, num := range m.Ids {
+			for num >= 1<<7 {
+				dAtA18[j17] = uint8(uint64(num)&0x7f | 0x80)
+				num >>= 7
+				j17++
+			}
+			dAtA18[j17] = uint8(num)
+			j17++
+		}
+		i -= j17
+		copy(dAtA[i:], dAtA18[:j17])
+		i = encodeVarintProvider(dAtA, i, uint64(j17))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
 func (m *KeyAssignmentReplacement) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -2441,23 +2563,6 @@ func (m *Params) Size() (n int) {
 	return n
 }
 
-func (m *HandshakeMetadata) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.ProviderFeePoolAddr)
-	if l > 0 {
-		n += 1 + l + sovProvider(uint64(l))
-	}
-	l = len(m.Version)
-	if l > 0 {
-		n += 1 + l + sovProvider(uint64(l))
-	}
-	return n
-}
-
 func (m *SlashAcks) Size() (n int) {
 	if m == nil {
 		return 0
@@ -2602,6 +2707,37 @@ func (m *VscSendTimestamp) Size() (n int) {
 	return n
 }
 
+func (m *ValidatorSetChangePackets) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.List) > 0 {
+		for _, e := range m.List {
+			l = e.Size()
+			n += 1 + l + sovProvider(uint64(l))
+		}
+	}
+	return n
+}
+
+func (m *MaturedUnbondingOps) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.Ids) > 0 {
+		l = 0
+		for _, e := range m.Ids {
+			l += sovProvider(uint64(e))
+		}
+		n += 1 + sovProvider(uint64(l)) + l
+	}
+	return n
+}
+
 func (m *KeyAssignmentReplacement) Size() (n int) {
 	if m == nil {
 		return 0
@@ -4000,7 +4136,7 @@ func (m *Params) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *HandshakeMetadata) Unmarshal(dAtA []byte) error {
+func (m *SlashAcks) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -4023,15 +4159,15 @@ func (m *HandshakeMetadata) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: HandshakeMetadata: wiretype end group for non-group")
+			return fmt.Errorf("proto: SlashAcks: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: HandshakeMetadata: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: SlashAcks: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ProviderFeePoolAddr", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Addresses", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -4059,127 +4195,13 @@ func (m *HandshakeMetadata) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.ProviderFeePoolAddr = string(dAtA[iNdEx:postIndex])
+			m.Addresses = append(m.Addresses, string(dAtA[iNdEx:postIndex]))
 			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowProvider
-				}
-				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 ErrInvalidLengthProvider
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthProvider
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Version = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipProvider(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthProvider
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *SlashAcks) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowProvider
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: SlashAcks: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: SlashAcks: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Addresses", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowProvider
-				}
-				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 ErrInvalidLengthProvider
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthProvider
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Addresses = append(m.Addresses, string(dAtA[iNdEx:postIndex]))
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipProvider(dAtA[iNdEx:])
-			if err != nil {
-				return err
+		default:
+			iNdEx = preIndex
+			skippy, err := skipProvider(dAtA[iNdEx:])
+			if err != nil {
+				return err
 			}
 			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthProvider
@@ -5009,6 +5031,216 @@ func (m *VscSendTimestamp) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *ValidatorSetChangePackets) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowProvider
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: ValidatorSetChangePackets: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: ValidatorSetChangePackets: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field List", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowProvider
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthProvider
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthProvider
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.List = append(m.List, types3.ValidatorSetChangePacketData{})
+			if err := m.List[len(m.List)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipProvider(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthProvider
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MaturedUnbondingOps) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowProvider
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MaturedUnbondingOps: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MaturedUnbondingOps: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType == 0 {
+				var v uint64
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return ErrIntOverflowProvider
+					}
+					if iNdEx >= l {
+						return io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					v |= uint64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				m.Ids = append(m.Ids, v)
+			} else if wireType == 2 {
+				var packedLen int
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return ErrIntOverflowProvider
+					}
+					if iNdEx >= l {
+						return io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					packedLen |= int(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				if packedLen < 0 {
+					return ErrInvalidLengthProvider
+				}
+				postIndex := iNdEx + packedLen
+				if postIndex < 0 {
+					return ErrInvalidLengthProvider
+				}
+				if postIndex > l {
+					return io.ErrUnexpectedEOF
+				}
+				var elementCount int
+				var count int
+				for _, integer := range dAtA[iNdEx:postIndex] {
+					if integer < 128 {
+						count++
+					}
+				}
+				elementCount = count
+				if elementCount != 0 && len(m.Ids) == 0 {
+					m.Ids = make([]uint64, 0, elementCount)
+				}
+				for iNdEx < postIndex {
+					var v uint64
+					for shift := uint(0); ; shift += 7 {
+						if shift >= 64 {
+							return ErrIntOverflowProvider
+						}
+						if iNdEx >= l {
+							return io.ErrUnexpectedEOF
+						}
+						b := dAtA[iNdEx]
+						iNdEx++
+						v |= uint64(b&0x7F) << shift
+						if b < 0x80 {
+							break
+						}
+					}
+					m.Ids = append(m.Ids, v)
+				}
+			} else {
+				return fmt.Errorf("proto: wrong wireType = %d for field Ids", wireType)
+			}
+		default:
+			iNdEx = preIndex
+			skippy, err := skipProvider(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthProvider
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func (m *KeyAssignmentReplacement) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/x/ccv/provider/types/query.pb.go b/x/ccv/provider/types/query.pb.go
index f82376da05..9fc9178e09 100644
--- a/x/ccv/provider/types/query.pb.go
+++ b/x/ccv/provider/types/query.pb.go
@@ -10,8 +10,7 @@ import (
 	grpc1 "github.com/cosmos/gogoproto/grpc"
 	proto "github.com/cosmos/gogoproto/proto"
 	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
-	types "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
-	types1 "github.com/cosmos/interchain-security/v3/x/ccv/types"
+	types "github.com/cosmos/interchain-security/v3/x/ccv/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -814,8 +813,8 @@ func (m *QueryThrottledConsumerPacketDataResponse) GetPacketDataInstances() []Th
 // A query wrapper type for the global entry and data relevant to a throttled
 // slash packet.
 type ThrottledSlashPacket struct {
-	GlobalEntry GlobalSlashEntry       `protobuf:"bytes,1,opt,name=global_entry,json=globalEntry,proto3" json:"global_entry"`
-	Data        types1.SlashPacketData `protobuf:"bytes,2,opt,name=data,proto3" json:"data"`
+	GlobalEntry GlobalSlashEntry      `protobuf:"bytes,1,opt,name=global_entry,json=globalEntry,proto3" json:"global_entry"`
+	Data        types.SlashPacketData `protobuf:"bytes,2,opt,name=data,proto3" json:"data"`
 }
 
 func (m *ThrottledSlashPacket) Reset()         { *m = ThrottledSlashPacket{} }
@@ -858,11 +857,11 @@ func (m *ThrottledSlashPacket) GetGlobalEntry() GlobalSlashEntry {
 	return GlobalSlashEntry{}
 }
 
-func (m *ThrottledSlashPacket) GetData() types1.SlashPacketData {
+func (m *ThrottledSlashPacket) GetData() types.SlashPacketData {
 	if m != nil {
 		return m.Data
 	}
-	return types1.SlashPacketData{}
+	return types.SlashPacketData{}
 }
 
 // ThrottledPacketDataWrapper contains either SlashPacketData or
@@ -914,10 +913,10 @@ type isThrottledPacketDataWrapper_Data interface {
 }
 
 type ThrottledPacketDataWrapper_SlashPacket struct {
-	SlashPacket *types1.SlashPacketData `protobuf:"bytes,1,opt,name=slash_packet,json=slashPacket,proto3,oneof" json:"slash_packet,omitempty"`
+	SlashPacket *types.SlashPacketData `protobuf:"bytes,1,opt,name=slash_packet,json=slashPacket,proto3,oneof" json:"slash_packet,omitempty"`
 }
 type ThrottledPacketDataWrapper_VscMaturedPacket struct {
-	VscMaturedPacket *types1.VSCMaturedPacketData `protobuf:"bytes,2,opt,name=vsc_matured_packet,json=vscMaturedPacket,proto3,oneof" json:"vsc_matured_packet,omitempty"`
+	VscMaturedPacket *types.VSCMaturedPacketData `protobuf:"bytes,2,opt,name=vsc_matured_packet,json=vscMaturedPacket,proto3,oneof" json:"vsc_matured_packet,omitempty"`
 }
 
 func (*ThrottledPacketDataWrapper_SlashPacket) isThrottledPacketDataWrapper_Data()      {}
@@ -930,14 +929,14 @@ func (m *ThrottledPacketDataWrapper) GetData() isThrottledPacketDataWrapper_Data
 	return nil
 }
 
-func (m *ThrottledPacketDataWrapper) GetSlashPacket() *types1.SlashPacketData {
+func (m *ThrottledPacketDataWrapper) GetSlashPacket() *types.SlashPacketData {
 	if x, ok := m.GetData().(*ThrottledPacketDataWrapper_SlashPacket); ok {
 		return x.SlashPacket
 	}
 	return nil
 }
 
-func (m *ThrottledPacketDataWrapper) GetVscMaturedPacket() *types1.VSCMaturedPacketData {
+func (m *ThrottledPacketDataWrapper) GetVscMaturedPacket() *types.VSCMaturedPacketData {
 	if x, ok := m.GetData().(*ThrottledPacketDataWrapper_VscMaturedPacket); ok {
 		return x.VscMaturedPacket
 	}
@@ -1069,90 +1068,90 @@ func init() {
 }
 
 var fileDescriptor_422512d7b7586cd7 = []byte{
-	// 1322 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6f, 0xdc, 0x44,
-	0x18, 0x5d, 0x6f, 0xd2, 0x34, 0x99, 0x14, 0x5a, 0xa6, 0xa5, 0x6c, 0xdd, 0x6a, 0xb7, 0xb8, 0x08,
-	0xd2, 0x16, 0xec, 0xee, 0x56, 0x48, 0x4d, 0x20, 0xdd, 0xec, 0x26, 0x21, 0x8d, 0xda, 0xa8, 0xc1,
-	0xa9, 0x5a, 0x09, 0x50, 0xcd, 0xc4, 0x1e, 0x36, 0x16, 0x5e, 0x8f, 0xeb, 0x99, 0x75, 0x1a, 0x7e,
-	0x1c, 0x00, 0x09, 0x7a, 0xac, 0x84, 0xb8, 0x71, 0xe8, 0x89, 0xff, 0x82, 0x7b, 0x6f, 0x54, 0xf4,
-	0xd2, 0x53, 0x41, 0x09, 0x07, 0x8e, 0x88, 0x3b, 0x12, 0xf2, 0x78, 0xbc, 0x3f, 0xb2, 0xde, 0x5d,
-	0xef, 0x36, 0xb7, 0xdd, 0xf1, 0x7c, 0xef, 0x7b, 0xef, 0xe9, 0x9b, 0xf1, 0x33, 0xd0, 0x6c, 0x97,
-	0x61, 0xdf, 0xdc, 0x42, 0xb6, 0x6b, 0x50, 0x6c, 0x36, 0x7c, 0x9b, 0xed, 0x68, 0xa6, 0x19, 0x68,
-	0x9e, 0x4f, 0x02, 0xdb, 0xc2, 0xbe, 0x16, 0x14, 0xb5, 0x7b, 0x0d, 0xec, 0xef, 0xa8, 0x9e, 0x4f,
-	0x18, 0x81, 0xe7, 0x12, 0x0a, 0x54, 0xd3, 0x0c, 0xd4, 0xb8, 0x40, 0x0d, 0x8a, 0xf2, 0x99, 0x1a,
-	0x21, 0x35, 0x07, 0x6b, 0xc8, 0xb3, 0x35, 0xe4, 0xba, 0x84, 0x21, 0x66, 0x13, 0x97, 0x46, 0x10,
-	0xf2, 0x89, 0x1a, 0xa9, 0x11, 0xfe, 0x53, 0x0b, 0x7f, 0x89, 0xd5, 0x82, 0xa8, 0xe1, 0xff, 0x36,
-	0x1b, 0x9f, 0x69, 0xcc, 0xae, 0x63, 0xca, 0x50, 0xdd, 0x13, 0x1b, 0xde, 0xe8, 0x45, 0x35, 0x28,
-	0x6a, 0x82, 0x00, 0x23, 0x72, 0xb1, 0xd7, 0x2e, 0x93, 0xb8, 0xb4, 0x51, 0x8f, 0x04, 0xd5, 0xb0,
-	0x8b, 0xa9, 0x1d, 0xf3, 0x29, 0xa5, 0xf1, 0xa0, 0x29, 0x8f, 0xd7, 0x28, 0x57, 0xc0, 0xe9, 0x0f,
-	0x43, 0x57, 0x16, 0x05, 0xea, 0x4a, 0x84, 0xa8, 0xe3, 0x7b, 0x0d, 0x4c, 0x19, 0x3c, 0x05, 0x26,
-	0x23, 0x3c, 0xdb, 0xca, 0x49, 0x67, 0xa5, 0x99, 0x29, 0xfd, 0x30, 0xff, 0xbf, 0x6a, 0x29, 0x5f,
-	0x81, 0x33, 0xc9, 0x95, 0xd4, 0x23, 0x2e, 0xc5, 0xf0, 0x13, 0xf0, 0x92, 0xa0, 0x67, 0x50, 0x86,
-	0x18, 0xe6, 0xf5, 0xd3, 0xa5, 0xa2, 0xda, 0xcb, 0xf8, 0x58, 0x98, 0x1a, 0x14, 0x55, 0x01, 0xb6,
-	0x11, 0x16, 0x56, 0xc7, 0x1f, 0x3f, 0x2f, 0x64, 0xf4, 0x23, 0xb5, 0xb6, 0x35, 0xe5, 0x0c, 0x90,
-	0x3b, 0xba, 0x2f, 0x86, 0x78, 0x31, 0x6d, 0x05, 0xed, 0x53, 0x15, 0x3f, 0x15, 0xd4, 0xaa, 0x60,
-	0x82, 0xf7, 0xa7, 0x39, 0xe9, 0xec, 0xd8, 0xcc, 0x74, 0xe9, 0x82, 0x9a, 0x62, 0x18, 0x54, 0x0e,
-	0xa2, 0x8b, 0x4a, 0xe5, 0x3c, 0x78, 0xab, 0xbb, 0xc5, 0x06, 0x43, 0x3e, 0x5b, 0xf7, 0x89, 0x47,
-	0x28, 0x72, 0x9a, 0x6c, 0x1e, 0x48, 0x60, 0x66, 0xf0, 0xde, 0xa6, 0x6d, 0x53, 0x5e, 0xbc, 0x28,
-	0x2c, 0xbb, 0x9a, 0x8e, 0x9e, 0x00, 0xaf, 0x58, 0x96, 0x1d, 0x4e, 0x69, 0x0b, 0xba, 0x05, 0xa8,
-	0xcc, 0x80, 0x37, 0x93, 0x98, 0x10, 0xaf, 0x8b, 0xf4, 0xf7, 0x52, 0xb2, 0xc0, 0x8e, 0xad, 0x82,
-	0xf3, 0xc7, 0xdd, 0x9c, 0xe7, 0x87, 0xe2, 0xac, 0xe3, 0x3a, 0x09, 0x90, 0x93, 0x48, 0xb9, 0x0c,
-	0x0e, 0xf1, 0xd6, 0x7d, 0x66, 0x11, 0x9e, 0x06, 0x53, 0xa6, 0x63, 0x63, 0x97, 0x85, 0xcf, 0xb2,
-	0xfc, 0xd9, 0x64, 0xb4, 0xb0, 0x6a, 0x29, 0x3f, 0x48, 0xe0, 0x75, 0xae, 0xe4, 0x36, 0x72, 0x6c,
-	0x0b, 0x31, 0xe2, 0xb7, 0x59, 0xe5, 0x0f, 0x9e, 0x74, 0x38, 0x0f, 0x8e, 0xc5, 0xa4, 0x0d, 0x64,
-	0x59, 0x3e, 0xa6, 0x34, 0x6a, 0x52, 0x85, 0xff, 0x3e, 0x2f, 0xbc, 0xbc, 0x83, 0xea, 0xce, 0x9c,
-	0x22, 0x1e, 0x28, 0xfa, 0xd1, 0x78, 0x6f, 0x25, 0x5a, 0x99, 0x9b, 0x7c, 0xf0, 0xa8, 0x90, 0xf9,
-	0xfb, 0x51, 0x21, 0xa3, 0xdc, 0x04, 0x4a, 0x3f, 0x22, 0xc2, 0xcd, 0xf3, 0xe0, 0x58, 0x7c, 0x14,
-	0x9a, 0xed, 0x22, 0x46, 0x47, 0xcd, 0xb6, 0xfd, 0x61, 0xb3, 0x6e, 0x69, 0xeb, 0x6d, 0xcd, 0xd3,
-	0x49, 0xeb, 0xea, 0xd5, 0x47, 0xda, 0xbe, 0xfe, 0xfd, 0xa4, 0x75, 0x12, 0x69, 0x49, 0xeb, 0x72,
-	0x52, 0x48, 0xdb, 0xe7, 0x9a, 0x72, 0x1a, 0x9c, 0xe2, 0x80, 0xb7, 0xb6, 0x7c, 0xc2, 0x98, 0x83,
-	0xf9, 0xb1, 0x8f, 0x87, 0xf3, 0x97, 0xac, 0x38, 0xfe, 0xfb, 0x9e, 0x8a, 0x36, 0x05, 0x30, 0x4d,
-	0x1d, 0x44, 0xb7, 0x8c, 0x3a, 0x66, 0xd8, 0xe7, 0x1d, 0xc6, 0x74, 0xc0, 0x97, 0xd6, 0xc2, 0x15,
-	0x58, 0x02, 0xaf, 0xb6, 0x6d, 0x30, 0x90, 0xe3, 0x90, 0x6d, 0xe4, 0x9a, 0x98, 0x6b, 0x1f, 0xd3,
-	0x8f, 0xb7, 0xb6, 0x56, 0xe2, 0x47, 0xf0, 0x2e, 0xc8, 0xb9, 0xf8, 0x3e, 0x33, 0x7c, 0xec, 0x39,
-	0xd8, 0xb5, 0xe9, 0x96, 0x61, 0x22, 0xd7, 0x0a, 0xc5, 0xe2, 0xdc, 0x18, 0x9f, 0x79, 0x59, 0x8d,
-	0xae, 0x7e, 0x35, 0xbe, 0xfa, 0xd5, 0x5b, 0xf1, 0xd5, 0x5f, 0x9d, 0x0c, 0xef, 0xb0, 0x87, 0x7f,
-	0x14, 0x24, 0xfd, 0x64, 0x88, 0xa2, 0xc7, 0x20, 0x8b, 0x31, 0x06, 0xdc, 0x00, 0x87, 0x3d, 0x64,
-	0x7e, 0x8e, 0x19, 0xcd, 0x8d, 0xf3, 0x5b, 0x69, 0x36, 0xd5, 0x11, 0x8a, 0x1d, 0xb0, 0x36, 0x42,
-	0xce, 0xeb, 0x1c, 0x41, 0x8f, 0x91, 0x94, 0x25, 0x71, 0x88, 0x9b, 0xbb, 0xe2, 0x89, 0x8b, 0x36,
-	0x2e, 0x21, 0x86, 0x52, 0x5c, 0xf5, 0xbf, 0xc7, 0x17, 0x58, 0x5f, 0x18, 0x61, 0x7e, 0x9f, 0x69,
-	0x83, 0x60, 0x9c, 0xda, 0x5f, 0x44, 0x2e, 0x8f, 0xeb, 0xfc, 0x37, 0xdc, 0x06, 0xc7, 0xbd, 0x26,
-	0xc8, 0xaa, 0x4b, 0x59, 0x68, 0x36, 0xcd, 0x8d, 0x71, 0x0b, 0xca, 0xc3, 0x59, 0xd0, 0x62, 0x73,
-	0xc7, 0x47, 0x9e, 0x87, 0x7d, 0xf1, 0xea, 0x48, 0xea, 0xa0, 0xfc, 0x2a, 0x81, 0x13, 0x49, 0xe6,
-	0xc1, 0xbb, 0xe0, 0x48, 0xcd, 0x21, 0x9b, 0xc8, 0x31, 0xb0, 0xcb, 0xfc, 0x1d, 0x71, 0xa1, 0xbd,
-	0x9b, 0x8a, 0xca, 0x0a, 0x2f, 0xe4, 0x68, 0xcb, 0x61, 0xb1, 0x20, 0x30, 0x1d, 0x01, 0xf2, 0x25,
-	0xb8, 0x0c, 0xc6, 0x2d, 0xc4, 0x10, 0x77, 0x61, 0xba, 0x74, 0xb1, 0x27, 0x6e, 0x50, 0x54, 0xdb,
-	0x68, 0x85, 0xe4, 0x05, 0x1a, 0x2f, 0x57, 0x9e, 0x49, 0x40, 0xee, 0xad, 0x1c, 0xae, 0x83, 0x23,
-	0xd1, 0x88, 0x47, 0xda, 0x85, 0x8a, 0x61, 0xba, 0x5d, 0xcb, 0xe8, 0xd1, 0x31, 0x12, 0xbe, 0x7c,
-	0x0a, 0x60, 0x40, 0x4d, 0xa3, 0x8e, 0x58, 0xc3, 0xc7, 0x56, 0x8c, 0x1b, 0xa9, 0xb8, 0xd4, 0x0f,
-	0xf7, 0xf6, 0xc6, 0xe2, 0x5a, 0x54, 0xd4, 0x01, 0x7e, 0x2c, 0xa0, 0x66, 0xc7, 0x7a, 0x75, 0x22,
-	0x72, 0x46, 0x79, 0x1b, 0x5c, 0xe0, 0xe3, 0xa6, 0xe3, 0x9a, 0x4d, 0x19, 0xf6, 0x5b, 0xf3, 0xa6,
-	0xe3, 0x6d, 0xe4, 0x5b, 0x4b, 0xd8, 0x25, 0xf5, 0xe6, 0x9b, 0x6a, 0x19, 0x5c, 0x4c, 0xb5, 0x5b,
-	0xcc, 0xe7, 0x49, 0x30, 0x61, 0xf1, 0x15, 0xfe, 0xf2, 0x9f, 0xd2, 0xc5, 0xbf, 0xd2, 0xcf, 0xaf,
-	0x80, 0x43, 0x1c, 0x07, 0xee, 0x4a, 0xe0, 0x44, 0x52, 0xb4, 0x81, 0x0b, 0xa9, 0x66, 0xa0, 0x4f,
-	0x9e, 0x92, 0x2b, 0x2f, 0x80, 0x10, 0xf1, 0x57, 0x96, 0xbf, 0x7d, 0xfa, 0xd7, 0x8f, 0xd9, 0x32,
-	0x9c, 0x1f, 0x1c, 0x79, 0x9b, 0x57, 0xbb, 0x88, 0x4e, 0xda, 0x97, 0xf1, 0xc9, 0xfc, 0x1a, 0x3e,
-	0x95, 0xc0, 0xf1, 0x84, 0x8c, 0x04, 0xcb, 0xc3, 0x33, 0xec, 0xc8, 0x5e, 0xf2, 0xc2, 0xe8, 0x00,
-	0x42, 0xe1, 0x2c, 0x57, 0x78, 0x19, 0x16, 0x87, 0x50, 0x18, 0xa5, 0x32, 0xf8, 0x4d, 0x16, 0xe4,
-	0x7a, 0x44, 0x2d, 0x0a, 0x6f, 0x8c, 0xc8, 0x2c, 0x31, 0xd5, 0xc9, 0x6b, 0x07, 0x84, 0x26, 0x44,
-	0x5f, 0xe3, 0xa2, 0xab, 0x70, 0x61, 0x58, 0xd1, 0x61, 0xba, 0xf6, 0x99, 0xd1, 0x0c, 0x4c, 0xf0,
-	0x3f, 0x09, 0xbc, 0x96, 0x9c, 0xdc, 0x28, 0xbc, 0x3e, 0x32, 0xe9, 0xee, 0x88, 0x28, 0xdf, 0x38,
-	0x18, 0x30, 0x61, 0xc0, 0x0a, 0x37, 0xa0, 0x02, 0xcb, 0x23, 0x18, 0x40, 0xbc, 0x36, 0xfd, 0xff,
-	0x48, 0x22, 0x1c, 0x24, 0xc6, 0x2c, 0xf8, 0x41, 0x7a, 0xd6, 0xfd, 0x02, 0xa3, 0xbc, 0xf2, 0xc2,
-	0x38, 0x42, 0x78, 0x85, 0x0b, 0x7f, 0x0f, 0xce, 0xa6, 0xf8, 0x86, 0x8d, 0x81, 0x8c, 0x8e, 0xd4,
-	0x96, 0x20, 0xb9, 0x3d, 0x7e, 0x8d, 0x24, 0x39, 0x21, 0x48, 0x8e, 0x24, 0x39, 0x29, 0x07, 0x8e,
-	0x26, 0xb9, 0x23, 0x39, 0xc2, 0xdf, 0x24, 0x00, 0xbb, 0x23, 0x20, 0xbc, 0x9a, 0x9e, 0x62, 0x52,
-	0xb2, 0x94, 0xcb, 0x23, 0xd7, 0x0b, 0x69, 0x57, 0xb8, 0xb4, 0x12, 0xbc, 0x34, 0x58, 0x1a, 0x13,
-	0x00, 0xd1, 0xf7, 0x31, 0xfc, 0x2e, 0x0b, 0xce, 0x0e, 0x4a, 0x59, 0xc3, 0xdc, 0x61, 0x83, 0x33,
-	0xdf, 0x30, 0x77, 0x58, 0x8a, 0xe8, 0xa7, 0x54, 0xb9, 0xf6, 0xf7, 0xe1, 0xdc, 0x60, 0xed, 0x1e,
-	0x76, 0x2d, 0xdb, 0xad, 0xb5, 0xe6, 0x58, 0x24, 0x56, 0xf8, 0x53, 0x16, 0x9c, 0x4b, 0xf1, 0x3a,
-	0x87, 0x37, 0xd3, 0x53, 0x4f, 0x15, 0x23, 0xe4, 0xf5, 0x83, 0x03, 0x14, 0x76, 0x5c, 0xe7, 0x76,
-	0x2c, 0xc3, 0xc5, 0xc1, 0x76, 0xf8, 0x4d, 0xc4, 0x96, 0x23, 0x3e, 0xc7, 0x34, 0xa2, 0x78, 0x52,
-	0xbd, 0xf3, 0x78, 0x37, 0x2f, 0x3d, 0xd9, 0xcd, 0x4b, 0x7f, 0xee, 0xe6, 0xa5, 0x87, 0x7b, 0xf9,
-	0xcc, 0x93, 0xbd, 0x7c, 0xe6, 0xd9, 0x5e, 0x3e, 0xf3, 0xd1, 0x7c, 0xcd, 0x66, 0x5b, 0x8d, 0x4d,
-	0xd5, 0x24, 0x75, 0xcd, 0x24, 0xb4, 0x4e, 0x68, 0x5b, 0xbf, 0x77, 0x9a, 0xfd, 0x82, 0xcb, 0xda,
-	0xfd, 0x7d, 0xf3, 0xb7, 0xe3, 0x61, 0xba, 0x39, 0xc1, 0xbf, 0x56, 0x2e, 0xff, 0x1f, 0x00, 0x00,
-	0xff, 0xff, 0xbf, 0xd4, 0x24, 0xd7, 0x42, 0x13, 0x00, 0x00,
+	// 1323 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6f, 0x1b, 0xc5,
+	0x1f, 0xf5, 0x3a, 0x69, 0x9a, 0x4c, 0xfa, 0xfd, 0xb6, 0x4c, 0x4b, 0x71, 0xb7, 0x95, 0x5d, 0xb6,
+	0x02, 0xd2, 0x16, 0x76, 0x1b, 0x57, 0x48, 0x6d, 0x21, 0x75, 0xed, 0x24, 0xa4, 0x51, 0x1b, 0x35,
+	0xac, 0xab, 0x56, 0x02, 0xd4, 0x65, 0xb2, 0x3b, 0xd8, 0x2b, 0xd6, 0x3b, 0xdb, 0x99, 0xb1, 0xd3,
+	0x80, 0x38, 0x00, 0x12, 0xf4, 0x58, 0x09, 0x71, 0xe3, 0xd0, 0x13, 0xff, 0x05, 0xf7, 0xde, 0xa8,
+	0xe8, 0xa5, 0xa7, 0x82, 0x12, 0x0e, 0x1c, 0x11, 0x77, 0x24, 0xb4, 0xb3, 0xb3, 0xfe, 0x11, 0x6f,
+	0xec, 0xb5, 0x9b, 0x9b, 0x3d, 0x3b, 0x9f, 0xf7, 0x79, 0xef, 0xe9, 0x33, 0xb3, 0x6f, 0x81, 0xe1,
+	0xfa, 0x1c, 0x53, 0xbb, 0x8e, 0x5c, 0xdf, 0x62, 0xd8, 0x6e, 0x52, 0x97, 0x6f, 0x19, 0xb6, 0xdd,
+	0x32, 0x02, 0x4a, 0x5a, 0xae, 0x83, 0xa9, 0xd1, 0x9a, 0x37, 0xee, 0x37, 0x31, 0xdd, 0xd2, 0x03,
+	0x4a, 0x38, 0x81, 0x67, 0x12, 0x0a, 0x74, 0xdb, 0x6e, 0xe9, 0x71, 0x81, 0xde, 0x9a, 0x57, 0x4f,
+	0xd5, 0x08, 0xa9, 0x79, 0xd8, 0x40, 0x81, 0x6b, 0x20, 0xdf, 0x27, 0x1c, 0x71, 0x97, 0xf8, 0x2c,
+	0x82, 0x50, 0x8f, 0xd5, 0x48, 0x8d, 0x88, 0x9f, 0x46, 0xf8, 0x4b, 0xae, 0x16, 0x64, 0x8d, 0xf8,
+	0xb7, 0xd1, 0xfc, 0xcc, 0xe0, 0x6e, 0x03, 0x33, 0x8e, 0x1a, 0x81, 0xdc, 0x50, 0x4c, 0x43, 0xb5,
+	0xcd, 0x22, 0xaa, 0xb9, 0xb0, 0x57, 0x4d, 0x6b, 0xde, 0x60, 0x75, 0x44, 0xb1, 0x63, 0xd9, 0xc4,
+	0x67, 0xcd, 0x46, 0xbb, 0xe2, 0x8d, 0x01, 0x15, 0x9b, 0x2e, 0xc5, 0xd1, 0x36, 0xed, 0x12, 0x38,
+	0xf9, 0x61, 0xe8, 0xca, 0xa2, 0xac, 0x5e, 0xc1, 0x3e, 0x66, 0x2e, 0x33, 0xf1, 0xfd, 0x26, 0x66,
+	0x1c, 0x9e, 0x00, 0xd3, 0x11, 0x84, 0xeb, 0xe4, 0x94, 0xd3, 0xca, 0xdc, 0x8c, 0x79, 0x50, 0xfc,
+	0x5f, 0x75, 0x34, 0x06, 0x4e, 0x25, 0x57, 0xb2, 0x80, 0xf8, 0x0c, 0xc3, 0x2a, 0xf8, 0x5f, 0x2d,
+	0x5a, 0xb2, 0x18, 0x47, 0x1c, 0x8b, 0xfa, 0xd9, 0xe2, 0x9c, 0xbe, 0x97, 0xf1, 0xad, 0x79, 0x5d,
+	0x62, 0x54, 0xc3, 0xfd, 0x95, 0xc9, 0x27, 0x2f, 0x0a, 0x19, 0xf3, 0x50, 0xad, 0x6b, 0x4d, 0x3b,
+	0x05, 0xd4, 0x9e, 0xa6, 0x8b, 0x21, 0x4c, 0xcc, 0x56, 0x43, 0xbb, 0xc4, 0xc4, 0x4f, 0x25, 0xa3,
+	0x0a, 0x98, 0x12, 0x6d, 0x59, 0x4e, 0x39, 0x3d, 0x31, 0x37, 0x5b, 0x3c, 0xa7, 0xa7, 0x98, 0x01,
+	0x5d, 0x80, 0x98, 0xb2, 0x52, 0x3b, 0x0b, 0xde, 0xea, 0x6f, 0x51, 0xe5, 0x88, 0xf2, 0x75, 0x4a,
+	0x02, 0xc2, 0x90, 0xd7, 0x66, 0xf3, 0x50, 0x01, 0x73, 0xc3, 0xf7, 0x4a, 0x6e, 0x9f, 0x80, 0x99,
+	0x20, 0x5e, 0x94, 0x4e, 0x5d, 0x4d, 0x47, 0x4f, 0x82, 0x97, 0x1d, 0xc7, 0x0d, 0x87, 0xb3, 0x03,
+	0xdd, 0x01, 0xd4, 0xe6, 0xc0, 0x9b, 0x49, 0x4c, 0x48, 0xd0, 0x47, 0xfa, 0x3b, 0x25, 0x59, 0x60,
+	0xcf, 0x56, 0xc9, 0xf9, 0xe3, 0x7e, 0xce, 0x0b, 0x23, 0x71, 0x36, 0x71, 0x83, 0xb4, 0x90, 0x97,
+	0x48, 0xb9, 0x04, 0x0e, 0x88, 0xd6, 0x03, 0x46, 0x10, 0x9e, 0x04, 0x33, 0xb6, 0xe7, 0x62, 0x9f,
+	0x87, 0xcf, 0xb2, 0xe2, 0xd9, 0x74, 0xb4, 0xb0, 0xea, 0x68, 0xdf, 0x2b, 0xe0, 0x75, 0xa1, 0xe4,
+	0x0e, 0xf2, 0x5c, 0x07, 0x71, 0x42, 0xbb, 0xac, 0xa2, 0xc3, 0x07, 0x1c, 0x2e, 0x80, 0x23, 0x31,
+	0x69, 0x0b, 0x39, 0x0e, 0xc5, 0x8c, 0x45, 0x4d, 0x2a, 0xf0, 0x9f, 0x17, 0x85, 0xff, 0x6f, 0xa1,
+	0x86, 0x77, 0x45, 0x93, 0x0f, 0x34, 0xf3, 0x70, 0xbc, 0xb7, 0x1c, 0xad, 0x5c, 0x99, 0x7e, 0xf8,
+	0xb8, 0x90, 0xf9, 0xeb, 0x71, 0x21, 0xa3, 0xdd, 0x02, 0xda, 0x20, 0x22, 0xd2, 0xcd, 0xb3, 0xe0,
+	0x48, 0x7c, 0x84, 0xdb, 0xed, 0x22, 0x46, 0x87, 0xed, 0xae, 0xfd, 0x61, 0xb3, 0x7e, 0x69, 0xeb,
+	0x5d, 0xcd, 0xd3, 0x49, 0xeb, 0xeb, 0x35, 0x40, 0xda, 0xae, 0xfe, 0x83, 0xa4, 0xf5, 0x12, 0xe9,
+	0x48, 0xeb, 0x73, 0x52, 0x4a, 0xdb, 0xe5, 0x9a, 0x76, 0x12, 0x9c, 0x10, 0x80, 0xb7, 0xeb, 0x94,
+	0x70, 0xee, 0x61, 0x71, 0xec, 0xe3, 0xe1, 0xfc, 0x39, 0x2b, 0x8f, 0xff, 0xae, 0xa7, 0xb2, 0x4d,
+	0x01, 0xcc, 0x32, 0x0f, 0xb1, 0xba, 0xd5, 0xc0, 0x1c, 0x53, 0xd1, 0x61, 0xc2, 0x04, 0x62, 0x69,
+	0x2d, 0x5c, 0x81, 0x45, 0xf0, 0x6a, 0xd7, 0x06, 0x0b, 0x79, 0x1e, 0xd9, 0x44, 0xbe, 0x8d, 0x85,
+	0xf6, 0x09, 0xf3, 0x68, 0x67, 0x6b, 0x39, 0x7e, 0x04, 0xef, 0x81, 0x9c, 0x8f, 0x1f, 0x70, 0x8b,
+	0xe2, 0xc0, 0xc3, 0xbe, 0xcb, 0xea, 0x96, 0x8d, 0x7c, 0x27, 0x14, 0x8b, 0x73, 0x13, 0x62, 0xe6,
+	0x55, 0x3d, 0xba, 0xf1, 0xf5, 0xf8, 0xc6, 0xd7, 0x6f, 0xc7, 0x37, 0x7e, 0x65, 0x3a, 0xbc, 0xc3,
+	0x1e, 0xfd, 0x5e, 0x50, 0xcc, 0xe3, 0x21, 0x8a, 0x19, 0x83, 0x2c, 0xc6, 0x18, 0xb0, 0x0a, 0x0e,
+	0x06, 0xc8, 0xfe, 0x1c, 0x73, 0x96, 0x9b, 0x14, 0xb7, 0xd2, 0xe5, 0x54, 0x47, 0x28, 0x76, 0xc0,
+	0xa9, 0x86, 0x9c, 0xd7, 0x05, 0x82, 0x19, 0x23, 0x69, 0x4b, 0xf2, 0x10, 0xb7, 0x77, 0xc5, 0x13,
+	0x17, 0x6d, 0x5c, 0x42, 0x1c, 0xa5, 0xb8, 0xe1, 0x7f, 0x8b, 0x2f, 0xb0, 0x81, 0x30, 0xd2, 0xfc,
+	0x01, 0xd3, 0x06, 0xc1, 0x24, 0x73, 0xbf, 0x88, 0x5c, 0x9e, 0x34, 0xc5, 0x6f, 0xb8, 0x09, 0x8e,
+	0x06, 0x6d, 0x90, 0x55, 0x9f, 0xf1, 0xd0, 0x6c, 0x96, 0x9b, 0x10, 0x16, 0x94, 0x46, 0xb3, 0xa0,
+	0xc3, 0xe6, 0x2e, 0x45, 0x41, 0x80, 0xa9, 0x7c, 0x75, 0x24, 0x75, 0xd0, 0x7e, 0x51, 0xc0, 0xb1,
+	0x24, 0xf3, 0xe0, 0x3d, 0x70, 0xa8, 0xe6, 0x91, 0x0d, 0xe4, 0x59, 0xd8, 0xe7, 0x74, 0x4b, 0x5e,
+	0x68, 0xef, 0xa6, 0xa2, 0xb2, 0x22, 0x0a, 0x05, 0xda, 0x72, 0x58, 0x2c, 0x09, 0xcc, 0x46, 0x80,
+	0x62, 0x09, 0x2e, 0x83, 0x49, 0x07, 0x71, 0x24, 0x5c, 0x98, 0x2d, 0x9e, 0x1f, 0xf4, 0x1a, 0xec,
+	0xa2, 0x15, 0x92, 0x97, 0x68, 0xa2, 0x5c, 0x7b, 0xae, 0x00, 0x75, 0x6f, 0xe5, 0x70, 0x1d, 0x1c,
+	0x8a, 0x46, 0x3c, 0xd2, 0x2e, 0x55, 0x8c, 0xd2, 0xed, 0x7a, 0xc6, 0x8c, 0x8e, 0x91, 0xf4, 0xe5,
+	0x53, 0x00, 0x5b, 0xcc, 0xb6, 0x1a, 0x88, 0x37, 0xc3, 0x98, 0x21, 0x71, 0x23, 0x15, 0x17, 0x06,
+	0xe1, 0xde, 0xa9, 0x2e, 0xae, 0x45, 0x45, 0x3d, 0xe0, 0x47, 0x5a, 0xcc, 0xee, 0x59, 0xaf, 0x4c,
+	0x45, 0xce, 0x68, 0x6f, 0x83, 0x73, 0x62, 0xdc, 0x4c, 0x5c, 0x73, 0x19, 0xc7, 0xb4, 0x33, 0x6f,
+	0x26, 0xde, 0x44, 0xd4, 0x59, 0xc2, 0x3e, 0x69, 0xb4, 0xdf, 0x54, 0xcb, 0xe0, 0x7c, 0xaa, 0xdd,
+	0x72, 0x3e, 0x8f, 0x83, 0x29, 0x47, 0xac, 0x88, 0x97, 0xff, 0x8c, 0x29, 0xff, 0x15, 0x7f, 0x7a,
+	0x05, 0x1c, 0x10, 0x38, 0x70, 0x5b, 0x01, 0xc7, 0x92, 0x12, 0x0d, 0xbc, 0x96, 0x6a, 0x06, 0x06,
+	0xc4, 0x28, 0xb5, 0xfc, 0x12, 0x08, 0x11, 0x7f, 0x6d, 0xf9, 0x9b, 0x67, 0x7f, 0xfe, 0x90, 0x2d,
+	0xc1, 0x85, 0xe1, 0x49, 0xb7, 0x7d, 0xb5, 0xcb, 0xe8, 0x64, 0x7c, 0x19, 0x9f, 0xcc, 0xaf, 0xe0,
+	0x33, 0x05, 0x1c, 0x4d, 0xc8, 0x48, 0xb0, 0x34, 0x3a, 0xc3, 0x9e, 0xec, 0xa5, 0x5e, 0x1b, 0x1f,
+	0x40, 0x2a, 0xbc, 0x2c, 0x14, 0x5e, 0x84, 0xf3, 0x23, 0x28, 0x8c, 0x52, 0x19, 0xfc, 0x3a, 0x0b,
+	0x72, 0x7b, 0x44, 0x2d, 0x06, 0x6f, 0x8e, 0xc9, 0x2c, 0x31, 0xd5, 0xa9, 0x6b, 0xfb, 0x84, 0x26,
+	0x45, 0x5f, 0x17, 0xa2, 0x2b, 0xf0, 0xda, 0xa8, 0xa2, 0xc3, 0x50, 0x4d, 0xb9, 0xd5, 0x0e, 0x4c,
+	0xf0, 0x5f, 0x05, 0xbc, 0x96, 0x9c, 0xdc, 0x18, 0xbc, 0x31, 0x36, 0xe9, 0xfe, 0x88, 0xa8, 0xde,
+	0xdc, 0x1f, 0x30, 0x69, 0xc0, 0x8a, 0x30, 0xa0, 0x0c, 0x4b, 0x63, 0x18, 0x40, 0x82, 0x2e, 0xfd,
+	0x7f, 0x2b, 0x32, 0x1c, 0x24, 0xc6, 0x2c, 0xf8, 0x41, 0x7a, 0xd6, 0x83, 0x02, 0xa3, 0xba, 0xf2,
+	0xd2, 0x38, 0x52, 0x78, 0x59, 0x08, 0x7f, 0x0f, 0x5e, 0x4e, 0xf1, 0xe9, 0x1a, 0x03, 0x59, 0x3d,
+	0xa9, 0x2d, 0x41, 0x72, 0x77, 0xfc, 0x1a, 0x4b, 0x72, 0x42, 0x90, 0x1c, 0x4b, 0x72, 0x52, 0x0e,
+	0x1c, 0x4f, 0x72, 0x4f, 0x72, 0x84, 0xbf, 0x2a, 0x00, 0xf6, 0x47, 0x40, 0x78, 0x35, 0x3d, 0xc5,
+	0xa4, 0x64, 0xa9, 0x96, 0xc6, 0xae, 0x97, 0xd2, 0x2e, 0x09, 0x69, 0x45, 0x78, 0x61, 0xb8, 0x34,
+	0x2e, 0x01, 0xa2, 0xcf, 0x62, 0xf8, 0x6d, 0x16, 0x9c, 0x1e, 0x96, 0xb2, 0x46, 0xb9, 0xc3, 0x86,
+	0x67, 0xbe, 0x51, 0xee, 0xb0, 0x14, 0xd1, 0x4f, 0xab, 0x08, 0xed, 0xef, 0xc3, 0x2b, 0xc3, 0xb5,
+	0x07, 0xd8, 0x77, 0x5c, 0xbf, 0xd6, 0x99, 0x63, 0x99, 0x58, 0xe1, 0x8f, 0x59, 0x70, 0x26, 0xc5,
+	0xeb, 0x1c, 0xde, 0x4a, 0x4f, 0x3d, 0x55, 0x8c, 0x50, 0xd7, 0xf7, 0x0f, 0x50, 0xda, 0x71, 0x43,
+	0xd8, 0xb1, 0x0c, 0x17, 0x87, 0xdb, 0x41, 0xdb, 0x88, 0x1d, 0x47, 0xa8, 0xc0, 0xb4, 0xa2, 0x78,
+	0x52, 0xb9, 0xfb, 0x64, 0x3b, 0xaf, 0x3c, 0xdd, 0xce, 0x2b, 0x7f, 0x6c, 0xe7, 0x95, 0x47, 0x3b,
+	0xf9, 0xcc, 0xd3, 0x9d, 0x7c, 0xe6, 0xf9, 0x4e, 0x3e, 0xf3, 0xd1, 0x42, 0xcd, 0xe5, 0xf5, 0xe6,
+	0x86, 0x6e, 0x93, 0x86, 0x61, 0x13, 0xd6, 0x20, 0xac, 0xab, 0xdf, 0x3b, 0xed, 0x7e, 0xad, 0x8b,
+	0xc6, 0x83, 0x5d, 0xf3, 0xb7, 0x15, 0x60, 0xb6, 0x31, 0x25, 0xbe, 0x56, 0x2e, 0xfe, 0x17, 0x00,
+	0x00, 0xff, 0xff, 0x84, 0xab, 0xda, 0x7b, 0x39, 0x13, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -4293,7 +4292,7 @@ func (m *ThrottledPacketDataWrapper) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			v := &types1.SlashPacketData{}
+			v := &types.SlashPacketData{}
 			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -4328,7 +4327,7 @@ func (m *ThrottledPacketDataWrapper) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			v := &types1.VSCMaturedPacketData{}
+			v := &types.VSCMaturedPacketData{}
 			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
diff --git a/x/ccv/types/shared_consumer.pb.go b/x/ccv/types/shared_consumer.pb.go
new file mode 100644
index 0000000000..0b4c77a8be
--- /dev/null
+++ b/x/ccv/types/shared_consumer.pb.go
@@ -0,0 +1,2154 @@
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
+// source: interchain_security/ccv/v1/shared_consumer.proto
+
+package types
+
+import (
+	fmt "fmt"
+	types1 "github.com/cometbft/cometbft/abci/types"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
+	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
+	_ "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	_07_tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
+	types "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
+	_ "google.golang.org/protobuf/types/known/durationpb"
+	io "io"
+	math "math"
+	math_bits "math/bits"
+	time "time"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+var _ = time.Kitchen
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
+
+// TODO: rename to ConsumerParams (make issue)
+//
+// Params defines the parameters for CCV consumer module.
+//
+// Note this type is referenced in both the consumer and provider CCV modules,
+// and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis.
+type Params struct {
+	// TODO: Remove enabled flag and find a better way to setup integration tests
+	// See: https://github.com/cosmos/interchain-security/issues/339
+	Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	///////////////////////
+	// Distribution Params
+	// Number of blocks between ibc-token-transfers from the consumer chain to
+	// the provider chain. Note that at this transmission event a fraction of
+	// the accumulated tokens are divided and sent consumer redistribution
+	// address.
+	BlocksPerDistributionTransmission int64 `protobuf:"varint,2,opt,name=blocks_per_distribution_transmission,json=blocksPerDistributionTransmission,proto3" json:"blocks_per_distribution_transmission,omitempty"`
+	// Channel, and provider-chain receiving address to send distribution token
+	// transfers over. These parameters is auto-set during the consumer <->
+	// provider handshake procedure.
+	DistributionTransmissionChannel string `protobuf:"bytes,3,opt,name=distribution_transmission_channel,json=distributionTransmissionChannel,proto3" json:"distribution_transmission_channel,omitempty"`
+	ProviderFeePoolAddrStr          string `protobuf:"bytes,4,opt,name=provider_fee_pool_addr_str,json=providerFeePoolAddrStr,proto3" json:"provider_fee_pool_addr_str,omitempty"`
+	// Sent CCV related IBC packets will timeout after this duration
+	CcvTimeoutPeriod time.Duration `protobuf:"bytes,5,opt,name=ccv_timeout_period,json=ccvTimeoutPeriod,proto3,stdduration" json:"ccv_timeout_period"`
+	// Sent transfer related IBC packets will timeout after this duration
+	TransferTimeoutPeriod time.Duration `protobuf:"bytes,6,opt,name=transfer_timeout_period,json=transferTimeoutPeriod,proto3,stdduration" json:"transfer_timeout_period"`
+	// The fraction of tokens allocated to the consumer redistribution address
+	// during distribution events. The fraction is a string representing a
+	// decimal number. For example "0.75" would represent 75%.
+	ConsumerRedistributionFraction string `protobuf:"bytes,7,opt,name=consumer_redistribution_fraction,json=consumerRedistributionFraction,proto3" json:"consumer_redistribution_fraction,omitempty"`
+	// The number of historical info entries to persist in store.
+	// This param is a part of the cosmos sdk staking module. In the case of
+	// a ccv enabled consumer chain, the ccv module acts as the staking module.
+	HistoricalEntries int64 `protobuf:"varint,8,opt,name=historical_entries,json=historicalEntries,proto3" json:"historical_entries,omitempty"`
+	// Unbonding period for the consumer,
+	// which should be smaller than that of the provider in general.
+	UnbondingPeriod time.Duration `protobuf:"bytes,9,opt,name=unbonding_period,json=unbondingPeriod,proto3,stdduration" json:"unbonding_period"`
+	// The threshold for the percentage of validators at the bottom of the set who
+	// can opt out of running the consumer chain without being punished. For
+	// example, a value of 0.05 means that the validators in the bottom 5% of the
+	// set can opt out
+	SoftOptOutThreshold string `protobuf:"bytes,10,opt,name=soft_opt_out_threshold,json=softOptOutThreshold,proto3" json:"soft_opt_out_threshold,omitempty"`
+	// Reward denoms. These are the denominations which are allowed to be sent to
+	// the provider as rewards.
+	RewardDenoms []string `protobuf:"bytes,11,rep,name=reward_denoms,json=rewardDenoms,proto3" json:"reward_denoms,omitempty"`
+	// Provider-originated reward denoms. These are denoms coming from the
+	// provider which are allowed to be used as rewards. e.g. "uatom"
+	ProviderRewardDenoms []string `protobuf:"bytes,12,rep,name=provider_reward_denoms,json=providerRewardDenoms,proto3" json:"provider_reward_denoms,omitempty"`
+}
+
+func (m *Params) Reset()         { *m = Params{} }
+func (m *Params) String() string { return proto.CompactTextString(m) }
+func (*Params) ProtoMessage()    {}
+func (*Params) Descriptor() ([]byte, []int) {
+	return fileDescriptor_d0a8be0efc64dfbc, []int{0}
+}
+func (m *Params) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_Params.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *Params) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Params.Merge(m, src)
+}
+func (m *Params) XXX_Size() int {
+	return m.Size()
+}
+func (m *Params) XXX_DiscardUnknown() {
+	xxx_messageInfo_Params.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Params proto.InternalMessageInfo
+
+func (m *Params) GetEnabled() bool {
+	if m != nil {
+		return m.Enabled
+	}
+	return false
+}
+
+func (m *Params) GetBlocksPerDistributionTransmission() int64 {
+	if m != nil {
+		return m.BlocksPerDistributionTransmission
+	}
+	return 0
+}
+
+func (m *Params) GetDistributionTransmissionChannel() string {
+	if m != nil {
+		return m.DistributionTransmissionChannel
+	}
+	return ""
+}
+
+func (m *Params) GetProviderFeePoolAddrStr() string {
+	if m != nil {
+		return m.ProviderFeePoolAddrStr
+	}
+	return ""
+}
+
+func (m *Params) GetCcvTimeoutPeriod() time.Duration {
+	if m != nil {
+		return m.CcvTimeoutPeriod
+	}
+	return 0
+}
+
+func (m *Params) GetTransferTimeoutPeriod() time.Duration {
+	if m != nil {
+		return m.TransferTimeoutPeriod
+	}
+	return 0
+}
+
+func (m *Params) GetConsumerRedistributionFraction() string {
+	if m != nil {
+		return m.ConsumerRedistributionFraction
+	}
+	return ""
+}
+
+func (m *Params) GetHistoricalEntries() int64 {
+	if m != nil {
+		return m.HistoricalEntries
+	}
+	return 0
+}
+
+func (m *Params) GetUnbondingPeriod() time.Duration {
+	if m != nil {
+		return m.UnbondingPeriod
+	}
+	return 0
+}
+
+func (m *Params) GetSoftOptOutThreshold() string {
+	if m != nil {
+		return m.SoftOptOutThreshold
+	}
+	return ""
+}
+
+func (m *Params) GetRewardDenoms() []string {
+	if m != nil {
+		return m.RewardDenoms
+	}
+	return nil
+}
+
+func (m *Params) GetProviderRewardDenoms() []string {
+	if m != nil {
+		return m.ProviderRewardDenoms
+	}
+	return nil
+}
+
+// TODO: rename to ConsumerGenesisState (make issue)
+//
+// GenesisState defines the CCV consumer chain genesis state.
+//
+// Note this type is referenced in both the consumer and provider CCV modules,
+// and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis.
+type GenesisState struct {
+	Params            Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
+	ProviderClientId  string `protobuf:"bytes,2,opt,name=provider_client_id,json=providerClientId,proto3" json:"provider_client_id,omitempty"`
+	ProviderChannelId string `protobuf:"bytes,3,opt,name=provider_channel_id,json=providerChannelId,proto3" json:"provider_channel_id,omitempty"`
+	NewChain          bool   `protobuf:"varint,4,opt,name=new_chain,json=newChain,proto3" json:"new_chain,omitempty"`
+	// ProviderClientState filled in on new chain, nil on restart.
+	ProviderClientState *_07_tendermint.ClientState `protobuf:"bytes,5,opt,name=provider_client_state,json=providerClientState,proto3" json:"provider_client_state,omitempty"`
+	// ProviderConsensusState filled in on new chain, nil on restart.
+	ProviderConsensusState *_07_tendermint.ConsensusState `protobuf:"bytes,6,opt,name=provider_consensus_state,json=providerConsensusState,proto3" json:"provider_consensus_state,omitempty"`
+	// MaturingPackets nil on new chain, filled in on restart.
+	MaturingPackets []types.MaturingVSCPacket `protobuf:"bytes,7,rep,name=maturing_packets,json=maturingPackets,proto3" json:"maturing_packets"`
+	// InitialValset filled in on new chain and on restart.
+	InitialValSet []types1.ValidatorUpdate `protobuf:"bytes,8,rep,name=initial_val_set,json=initialValSet,proto3" json:"initial_val_set"`
+	// HeightToValsetUpdateId nil on new chain, filled in on restart.
+	HeightToValsetUpdateId []HeightToValsetUpdateID `protobuf:"bytes,9,rep,name=height_to_valset_update_id,json=heightToValsetUpdateId,proto3" json:"height_to_valset_update_id"`
+	// OutstandingDowntimes nil on new chain, filled  in on restart.
+	OutstandingDowntimeSlashing []OutstandingDowntime `protobuf:"bytes,10,rep,name=outstanding_downtime_slashing,json=outstandingDowntimeSlashing,proto3" json:"outstanding_downtime_slashing"`
+	// PendingConsumerPackets nil on new chain, filled in on restart.
+	PendingConsumerPackets ConsumerPacketDataList `protobuf:"bytes,11,opt,name=pending_consumer_packets,json=pendingConsumerPackets,proto3" json:"pending_consumer_packets"`
+	// LastTransmissionBlockHeight nil on new chain, filled in on restart.
+	LastTransmissionBlockHeight types.LastTransmissionBlockHeight `protobuf:"bytes,12,opt,name=last_transmission_block_height,json=lastTransmissionBlockHeight,proto3" json:"last_transmission_block_height"`
+	PreCCV                      bool                              `protobuf:"varint,13,opt,name=preCCV,proto3" json:"preCCV,omitempty"`
+}
+
+func (m *GenesisState) Reset()         { *m = GenesisState{} }
+func (m *GenesisState) String() string { return proto.CompactTextString(m) }
+func (*GenesisState) ProtoMessage()    {}
+func (*GenesisState) Descriptor() ([]byte, []int) {
+	return fileDescriptor_d0a8be0efc64dfbc, []int{1}
+}
+func (m *GenesisState) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *GenesisState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GenesisState.Merge(m, src)
+}
+func (m *GenesisState) XXX_Size() int {
+	return m.Size()
+}
+func (m *GenesisState) XXX_DiscardUnknown() {
+	xxx_messageInfo_GenesisState.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GenesisState proto.InternalMessageInfo
+
+func (m *GenesisState) GetParams() Params {
+	if m != nil {
+		return m.Params
+	}
+	return Params{}
+}
+
+func (m *GenesisState) GetProviderClientId() string {
+	if m != nil {
+		return m.ProviderClientId
+	}
+	return ""
+}
+
+func (m *GenesisState) GetProviderChannelId() string {
+	if m != nil {
+		return m.ProviderChannelId
+	}
+	return ""
+}
+
+func (m *GenesisState) GetNewChain() bool {
+	if m != nil {
+		return m.NewChain
+	}
+	return false
+}
+
+func (m *GenesisState) GetProviderClientState() *_07_tendermint.ClientState {
+	if m != nil {
+		return m.ProviderClientState
+	}
+	return nil
+}
+
+func (m *GenesisState) GetProviderConsensusState() *_07_tendermint.ConsensusState {
+	if m != nil {
+		return m.ProviderConsensusState
+	}
+	return nil
+}
+
+func (m *GenesisState) GetMaturingPackets() []types.MaturingVSCPacket {
+	if m != nil {
+		return m.MaturingPackets
+	}
+	return nil
+}
+
+func (m *GenesisState) GetInitialValSet() []types1.ValidatorUpdate {
+	if m != nil {
+		return m.InitialValSet
+	}
+	return nil
+}
+
+func (m *GenesisState) GetHeightToValsetUpdateId() []HeightToValsetUpdateID {
+	if m != nil {
+		return m.HeightToValsetUpdateId
+	}
+	return nil
+}
+
+func (m *GenesisState) GetOutstandingDowntimeSlashing() []OutstandingDowntime {
+	if m != nil {
+		return m.OutstandingDowntimeSlashing
+	}
+	return nil
+}
+
+func (m *GenesisState) GetPendingConsumerPackets() ConsumerPacketDataList {
+	if m != nil {
+		return m.PendingConsumerPackets
+	}
+	return ConsumerPacketDataList{}
+}
+
+func (m *GenesisState) GetLastTransmissionBlockHeight() types.LastTransmissionBlockHeight {
+	if m != nil {
+		return m.LastTransmissionBlockHeight
+	}
+	return types.LastTransmissionBlockHeight{}
+}
+
+func (m *GenesisState) GetPreCCV() bool {
+	if m != nil {
+		return m.PreCCV
+	}
+	return false
+}
+
+// HeightValsetUpdateID represents a mapping internal to the consumer CCV module
+// AND used in shared consumer genesis state, which links a block height to each recv valset update id.
+type HeightToValsetUpdateID struct {
+	Height         uint64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"`
+	ValsetUpdateId uint64 `protobuf:"varint,2,opt,name=valset_update_id,json=valsetUpdateId,proto3" json:"valset_update_id,omitempty"`
+}
+
+func (m *HeightToValsetUpdateID) Reset()         { *m = HeightToValsetUpdateID{} }
+func (m *HeightToValsetUpdateID) String() string { return proto.CompactTextString(m) }
+func (*HeightToValsetUpdateID) ProtoMessage()    {}
+func (*HeightToValsetUpdateID) Descriptor() ([]byte, []int) {
+	return fileDescriptor_d0a8be0efc64dfbc, []int{2}
+}
+func (m *HeightToValsetUpdateID) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *HeightToValsetUpdateID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_HeightToValsetUpdateID.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *HeightToValsetUpdateID) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HeightToValsetUpdateID.Merge(m, src)
+}
+func (m *HeightToValsetUpdateID) XXX_Size() int {
+	return m.Size()
+}
+func (m *HeightToValsetUpdateID) XXX_DiscardUnknown() {
+	xxx_messageInfo_HeightToValsetUpdateID.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HeightToValsetUpdateID proto.InternalMessageInfo
+
+func (m *HeightToValsetUpdateID) GetHeight() uint64 {
+	if m != nil {
+		return m.Height
+	}
+	return 0
+}
+
+func (m *HeightToValsetUpdateID) GetValsetUpdateId() uint64 {
+	if m != nil {
+		return m.ValsetUpdateId
+	}
+	return 0
+}
+
+// OutstandingDowntime defines the type used internally to the consumer CCV module,
+// AND used in shared consumer genesis state, in order to not send multiple slashing
+// requests for the same downtime infraction.
+type OutstandingDowntime struct {
+	ValidatorConsensusAddress string `protobuf:"bytes,1,opt,name=validator_consensus_address,json=validatorConsensusAddress,proto3" json:"validator_consensus_address,omitempty"`
+}
+
+func (m *OutstandingDowntime) Reset()         { *m = OutstandingDowntime{} }
+func (m *OutstandingDowntime) String() string { return proto.CompactTextString(m) }
+func (*OutstandingDowntime) ProtoMessage()    {}
+func (*OutstandingDowntime) Descriptor() ([]byte, []int) {
+	return fileDescriptor_d0a8be0efc64dfbc, []int{3}
+}
+func (m *OutstandingDowntime) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *OutstandingDowntime) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_OutstandingDowntime.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *OutstandingDowntime) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OutstandingDowntime.Merge(m, src)
+}
+func (m *OutstandingDowntime) XXX_Size() int {
+	return m.Size()
+}
+func (m *OutstandingDowntime) XXX_DiscardUnknown() {
+	xxx_messageInfo_OutstandingDowntime.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OutstandingDowntime proto.InternalMessageInfo
+
+func (m *OutstandingDowntime) GetValidatorConsensusAddress() string {
+	if m != nil {
+		return m.ValidatorConsensusAddress
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*Params)(nil), "interchain_security.ccv.v1.Params")
+	proto.RegisterType((*GenesisState)(nil), "interchain_security.ccv.v1.GenesisState")
+	proto.RegisterType((*HeightToValsetUpdateID)(nil), "interchain_security.ccv.v1.HeightToValsetUpdateID")
+	proto.RegisterType((*OutstandingDowntime)(nil), "interchain_security.ccv.v1.OutstandingDowntime")
+}
+
+func init() {
+	proto.RegisterFile("interchain_security/ccv/v1/shared_consumer.proto", fileDescriptor_d0a8be0efc64dfbc)
+}
+
+var fileDescriptor_d0a8be0efc64dfbc = []byte{
+	// 1100 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcf, 0x53, 0x1b, 0x37,
+	0x14, 0xc6, 0x81, 0x1a, 0x5b, 0x40, 0x21, 0x22, 0x71, 0x37, 0x30, 0x35, 0x86, 0xb6, 0x33, 0x9e,
+	0x69, 0xb3, 0x5b, 0x20, 0xd3, 0x43, 0x0f, 0x9d, 0x04, 0xbb, 0x69, 0xe8, 0xa4, 0x81, 0x2e, 0x84,
+	0x43, 0x7a, 0xd0, 0xc8, 0x92, 0xf0, 0x6a, 0xb2, 0x96, 0x3c, 0x92, 0x76, 0x29, 0xf7, 0xde, 0x7a,
+	0xe9, 0xb1, 0x7f, 0x52, 0x8e, 0x39, 0x76, 0x7a, 0x68, 0x3b, 0xf0, 0x8f, 0x74, 0x56, 0xd2, 0x1a,
+	0x3b, 0xc1, 0x84, 0xdb, 0x4a, 0xef, 0xfb, 0xbe, 0xa7, 0xf7, 0x43, 0x4f, 0x0b, 0xbe, 0xe6, 0xc2,
+	0x30, 0x45, 0x12, 0xcc, 0x05, 0xd2, 0x8c, 0x64, 0x8a, 0x9b, 0xf3, 0x88, 0x90, 0x3c, 0xca, 0xb7,
+	0x23, 0x9d, 0x60, 0xc5, 0x28, 0x22, 0x52, 0xe8, 0x6c, 0xc0, 0x54, 0x38, 0x54, 0xd2, 0x48, 0xb8,
+	0x76, 0x0d, 0x23, 0x24, 0x24, 0x0f, 0xf3, 0xed, 0xb5, 0x9d, 0x69, 0x6a, 0xa5, 0x46, 0x21, 0x3b,
+	0xa9, 0xb7, 0xb6, 0x6e, 0x98, 0xa0, 0x4c, 0x0d, 0xb8, 0x30, 0x11, 0xee, 0x11, 0x1e, 0x99, 0xf3,
+	0x21, 0xd3, 0xde, 0x18, 0xf1, 0x1e, 0x89, 0x52, 0xde, 0x4f, 0x0c, 0x49, 0x39, 0x13, 0x46, 0x47,
+	0x63, 0xe8, 0x7c, 0x7b, 0x6c, 0xe5, 0x09, 0x9b, 0x05, 0x81, 0x48, 0xc5, 0x22, 0x92, 0x60, 0x21,
+	0x58, 0x6a, 0x3d, 0xba, 0x4f, 0x0f, 0x69, 0xf6, 0xa5, 0xec, 0xa7, 0x2c, 0xb2, 0xab, 0x5e, 0x76,
+	0x1a, 0xd1, 0x4c, 0x61, 0xc3, 0xa5, 0xf0, 0xf6, 0x7b, 0x7d, 0xd9, 0x97, 0xf6, 0x33, 0x2a, 0xbe,
+	0xfc, 0xee, 0x17, 0x37, 0x24, 0xea, 0x8c, 0x2b, 0xe6, 0x60, 0x5b, 0xbf, 0x55, 0x41, 0xf5, 0x10,
+	0x2b, 0x3c, 0xd0, 0x30, 0x00, 0xf3, 0x4c, 0xe0, 0x5e, 0xca, 0x68, 0x50, 0x69, 0x55, 0xda, 0xb5,
+	0xb8, 0x5c, 0xc2, 0x03, 0xf0, 0x79, 0x2f, 0x95, 0xe4, 0xb5, 0x46, 0x43, 0xa6, 0x10, 0xe5, 0xda,
+	0x28, 0xde, 0xcb, 0x8a, 0x23, 0x20, 0xa3, 0xb0, 0xd0, 0x03, 0xae, 0x35, 0x97, 0x22, 0xb8, 0xd3,
+	0xaa, 0xb4, 0x67, 0xe3, 0x4d, 0x87, 0x3d, 0x64, 0xaa, 0x3b, 0x86, 0x3c, 0x1e, 0x03, 0xc2, 0x1f,
+	0xc1, 0xe6, 0x54, 0x15, 0xe4, 0xa3, 0x0f, 0x66, 0x5b, 0x95, 0x76, 0x3d, 0xde, 0xa0, 0x53, 0x44,
+	0x3a, 0x0e, 0x06, 0xbf, 0x05, 0x6b, 0x43, 0x25, 0x73, 0x4e, 0x99, 0x42, 0xa7, 0x8c, 0xa1, 0xa1,
+	0x94, 0x29, 0xc2, 0x94, 0x2a, 0xa4, 0x8d, 0x0a, 0xe6, 0xac, 0x48, 0xa3, 0x44, 0x3c, 0x65, 0xec,
+	0x50, 0xca, 0xf4, 0x09, 0xa5, 0xea, 0xc8, 0x28, 0xf8, 0x33, 0x80, 0x84, 0xe4, 0xc8, 0xf0, 0x01,
+	0x93, 0x99, 0x29, 0xa2, 0xe3, 0x92, 0x06, 0x1f, 0xb5, 0x2a, 0xed, 0x85, 0x9d, 0x07, 0xa1, 0xcb,
+	0x7b, 0x58, 0xe6, 0x3d, 0xec, 0xfa, 0xbc, 0xef, 0xd5, 0xde, 0xfc, 0xb3, 0x31, 0xf3, 0xe7, 0xbf,
+	0x1b, 0x95, 0x78, 0x85, 0x90, 0xfc, 0xd8, 0xb1, 0x0f, 0x2d, 0x19, 0xfe, 0x02, 0x3e, 0xb1, 0xd1,
+	0x9c, 0x32, 0xf5, 0xae, 0x6e, 0xf5, 0xf6, 0xba, 0xf7, 0x4b, 0x8d, 0x49, 0xf1, 0x67, 0xa0, 0x55,
+	0x76, 0x23, 0x52, 0x6c, 0x22, 0x85, 0xa7, 0x0a, 0x93, 0xe2, 0x23, 0x98, 0xb7, 0x11, 0x37, 0x4b,
+	0x5c, 0x3c, 0x01, 0x7b, 0xea, 0x51, 0xf0, 0x21, 0x80, 0x09, 0xd7, 0x46, 0x2a, 0x4e, 0x70, 0x8a,
+	0x98, 0x30, 0x8a, 0x33, 0x1d, 0xd4, 0x6c, 0x01, 0xef, 0x5e, 0x59, 0xbe, 0x77, 0x06, 0xf8, 0x02,
+	0xac, 0x64, 0xa2, 0x27, 0x05, 0xe5, 0xa2, 0x5f, 0x86, 0x53, 0xbf, 0x7d, 0x38, 0xcb, 0x23, 0xb2,
+	0x0f, 0x64, 0x17, 0x34, 0xb4, 0x3c, 0x35, 0x48, 0x0e, 0x0d, 0x2a, 0x32, 0x64, 0x12, 0xc5, 0x74,
+	0x22, 0x53, 0x1a, 0x00, 0x7b, 0xfc, 0xd5, 0xc2, 0x7a, 0x30, 0x34, 0x07, 0x99, 0x39, 0x2e, 0x4d,
+	0xf0, 0x33, 0xb0, 0xa4, 0xd8, 0x19, 0x56, 0x14, 0x51, 0x26, 0xe4, 0x40, 0x07, 0x0b, 0xad, 0xd9,
+	0x76, 0x3d, 0x5e, 0x74, 0x9b, 0x5d, 0xbb, 0x07, 0x1f, 0x81, 0x51, 0xb1, 0xd1, 0x24, 0x7a, 0xd1,
+	0xa2, 0xef, 0x95, 0xd6, 0x78, 0x8c, 0xb5, 0xf5, 0x77, 0x0d, 0x2c, 0xfe, 0xc0, 0x04, 0xd3, 0x5c,
+	0x1f, 0x19, 0x6c, 0x18, 0x7c, 0x0c, 0xaa, 0x43, 0x7b, 0x2d, 0xec, 0x5d, 0x58, 0xd8, 0xd9, 0x0a,
+	0xa7, 0x8f, 0x91, 0xd0, 0x5d, 0xa0, 0xbd, 0xb9, 0x22, 0xde, 0xd8, 0xf3, 0xe0, 0x57, 0x00, 0x8e,
+	0x0e, 0xe2, 0x86, 0x01, 0xe2, 0xd4, 0x5e, 0x91, 0x7a, 0xbc, 0x52, 0x5a, 0x3a, 0xd6, 0xb0, 0x4f,
+	0x61, 0x08, 0x56, 0xaf, 0xd0, 0xae, 0xb3, 0x0b, 0xb8, 0xbb, 0x03, 0x77, 0x47, 0x70, 0x67, 0xd9,
+	0xa7, 0x70, 0x1d, 0xd4, 0x05, 0x3b, 0x43, 0xf6, 0x3c, 0xb6, 0xc9, 0x6b, 0x71, 0x4d, 0xb0, 0xb3,
+	0x4e, 0xb1, 0x86, 0x08, 0xdc, 0x7f, 0xd7, 0xb5, 0x2e, 0xa2, 0xf2, 0x9d, 0xfd, 0x65, 0xc8, 0x7b,
+	0x24, 0x1c, 0x9f, 0x52, 0xe1, 0xd8, 0x5c, 0xca, 0xb7, 0x43, 0x77, 0x2a, 0x9b, 0x88, 0x78, 0x75,
+	0xf2, 0xa8, 0x2e, 0x3b, 0x09, 0x08, 0xae, 0x1c, 0x48, 0xa1, 0x99, 0xd0, 0x99, 0xf6, 0x3e, 0x5c,
+	0x97, 0x87, 0x1f, 0xf4, 0x51, 0xd2, 0x9c, 0x9b, 0x51, 0xd1, 0x26, 0xf7, 0x61, 0x1f, 0xac, 0x0c,
+	0xb0, 0xc9, 0x94, 0xed, 0x3b, 0x4c, 0x5e, 0x33, 0xa3, 0x83, 0xf9, 0xd6, 0x6c, 0x7b, 0x61, 0xe7,
+	0x9b, 0xa9, 0x15, 0x19, 0x0d, 0xec, 0x7c, 0x3b, 0xfc, 0xc9, 0x93, 0x4f, 0x8e, 0x3a, 0x87, 0x96,
+	0xee, 0xab, 0xb4, 0x5c, 0xaa, 0xba, 0xdd, 0xa2, 0xc3, 0x97, 0xb9, 0xe0, 0x86, 0xe3, 0x14, 0xe5,
+	0x38, 0x45, 0x9a, 0x99, 0xa0, 0x66, 0xfd, 0xb4, 0xc6, 0x0f, 0x5e, 0x0c, 0xfc, 0xf0, 0x04, 0xa7,
+	0x9c, 0x62, 0x23, 0xd5, 0xcb, 0x21, 0xc5, 0x86, 0x79, 0xc5, 0x25, 0x4f, 0x3f, 0xc1, 0xe9, 0x11,
+	0x33, 0xd0, 0x80, 0xb5, 0x84, 0x15, 0xe1, 0x23, 0x23, 0x0b, 0x45, 0xcd, 0x0c, 0xca, 0x2c, 0xbe,
+	0xa8, 0x6b, 0xdd, 0x4a, 0xef, 0xdc, 0xd4, 0x54, 0xcf, 0x2c, 0xfb, 0x58, 0x9e, 0x58, 0xae, 0x73,
+	0xb5, 0xdf, 0xf5, 0xce, 0x1a, 0xc9, 0x75, 0x56, 0x0a, 0xcf, 0xc1, 0xa7, 0x32, 0x33, 0xda, 0x60,
+	0x77, 0x53, 0xa9, 0x3c, 0x13, 0xc5, 0x10, 0x42, 0x3a, 0xc5, 0x3a, 0xe1, 0xa2, 0x1f, 0x00, 0xeb,
+	0x38, 0xba, 0xc9, 0xf1, 0xc1, 0x95, 0x40, 0xd7, 0xf3, 0xbd, 0xd7, 0x75, 0xf9, 0xbe, 0xe9, 0xc8,
+	0x2b, 0x43, 0x05, 0x82, 0x21, 0x73, 0x6e, 0x47, 0x33, 0xaa, 0xac, 0xd8, 0x82, 0xed, 0x89, 0x1b,
+	0xc3, 0xed, 0x78, 0x8e, 0xab, 0x47, 0x17, 0x1b, 0xfc, 0x9c, 0xeb, 0xb2, 0x5a, 0x0d, 0xaf, 0x3c,
+	0x09, 0xd2, 0xf0, 0xf7, 0x0a, 0x68, 0xa6, 0x58, 0x9b, 0xc9, 0x07, 0xc4, 0xbe, 0x3f, 0xc8, 0x65,
+	0x28, 0x58, 0xb4, 0xae, 0x1f, 0xdf, 0xaa, 0x59, 0x9e, 0x63, 0x6d, 0xc6, 0x9f, 0x98, 0xbd, 0x42,
+	0xc8, 0xd5, 0xa1, 0xcc, 0x40, 0x3a, 0x1d, 0x02, 0x1b, 0xa0, 0x3a, 0x54, 0xac, 0xd3, 0x39, 0x09,
+	0x96, 0xec, 0x85, 0xf4, 0xab, 0xad, 0x57, 0xa0, 0x71, 0x7d, 0x31, 0x0b, 0x86, 0x3f, 0x66, 0x31,
+	0x65, 0xe6, 0x62, 0xbf, 0x82, 0x6d, 0xb0, 0xf2, 0x5e, 0xcb, 0xdc, 0xb1, 0x88, 0x8f, 0xf3, 0x89,
+	0x82, 0x6f, 0xbd, 0x04, 0xab, 0xd7, 0xd4, 0x0b, 0x7e, 0x07, 0xd6, 0xf3, 0xb2, 0x4b, 0xc7, 0x6e,
+	0x68, 0xf1, 0x2c, 0x32, 0xed, 0x66, 0x5a, 0x3d, 0x7e, 0x30, 0x82, 0x8c, 0x2e, 0xdd, 0x13, 0x07,
+	0xd8, 0x7b, 0xf1, 0xe6, 0xa2, 0x59, 0x79, 0x7b, 0xd1, 0xac, 0xfc, 0x77, 0xd1, 0xac, 0xfc, 0x71,
+	0xd9, 0x9c, 0x79, 0x7b, 0xd9, 0x9c, 0xf9, 0xeb, 0xb2, 0x39, 0xf3, 0xea, 0x51, 0x9f, 0x9b, 0x24,
+	0xeb, 0x85, 0x44, 0x0e, 0x22, 0x22, 0xf5, 0x40, 0xea, 0xe8, 0x2a, 0xb5, 0x0f, 0x47, 0x7f, 0x1a,
+	0xf9, 0x6e, 0xf4, 0xab, 0xfd, 0xdd, 0xb0, 0x7f, 0x47, 0xbd, 0xaa, 0x7d, 0x1d, 0x76, 0xff, 0x0f,
+	0x00, 0x00, 0xff, 0xff, 0x27, 0x23, 0xb9, 0x3e, 0xbf, 0x09, 0x00, 0x00,
+}
+
+func (m *Params) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *Params) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.ProviderRewardDenoms) > 0 {
+		for iNdEx := len(m.ProviderRewardDenoms) - 1; iNdEx >= 0; iNdEx-- {
+			i -= len(m.ProviderRewardDenoms[iNdEx])
+			copy(dAtA[i:], m.ProviderRewardDenoms[iNdEx])
+			i = encodeVarintSharedConsumer(dAtA, i, uint64(len(m.ProviderRewardDenoms[iNdEx])))
+			i--
+			dAtA[i] = 0x62
+		}
+	}
+	if len(m.RewardDenoms) > 0 {
+		for iNdEx := len(m.RewardDenoms) - 1; iNdEx >= 0; iNdEx-- {
+			i -= len(m.RewardDenoms[iNdEx])
+			copy(dAtA[i:], m.RewardDenoms[iNdEx])
+			i = encodeVarintSharedConsumer(dAtA, i, uint64(len(m.RewardDenoms[iNdEx])))
+			i--
+			dAtA[i] = 0x5a
+		}
+	}
+	if len(m.SoftOptOutThreshold) > 0 {
+		i -= len(m.SoftOptOutThreshold)
+		copy(dAtA[i:], m.SoftOptOutThreshold)
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(len(m.SoftOptOutThreshold)))
+		i--
+		dAtA[i] = 0x52
+	}
+	n1, err1 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.UnbondingPeriod, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.UnbondingPeriod):])
+	if err1 != nil {
+		return 0, err1
+	}
+	i -= n1
+	i = encodeVarintSharedConsumer(dAtA, i, uint64(n1))
+	i--
+	dAtA[i] = 0x4a
+	if m.HistoricalEntries != 0 {
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(m.HistoricalEntries))
+		i--
+		dAtA[i] = 0x40
+	}
+	if len(m.ConsumerRedistributionFraction) > 0 {
+		i -= len(m.ConsumerRedistributionFraction)
+		copy(dAtA[i:], m.ConsumerRedistributionFraction)
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(len(m.ConsumerRedistributionFraction)))
+		i--
+		dAtA[i] = 0x3a
+	}
+	n2, err2 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.TransferTimeoutPeriod, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.TransferTimeoutPeriod):])
+	if err2 != nil {
+		return 0, err2
+	}
+	i -= n2
+	i = encodeVarintSharedConsumer(dAtA, i, uint64(n2))
+	i--
+	dAtA[i] = 0x32
+	n3, err3 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.CcvTimeoutPeriod, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.CcvTimeoutPeriod):])
+	if err3 != nil {
+		return 0, err3
+	}
+	i -= n3
+	i = encodeVarintSharedConsumer(dAtA, i, uint64(n3))
+	i--
+	dAtA[i] = 0x2a
+	if len(m.ProviderFeePoolAddrStr) > 0 {
+		i -= len(m.ProviderFeePoolAddrStr)
+		copy(dAtA[i:], m.ProviderFeePoolAddrStr)
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(len(m.ProviderFeePoolAddrStr)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if len(m.DistributionTransmissionChannel) > 0 {
+		i -= len(m.DistributionTransmissionChannel)
+		copy(dAtA[i:], m.DistributionTransmissionChannel)
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(len(m.DistributionTransmissionChannel)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.BlocksPerDistributionTransmission != 0 {
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(m.BlocksPerDistributionTransmission))
+		i--
+		dAtA[i] = 0x10
+	}
+	if m.Enabled {
+		i--
+		if m.Enabled {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x8
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *GenesisState) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *GenesisState) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.PreCCV {
+		i--
+		if m.PreCCV {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x68
+	}
+	{
+		size, err := m.LastTransmissionBlockHeight.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x62
+	{
+		size, err := m.PendingConsumerPackets.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x5a
+	if len(m.OutstandingDowntimeSlashing) > 0 {
+		for iNdEx := len(m.OutstandingDowntimeSlashing) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.OutstandingDowntimeSlashing[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintSharedConsumer(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x52
+		}
+	}
+	if len(m.HeightToValsetUpdateId) > 0 {
+		for iNdEx := len(m.HeightToValsetUpdateId) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.HeightToValsetUpdateId[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintSharedConsumer(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x4a
+		}
+	}
+	if len(m.InitialValSet) > 0 {
+		for iNdEx := len(m.InitialValSet) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.InitialValSet[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintSharedConsumer(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x42
+		}
+	}
+	if len(m.MaturingPackets) > 0 {
+		for iNdEx := len(m.MaturingPackets) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.MaturingPackets[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintSharedConsumer(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x3a
+		}
+	}
+	if m.ProviderConsensusState != nil {
+		{
+			size, err := m.ProviderConsensusState.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintSharedConsumer(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x32
+	}
+	if m.ProviderClientState != nil {
+		{
+			size, err := m.ProviderClientState.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintSharedConsumer(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x2a
+	}
+	if m.NewChain {
+		i--
+		if m.NewChain {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x20
+	}
+	if len(m.ProviderChannelId) > 0 {
+		i -= len(m.ProviderChannelId)
+		copy(dAtA[i:], m.ProviderChannelId)
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(len(m.ProviderChannelId)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if len(m.ProviderClientId) > 0 {
+		i -= len(m.ProviderClientId)
+		copy(dAtA[i:], m.ProviderClientId)
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(len(m.ProviderClientId)))
+		i--
+		dAtA[i] = 0x12
+	}
+	{
+		size, err := m.Params.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0xa
+	return len(dAtA) - i, nil
+}
+
+func (m *HeightToValsetUpdateID) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *HeightToValsetUpdateID) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *HeightToValsetUpdateID) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.ValsetUpdateId != 0 {
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(m.ValsetUpdateId))
+		i--
+		dAtA[i] = 0x10
+	}
+	if m.Height != 0 {
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(m.Height))
+		i--
+		dAtA[i] = 0x8
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *OutstandingDowntime) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *OutstandingDowntime) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *OutstandingDowntime) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.ValidatorConsensusAddress) > 0 {
+		i -= len(m.ValidatorConsensusAddress)
+		copy(dAtA[i:], m.ValidatorConsensusAddress)
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(len(m.ValidatorConsensusAddress)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func encodeVarintSharedConsumer(dAtA []byte, offset int, v uint64) int {
+	offset -= sovSharedConsumer(v)
+	base := offset
+	for v >= 1<<7 {
+		dAtA[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	dAtA[offset] = uint8(v)
+	return base
+}
+func (m *Params) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Enabled {
+		n += 2
+	}
+	if m.BlocksPerDistributionTransmission != 0 {
+		n += 1 + sovSharedConsumer(uint64(m.BlocksPerDistributionTransmission))
+	}
+	l = len(m.DistributionTransmissionChannel)
+	if l > 0 {
+		n += 1 + l + sovSharedConsumer(uint64(l))
+	}
+	l = len(m.ProviderFeePoolAddrStr)
+	if l > 0 {
+		n += 1 + l + sovSharedConsumer(uint64(l))
+	}
+	l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.CcvTimeoutPeriod)
+	n += 1 + l + sovSharedConsumer(uint64(l))
+	l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.TransferTimeoutPeriod)
+	n += 1 + l + sovSharedConsumer(uint64(l))
+	l = len(m.ConsumerRedistributionFraction)
+	if l > 0 {
+		n += 1 + l + sovSharedConsumer(uint64(l))
+	}
+	if m.HistoricalEntries != 0 {
+		n += 1 + sovSharedConsumer(uint64(m.HistoricalEntries))
+	}
+	l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.UnbondingPeriod)
+	n += 1 + l + sovSharedConsumer(uint64(l))
+	l = len(m.SoftOptOutThreshold)
+	if l > 0 {
+		n += 1 + l + sovSharedConsumer(uint64(l))
+	}
+	if len(m.RewardDenoms) > 0 {
+		for _, s := range m.RewardDenoms {
+			l = len(s)
+			n += 1 + l + sovSharedConsumer(uint64(l))
+		}
+	}
+	if len(m.ProviderRewardDenoms) > 0 {
+		for _, s := range m.ProviderRewardDenoms {
+			l = len(s)
+			n += 1 + l + sovSharedConsumer(uint64(l))
+		}
+	}
+	return n
+}
+
+func (m *GenesisState) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = m.Params.Size()
+	n += 1 + l + sovSharedConsumer(uint64(l))
+	l = len(m.ProviderClientId)
+	if l > 0 {
+		n += 1 + l + sovSharedConsumer(uint64(l))
+	}
+	l = len(m.ProviderChannelId)
+	if l > 0 {
+		n += 1 + l + sovSharedConsumer(uint64(l))
+	}
+	if m.NewChain {
+		n += 2
+	}
+	if m.ProviderClientState != nil {
+		l = m.ProviderClientState.Size()
+		n += 1 + l + sovSharedConsumer(uint64(l))
+	}
+	if m.ProviderConsensusState != nil {
+		l = m.ProviderConsensusState.Size()
+		n += 1 + l + sovSharedConsumer(uint64(l))
+	}
+	if len(m.MaturingPackets) > 0 {
+		for _, e := range m.MaturingPackets {
+			l = e.Size()
+			n += 1 + l + sovSharedConsumer(uint64(l))
+		}
+	}
+	if len(m.InitialValSet) > 0 {
+		for _, e := range m.InitialValSet {
+			l = e.Size()
+			n += 1 + l + sovSharedConsumer(uint64(l))
+		}
+	}
+	if len(m.HeightToValsetUpdateId) > 0 {
+		for _, e := range m.HeightToValsetUpdateId {
+			l = e.Size()
+			n += 1 + l + sovSharedConsumer(uint64(l))
+		}
+	}
+	if len(m.OutstandingDowntimeSlashing) > 0 {
+		for _, e := range m.OutstandingDowntimeSlashing {
+			l = e.Size()
+			n += 1 + l + sovSharedConsumer(uint64(l))
+		}
+	}
+	l = m.PendingConsumerPackets.Size()
+	n += 1 + l + sovSharedConsumer(uint64(l))
+	l = m.LastTransmissionBlockHeight.Size()
+	n += 1 + l + sovSharedConsumer(uint64(l))
+	if m.PreCCV {
+		n += 2
+	}
+	return n
+}
+
+func (m *HeightToValsetUpdateID) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Height != 0 {
+		n += 1 + sovSharedConsumer(uint64(m.Height))
+	}
+	if m.ValsetUpdateId != 0 {
+		n += 1 + sovSharedConsumer(uint64(m.ValsetUpdateId))
+	}
+	return n
+}
+
+func (m *OutstandingDowntime) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.ValidatorConsensusAddress)
+	if l > 0 {
+		n += 1 + l + sovSharedConsumer(uint64(l))
+	}
+	return n
+}
+
+func sovSharedConsumer(x uint64) (n int) {
+	return (math_bits.Len64(x|1) + 6) / 7
+}
+func sozSharedConsumer(x uint64) (n int) {
+	return sovSharedConsumer(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+func (m *Params) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowSharedConsumer
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: Params: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Enabled", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.Enabled = bool(v != 0)
+		case 2:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field BlocksPerDistributionTransmission", wireType)
+			}
+			m.BlocksPerDistributionTransmission = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.BlocksPerDistributionTransmission |= int64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DistributionTransmissionChannel", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				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 ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.DistributionTransmissionChannel = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ProviderFeePoolAddrStr", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				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 ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ProviderFeePoolAddrStr = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field CcvTimeoutPeriod", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.CcvTimeoutPeriod, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 6:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field TransferTimeoutPeriod", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.TransferTimeoutPeriod, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 7:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ConsumerRedistributionFraction", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				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 ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ConsumerRedistributionFraction = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 8:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field HistoricalEntries", wireType)
+			}
+			m.HistoricalEntries = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.HistoricalEntries |= int64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 9:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field UnbondingPeriod", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.UnbondingPeriod, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 10:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field SoftOptOutThreshold", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				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 ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.SoftOptOutThreshold = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 11:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field RewardDenoms", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				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 ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.RewardDenoms = append(m.RewardDenoms, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
+		case 12:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ProviderRewardDenoms", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				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 ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ProviderRewardDenoms = append(m.ProviderRewardDenoms, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipSharedConsumer(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *GenesisState) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowSharedConsumer
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: GenesisState: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: GenesisState: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ProviderClientId", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				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 ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ProviderClientId = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ProviderChannelId", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				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 ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ProviderChannelId = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 4:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field NewChain", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.NewChain = bool(v != 0)
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ProviderClientState", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.ProviderClientState == nil {
+				m.ProviderClientState = &_07_tendermint.ClientState{}
+			}
+			if err := m.ProviderClientState.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 6:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ProviderConsensusState", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.ProviderConsensusState == nil {
+				m.ProviderConsensusState = &_07_tendermint.ConsensusState{}
+			}
+			if err := m.ProviderConsensusState.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 7:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field MaturingPackets", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.MaturingPackets = append(m.MaturingPackets, types.MaturingVSCPacket{})
+			if err := m.MaturingPackets[len(m.MaturingPackets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 8:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field InitialValSet", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.InitialValSet = append(m.InitialValSet, types1.ValidatorUpdate{})
+			if err := m.InitialValSet[len(m.InitialValSet)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 9:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field HeightToValsetUpdateId", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.HeightToValsetUpdateId = append(m.HeightToValsetUpdateId, HeightToValsetUpdateID{})
+			if err := m.HeightToValsetUpdateId[len(m.HeightToValsetUpdateId)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 10:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field OutstandingDowntimeSlashing", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.OutstandingDowntimeSlashing = append(m.OutstandingDowntimeSlashing, OutstandingDowntime{})
+			if err := m.OutstandingDowntimeSlashing[len(m.OutstandingDowntimeSlashing)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 11:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field PendingConsumerPackets", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.PendingConsumerPackets.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 12:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field LastTransmissionBlockHeight", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.LastTransmissionBlockHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 13:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field PreCCV", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.PreCCV = bool(v != 0)
+		default:
+			iNdEx = preIndex
+			skippy, err := skipSharedConsumer(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *HeightToValsetUpdateID) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowSharedConsumer
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: HeightToValsetUpdateID: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: HeightToValsetUpdateID: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
+			}
+			m.Height = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Height |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 2:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ValsetUpdateId", wireType)
+			}
+			m.ValsetUpdateId = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.ValsetUpdateId |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		default:
+			iNdEx = preIndex
+			skippy, err := skipSharedConsumer(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *OutstandingDowntime) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowSharedConsumer
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: OutstandingDowntime: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: OutstandingDowntime: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ValidatorConsensusAddress", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				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 ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ValidatorConsensusAddress = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipSharedConsumer(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func skipSharedConsumer(dAtA []byte) (n int, err error) {
+	l := len(dAtA)
+	iNdEx := 0
+	depth := 0
+	for iNdEx < l {
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return 0, ErrIntOverflowSharedConsumer
+			}
+			if iNdEx >= l {
+				return 0, io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		wireType := int(wire & 0x7)
+		switch wireType {
+		case 0:
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				iNdEx++
+				if dAtA[iNdEx-1] < 0x80 {
+					break
+				}
+			}
+		case 1:
+			iNdEx += 8
+		case 2:
+			var length int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				length |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if length < 0 {
+				return 0, ErrInvalidLengthSharedConsumer
+			}
+			iNdEx += length
+		case 3:
+			depth++
+		case 4:
+			if depth == 0 {
+				return 0, ErrUnexpectedEndOfGroupSharedConsumer
+			}
+			depth--
+		case 5:
+			iNdEx += 4
+		default:
+			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
+		}
+		if iNdEx < 0 {
+			return 0, ErrInvalidLengthSharedConsumer
+		}
+		if depth == 0 {
+			return iNdEx, nil
+		}
+	}
+	return 0, io.ErrUnexpectedEOF
+}
+
+var (
+	ErrInvalidLengthSharedConsumer        = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowSharedConsumer          = fmt.Errorf("proto: integer overflow")
+	ErrUnexpectedEndOfGroupSharedConsumer = fmt.Errorf("proto: unexpected end of group")
+)
diff --git a/x/ccv/types/ccv.pb.go b/x/ccv/types/wire.pb.go
similarity index 68%
rename from x/ccv/types/ccv.pb.go
rename to x/ccv/types/wire.pb.go
index 21d0b32f0b..c3beeb2e54 100644
--- a/x/ccv/types/ccv.pb.go
+++ b/x/ccv/types/wire.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: interchain_security/ccv/v1/ccv.proto
+// source: interchain_security/ccv/v1/wire.proto
 
 package types
 
@@ -54,7 +54,7 @@ func (x ConsumerPacketDataType) String() string {
 }
 
 func (ConsumerPacketDataType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_68bd5f3242e6f29c, []int{0}
+	return fileDescriptor_8fd0dc67df6b10ed, []int{0}
 }
 
 // This packet is sent from provider chain to consumer chain if the validator
@@ -74,7 +74,7 @@ func (m *ValidatorSetChangePacketData) Reset()         { *m = ValidatorSetChange
 func (m *ValidatorSetChangePacketData) String() string { return proto.CompactTextString(m) }
 func (*ValidatorSetChangePacketData) ProtoMessage()    {}
 func (*ValidatorSetChangePacketData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_68bd5f3242e6f29c, []int{0}
+	return fileDescriptor_8fd0dc67df6b10ed, []int{0}
 }
 func (m *ValidatorSetChangePacketData) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -124,51 +124,6 @@ func (m *ValidatorSetChangePacketData) GetSlashAcks() []string {
 	return nil
 }
 
-// List of ccv.ValidatorSetChangePacketData.
-type ValidatorSetChangePackets struct {
-	List []ValidatorSetChangePacketData `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
-}
-
-func (m *ValidatorSetChangePackets) Reset()         { *m = ValidatorSetChangePackets{} }
-func (m *ValidatorSetChangePackets) String() string { return proto.CompactTextString(m) }
-func (*ValidatorSetChangePackets) ProtoMessage()    {}
-func (*ValidatorSetChangePackets) Descriptor() ([]byte, []int) {
-	return fileDescriptor_68bd5f3242e6f29c, []int{1}
-}
-func (m *ValidatorSetChangePackets) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *ValidatorSetChangePackets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_ValidatorSetChangePackets.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *ValidatorSetChangePackets) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ValidatorSetChangePackets.Merge(m, src)
-}
-func (m *ValidatorSetChangePackets) XXX_Size() int {
-	return m.Size()
-}
-func (m *ValidatorSetChangePackets) XXX_DiscardUnknown() {
-	xxx_messageInfo_ValidatorSetChangePackets.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ValidatorSetChangePackets proto.InternalMessageInfo
-
-func (m *ValidatorSetChangePackets) GetList() []ValidatorSetChangePacketData {
-	if m != nil {
-		return m.List
-	}
-	return nil
-}
-
 // This packet is sent from the consumer chain to the provider chain
 // to notify that a VSC packet reached maturity on the consumer chain.
 type VSCMaturedPacketData struct {
@@ -180,7 +135,7 @@ func (m *VSCMaturedPacketData) Reset()         { *m = VSCMaturedPacketData{} }
 func (m *VSCMaturedPacketData) String() string { return proto.CompactTextString(m) }
 func (*VSCMaturedPacketData) ProtoMessage()    {}
 func (*VSCMaturedPacketData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_68bd5f3242e6f29c, []int{2}
+	return fileDescriptor_8fd0dc67df6b10ed, []int{1}
 }
 func (m *VSCMaturedPacketData) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -231,7 +186,7 @@ func (m *SlashPacketData) Reset()         { *m = SlashPacketData{} }
 func (m *SlashPacketData) String() string { return proto.CompactTextString(m) }
 func (*SlashPacketData) ProtoMessage()    {}
 func (*SlashPacketData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_68bd5f3242e6f29c, []int{3}
+	return fileDescriptor_8fd0dc67df6b10ed, []int{2}
 }
 func (m *SlashPacketData) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -281,52 +236,6 @@ func (m *SlashPacketData) GetInfraction() types1.Infraction {
 	return types1.Infraction_INFRACTION_UNSPECIFIED
 }
 
-// MaturedUnbondingOps defines a list of ids corresponding to ids of matured
-// unbonding operations.
-type MaturedUnbondingOps struct {
-	Ids []uint64 `protobuf:"varint,1,rep,packed,name=ids,proto3" json:"ids,omitempty"`
-}
-
-func (m *MaturedUnbondingOps) Reset()         { *m = MaturedUnbondingOps{} }
-func (m *MaturedUnbondingOps) String() string { return proto.CompactTextString(m) }
-func (*MaturedUnbondingOps) ProtoMessage()    {}
-func (*MaturedUnbondingOps) Descriptor() ([]byte, []int) {
-	return fileDescriptor_68bd5f3242e6f29c, []int{4}
-}
-func (m *MaturedUnbondingOps) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *MaturedUnbondingOps) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_MaturedUnbondingOps.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *MaturedUnbondingOps) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MaturedUnbondingOps.Merge(m, src)
-}
-func (m *MaturedUnbondingOps) XXX_Size() int {
-	return m.Size()
-}
-func (m *MaturedUnbondingOps) XXX_DiscardUnknown() {
-	xxx_messageInfo_MaturedUnbondingOps.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MaturedUnbondingOps proto.InternalMessageInfo
-
-func (m *MaturedUnbondingOps) GetIds() []uint64 {
-	if m != nil {
-		return m.Ids
-	}
-	return nil
-}
-
 // ConsumerPacketData contains a consumer packet data and a type tag
 type ConsumerPacketData struct {
 	Type ConsumerPacketDataType `protobuf:"varint,1,opt,name=type,proto3,enum=interchain_security.ccv.v1.ConsumerPacketDataType" json:"type,omitempty"`
@@ -340,7 +249,7 @@ func (m *ConsumerPacketData) Reset()         { *m = ConsumerPacketData{} }
 func (m *ConsumerPacketData) String() string { return proto.CompactTextString(m) }
 func (*ConsumerPacketData) ProtoMessage()    {}
 func (*ConsumerPacketData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_68bd5f3242e6f29c, []int{5}
+	return fileDescriptor_8fd0dc67df6b10ed, []int{3}
 }
 func (m *ConsumerPacketData) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -421,6 +330,7 @@ func (*ConsumerPacketData) XXX_OneofWrappers() []interface{} {
 	}
 }
 
+// TODO: to be removed altogether in https://github.com/cosmos/interchain-security/pull/1037
 // ConsumerPacketDataList is a list of consumer packet data packets.
 type ConsumerPacketDataList struct {
 	List []ConsumerPacketData `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
@@ -430,7 +340,7 @@ func (m *ConsumerPacketDataList) Reset()         { *m = ConsumerPacketDataList{}
 func (m *ConsumerPacketDataList) String() string { return proto.CompactTextString(m) }
 func (*ConsumerPacketDataList) ProtoMessage()    {}
 func (*ConsumerPacketDataList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_68bd5f3242e6f29c, []int{6}
+	return fileDescriptor_8fd0dc67df6b10ed, []int{4}
 }
 func (m *ConsumerPacketDataList) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -466,67 +376,120 @@ func (m *ConsumerPacketDataList) GetList() []ConsumerPacketData {
 	return nil
 }
 
+// Note this type is used during IBC handshake methods for both the consumer and provider
+type HandshakeMetadata struct {
+	ProviderFeePoolAddr string `protobuf:"bytes,1,opt,name=provider_fee_pool_addr,json=providerFeePoolAddr,proto3" json:"provider_fee_pool_addr,omitempty"`
+	Version             string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
+}
+
+func (m *HandshakeMetadata) Reset()         { *m = HandshakeMetadata{} }
+func (m *HandshakeMetadata) String() string { return proto.CompactTextString(m) }
+func (*HandshakeMetadata) ProtoMessage()    {}
+func (*HandshakeMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8fd0dc67df6b10ed, []int{5}
+}
+func (m *HandshakeMetadata) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *HandshakeMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_HandshakeMetadata.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *HandshakeMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HandshakeMetadata.Merge(m, src)
+}
+func (m *HandshakeMetadata) XXX_Size() int {
+	return m.Size()
+}
+func (m *HandshakeMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_HandshakeMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HandshakeMetadata proto.InternalMessageInfo
+
+func (m *HandshakeMetadata) GetProviderFeePoolAddr() string {
+	if m != nil {
+		return m.ProviderFeePoolAddr
+	}
+	return ""
+}
+
+func (m *HandshakeMetadata) GetVersion() string {
+	if m != nil {
+		return m.Version
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterEnum("interchain_security.ccv.v1.ConsumerPacketDataType", ConsumerPacketDataType_name, ConsumerPacketDataType_value)
 	proto.RegisterType((*ValidatorSetChangePacketData)(nil), "interchain_security.ccv.v1.ValidatorSetChangePacketData")
-	proto.RegisterType((*ValidatorSetChangePackets)(nil), "interchain_security.ccv.v1.ValidatorSetChangePackets")
 	proto.RegisterType((*VSCMaturedPacketData)(nil), "interchain_security.ccv.v1.VSCMaturedPacketData")
 	proto.RegisterType((*SlashPacketData)(nil), "interchain_security.ccv.v1.SlashPacketData")
-	proto.RegisterType((*MaturedUnbondingOps)(nil), "interchain_security.ccv.v1.MaturedUnbondingOps")
 	proto.RegisterType((*ConsumerPacketData)(nil), "interchain_security.ccv.v1.ConsumerPacketData")
 	proto.RegisterType((*ConsumerPacketDataList)(nil), "interchain_security.ccv.v1.ConsumerPacketDataList")
+	proto.RegisterType((*HandshakeMetadata)(nil), "interchain_security.ccv.v1.HandshakeMetadata")
 }
 
 func init() {
-	proto.RegisterFile("interchain_security/ccv/v1/ccv.proto", fileDescriptor_68bd5f3242e6f29c)
-}
-
-var fileDescriptor_68bd5f3242e6f29c = []byte{
-	// 697 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcf, 0x6a, 0xdb, 0x4a,
-	0x14, 0xc6, 0xa5, 0x58, 0x04, 0x32, 0x86, 0x44, 0xd1, 0xf5, 0xbd, 0x38, 0xba, 0xad, 0x22, 0x44,
-	0xa0, 0xa6, 0xa5, 0x52, 0xad, 0x74, 0x51, 0xda, 0x4d, 0x63, 0xc7, 0xc1, 0xa6, 0xf9, 0x63, 0xa4,
-	0x38, 0xa5, 0xdd, 0x88, 0xb1, 0x34, 0xb1, 0x07, 0xdb, 0x1a, 0xa3, 0x19, 0x8b, 0xfa, 0x0d, 0x4a,
-	0x56, 0x7d, 0x81, 0xac, 0x4a, 0x1f, 0xa4, 0xbb, 0x2c, 0x03, 0xdd, 0x64, 0x15, 0x4a, 0xf2, 0x06,
-	0x7d, 0x82, 0x22, 0x59, 0x76, 0x1c, 0x5b, 0x31, 0x64, 0xe5, 0xf1, 0x99, 0x73, 0x3e, 0xf1, 0xfd,
-	0xe6, 0xe3, 0x80, 0x2d, 0xec, 0x33, 0x14, 0xb8, 0x6d, 0x88, 0x7d, 0x87, 0x22, 0x77, 0x10, 0x60,
-	0x36, 0x34, 0x5c, 0x37, 0x34, 0xc2, 0x62, 0xf4, 0xa3, 0xf7, 0x03, 0xc2, 0x88, 0x24, 0xa7, 0x74,
-	0xe9, 0xd1, 0x75, 0x58, 0x94, 0xb7, 0x5c, 0x42, 0x7b, 0x84, 0x1a, 0x94, 0xc1, 0x0e, 0xf6, 0x5b,
-	0x46, 0x58, 0x6c, 0x22, 0x06, 0x8b, 0xe3, 0xff, 0x23, 0x05, 0x39, 0xd7, 0x22, 0x2d, 0x12, 0x1f,
-	0x8d, 0xe8, 0x94, 0x54, 0xff, 0x67, 0xc8, 0xf7, 0x50, 0xd0, 0xc3, 0x3e, 0x33, 0x60, 0xd3, 0xc5,
-	0x06, 0x1b, 0xf6, 0x11, 0x1d, 0x5d, 0x6a, 0x57, 0x3c, 0x78, 0x72, 0x02, 0xbb, 0xd8, 0x83, 0x8c,
-	0x04, 0x36, 0x62, 0xe5, 0x36, 0xf4, 0x5b, 0xa8, 0x0e, 0xdd, 0x0e, 0x62, 0xbb, 0x90, 0x41, 0x89,
-	0x80, 0xf5, 0x70, 0x7c, 0xef, 0x0c, 0xfa, 0x1e, 0x64, 0x88, 0xe6, 0x79, 0x35, 0x53, 0xc8, 0x9a,
-	0xaa, 0x7e, 0xa7, 0xac, 0x47, 0xca, 0xfa, 0x44, 0xa9, 0x11, 0x37, 0x96, 0xd4, 0x8b, 0xeb, 0x4d,
-	0xee, 0xcf, 0xf5, 0x66, 0x7e, 0x08, 0x7b, 0xdd, 0xb7, 0xda, 0x9c, 0x90, 0x66, 0x89, 0xe1, 0xfd,
-	0x11, 0x2a, 0x15, 0x40, 0x54, 0xa3, 0x88, 0x25, 0x4d, 0x0e, 0xf6, 0xf2, 0x4b, 0x2a, 0x5f, 0x10,
-	0xac, 0xd5, 0x51, 0x7d, 0xd4, 0x58, 0xf3, 0xa4, 0xa7, 0x00, 0xd0, 0x2e, 0xa4, 0x6d, 0x07, 0xba,
-	0x1d, 0x9a, 0xcf, 0xa8, 0x99, 0xc2, 0x8a, 0xb5, 0x12, 0x57, 0x76, 0xdc, 0x0e, 0xd5, 0x08, 0xd8,
-	0x78, 0xc8, 0x19, 0x95, 0x2c, 0x20, 0x74, 0x31, 0x65, 0x89, 0x93, 0x37, 0xfa, 0xc3, 0xec, 0xf5,
-	0x45, 0x78, 0x4a, 0x42, 0xe4, 0xd0, 0x8a, 0xb5, 0xb4, 0xf7, 0x20, 0x77, 0x62, 0x97, 0x0f, 0x20,
-	0x1b, 0x04, 0xc8, 0x9b, 0x42, 0x98, 0xe6, 0x88, 0x4f, 0x73, 0xa4, 0xfd, 0xe2, 0xc1, 0x9a, 0x1d,
-	0x19, 0x98, 0x9a, 0xb6, 0xc0, 0xca, 0x84, 0x51, 0x3c, 0x96, 0x35, 0xe5, 0x87, 0xc1, 0x97, 0xf2,
-	0x09, 0x72, 0x71, 0x06, 0xb9, 0x66, 0xdd, 0xc9, 0x3c, 0x82, 0x71, 0x09, 0x00, 0xec, 0x9f, 0x06,
-	0xd0, 0x65, 0x98, 0xf8, 0xf9, 0x8c, 0xca, 0x17, 0x56, 0x4d, 0x4d, 0x1f, 0xa5, 0x51, 0x1f, 0xa7,
-	0x2f, 0x49, 0xa3, 0x5e, 0x9b, 0x74, 0x5a, 0x53, 0x53, 0xda, 0x33, 0xf0, 0x4f, 0x02, 0xa5, 0xe1,
-	0x37, 0x89, 0xef, 0x61, 0xbf, 0x75, 0xd4, 0xa7, 0x92, 0x08, 0x32, 0xd8, 0x1b, 0x65, 0x49, 0xb0,
-	0xa2, 0xa3, 0xf6, 0x63, 0x09, 0x48, 0x65, 0xe2, 0xd3, 0x41, 0x0f, 0x05, 0x53, 0x04, 0xf6, 0x80,
-	0x10, 0x45, 0x36, 0x36, 0xbf, 0x6a, 0x9a, 0x8b, 0xde, 0x6a, 0x7e, 0xfa, 0x78, 0xd8, 0x47, 0x56,
-	0x3c, 0x2f, 0x7d, 0x04, 0x6b, 0xf4, 0x3e, 0xdc, 0xd8, 0x74, 0xd6, 0x7c, 0xb1, 0x48, 0x72, 0xe6,
-	0x3d, 0xaa, 0x9c, 0x35, 0xab, 0x22, 0x9d, 0x82, 0x5c, 0x48, 0xdd, 0xb9, 0x87, 0x8f, 0x71, 0x65,
-	0xcd, 0x57, 0x0b, 0xc3, 0x95, 0x12, 0x98, 0x2a, 0x67, 0xa5, 0xea, 0x95, 0x96, 0x81, 0xe0, 0x41,
-	0x06, 0xb5, 0x26, 0xf8, 0x6f, 0xde, 0xe8, 0x3e, 0xa6, 0x4c, 0xaa, 0xde, 0x8b, 0xb5, 0xfe, 0x38,
-	0x54, 0xd3, 0x61, 0x7e, 0xfe, 0x93, 0x4f, 0xfb, 0x48, 0x44, 0x53, 0x7a, 0x07, 0xd4, 0xf2, 0xd1,
-	0xa1, 0xdd, 0x38, 0xa8, 0x58, 0x4e, 0x7d, 0xa7, 0xfc, 0xa1, 0x72, 0xec, 0x1c, 0x7f, 0xaa, 0x57,
-	0x9c, 0xc6, 0xa1, 0x5d, 0xaf, 0x94, 0x6b, 0x7b, 0xb5, 0xca, 0xae, 0xc8, 0xc9, 0xff, 0x9e, 0x9d,
-	0xab, 0xeb, 0x0d, 0x9f, 0xf6, 0x91, 0x8b, 0x4f, 0xf1, 0xd8, 0x87, 0x64, 0x00, 0x39, 0x75, 0xd8,
-	0xde, 0xdf, 0xb1, 0xab, 0x22, 0x2f, 0xaf, 0x9d, 0x9d, 0xab, 0xd9, 0x29, 0xe6, 0xd2, 0x36, 0xd8,
-	0x48, 0x1d, 0x88, 0xc8, 0x89, 0x4b, 0x72, 0xee, 0xec, 0x5c, 0x15, 0x4f, 0x66, 0x68, 0xc9, 0xc2,
-	0xd7, 0xef, 0x0a, 0x57, 0x3a, 0xbc, 0xb8, 0x51, 0xf8, 0xcb, 0x1b, 0x85, 0xff, 0x7d, 0xa3, 0xf0,
-	0xdf, 0x6e, 0x15, 0xee, 0xf2, 0x56, 0xe1, 0xae, 0x6e, 0x15, 0xee, 0xf3, 0xeb, 0x16, 0x66, 0xed,
-	0x41, 0x53, 0x77, 0x49, 0xcf, 0x48, 0x56, 0xeb, 0x1d, 0xaa, 0x97, 0x93, 0x1d, 0x1d, 0x6e, 0x1b,
-	0x5f, 0xe2, 0x45, 0x1d, 0xaf, 0xcc, 0xe6, 0x72, 0xbc, 0x33, 0xb7, 0xff, 0x06, 0x00, 0x00, 0xff,
-	0xff, 0xc0, 0xe2, 0x3f, 0x59, 0xd0, 0x05, 0x00, 0x00,
+	proto.RegisterFile("interchain_security/ccv/v1/wire.proto", fileDescriptor_8fd0dc67df6b10ed)
+}
+
+var fileDescriptor_8fd0dc67df6b10ed = []byte{
+	// 717 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6e, 0xda, 0x4c,
+	0x14, 0xb5, 0x01, 0xe5, 0x13, 0x83, 0x94, 0x10, 0x7f, 0x34, 0xa2, 0x6e, 0x4b, 0x2c, 0xab, 0x95,
+	0x50, 0xab, 0xda, 0x05, 0xba, 0x6a, 0x37, 0x05, 0x42, 0x04, 0x6a, 0x92, 0x22, 0x3b, 0xa4, 0x6a,
+	0x37, 0xd6, 0x30, 0x1e, 0x60, 0x04, 0x78, 0x2c, 0xcf, 0xe0, 0x96, 0x37, 0xa8, 0xb2, 0xea, 0x0b,
+	0x64, 0x55, 0xf5, 0x41, 0xba, 0xcb, 0x32, 0x52, 0x37, 0x59, 0x45, 0x55, 0xf2, 0x06, 0x7d, 0x82,
+	0xca, 0xe6, 0x27, 0x04, 0x9c, 0x48, 0xd9, 0x79, 0xee, 0xdc, 0x73, 0x86, 0x73, 0xee, 0xe1, 0x82,
+	0x67, 0xc4, 0xe1, 0xd8, 0x43, 0x3d, 0x48, 0x1c, 0x8b, 0x61, 0x34, 0xf2, 0x08, 0x1f, 0xeb, 0x08,
+	0xf9, 0xba, 0x5f, 0xd0, 0xbf, 0x10, 0x0f, 0x6b, 0xae, 0x47, 0x39, 0x95, 0xe4, 0x88, 0x36, 0x0d,
+	0x21, 0x5f, 0xf3, 0x0b, 0xf2, 0x53, 0x44, 0xd9, 0x90, 0x32, 0x9d, 0x71, 0xd8, 0x27, 0x4e, 0x57,
+	0xf7, 0x0b, 0x6d, 0xcc, 0x61, 0x61, 0x76, 0x9e, 0x30, 0xc8, 0x99, 0x2e, 0xed, 0xd2, 0xf0, 0x53,
+	0x0f, 0xbe, 0xa6, 0xd5, 0x47, 0x1c, 0x3b, 0x36, 0xf6, 0x86, 0xc4, 0xe1, 0x3a, 0x6c, 0x23, 0xa2,
+	0xf3, 0xb1, 0x8b, 0xd9, 0xe4, 0x52, 0x3d, 0x17, 0xc1, 0xe3, 0x23, 0x38, 0x20, 0x36, 0xe4, 0xd4,
+	0x33, 0x31, 0xaf, 0xf6, 0xa0, 0xd3, 0xc5, 0x4d, 0x88, 0xfa, 0x98, 0xef, 0x40, 0x0e, 0x25, 0x0a,
+	0x36, 0xfd, 0xd9, 0xbd, 0x35, 0x72, 0x6d, 0xc8, 0x31, 0xcb, 0x8a, 0x4a, 0x3c, 0x9f, 0x2a, 0x2a,
+	0xda, 0x35, 0xb3, 0x16, 0x30, 0x6b, 0x73, 0xa6, 0x56, 0xd8, 0x58, 0x51, 0x4e, 0x2f, 0xb6, 0x85,
+	0xbf, 0x17, 0xdb, 0xd9, 0x31, 0x1c, 0x0e, 0xde, 0xa8, 0x2b, 0x44, 0xaa, 0x91, 0xf6, 0x6f, 0x42,
+	0x98, 0x94, 0x07, 0x41, 0x8d, 0x61, 0x3e, 0x6d, 0xb2, 0x88, 0x9d, 0x8d, 0x29, 0x62, 0x3e, 0x61,
+	0xac, 0x4f, 0xea, 0x93, 0xc6, 0x86, 0x2d, 0x3d, 0x01, 0x80, 0x0d, 0x20, 0xeb, 0x59, 0x10, 0xf5,
+	0x59, 0x36, 0xae, 0xc4, 0xf3, 0x49, 0x23, 0x19, 0x56, 0xca, 0xa8, 0xcf, 0xd4, 0x77, 0x20, 0x73,
+	0x64, 0x56, 0xf7, 0x21, 0x1f, 0x79, 0xd8, 0x5e, 0x50, 0x14, 0xf5, 0x80, 0x18, 0xf5, 0x80, 0xfa,
+	0x5b, 0x04, 0x1b, 0x66, 0xc0, 0xb7, 0x80, 0x36, 0x40, 0x72, 0xfe, 0x93, 0x43, 0x58, 0xaa, 0x28,
+	0xdf, 0xee, 0x43, 0x25, 0x3b, 0x75, 0x20, 0xbd, 0xe4, 0x80, 0x6a, 0x5c, 0xd3, 0xdc, 0x43, 0x72,
+	0x05, 0x00, 0xe2, 0x74, 0x3c, 0x88, 0x38, 0xa1, 0x4e, 0x36, 0xae, 0x88, 0xf9, 0xf5, 0xa2, 0xaa,
+	0x4d, 0xc2, 0xa1, 0xcd, 0xc2, 0x30, 0x0d, 0x87, 0xd6, 0x98, 0x77, 0x1a, 0x0b, 0x28, 0xf5, 0x67,
+	0x0c, 0x48, 0x55, 0xea, 0xb0, 0xd1, 0x10, 0x7b, 0x0b, 0xc2, 0x76, 0x41, 0x22, 0x08, 0x46, 0xa8,
+	0x69, 0xbd, 0x58, 0xd4, 0x6e, 0x4f, 0xa3, 0xb6, 0x8a, 0x3e, 0x1c, 0xbb, 0xd8, 0x08, 0xf1, 0xd2,
+	0x47, 0xb0, 0xc1, 0x6e, 0x7a, 0x16, 0x6a, 0x49, 0x15, 0x5f, 0xdc, 0x45, 0xb9, 0x64, 0x73, 0x5d,
+	0x30, 0x96, 0x59, 0xa4, 0x0e, 0xc8, 0xf8, 0x0c, 0xad, 0xcc, 0x33, 0x74, 0x21, 0x55, 0x7c, 0x75,
+	0x17, 0x7b, 0x54, 0x0e, 0xea, 0x82, 0x11, 0xc9, 0x57, 0x59, 0x03, 0x09, 0x1b, 0x72, 0xa8, 0xb6,
+	0xc1, 0xd6, 0xaa, 0xd0, 0x3d, 0xc2, 0xb8, 0x54, 0x07, 0x89, 0x01, 0x61, 0x7c, 0xfa, 0x37, 0xd0,
+	0xee, 0x67, 0x55, 0x25, 0x11, 0x44, 0xc2, 0x08, 0x19, 0xd4, 0x36, 0xd8, 0xac, 0x43, 0xc7, 0x66,
+	0x3d, 0xd8, 0xc7, 0xfb, 0x98, 0xc3, 0xe0, 0x61, 0xa9, 0x04, 0xb6, 0x5c, 0x8f, 0xfa, 0xc4, 0xc6,
+	0x9e, 0xd5, 0xc1, 0xd8, 0x72, 0x29, 0x1d, 0x58, 0xd0, 0xb6, 0x27, 0x79, 0x4b, 0x1a, 0xff, 0xcf,
+	0x6e, 0x77, 0x31, 0x6e, 0x52, 0x3a, 0x28, 0xdb, 0xb6, 0x27, 0x65, 0xc1, 0x7f, 0x3e, 0xf6, 0x58,
+	0x10, 0x8b, 0x58, 0xd8, 0x35, 0x3b, 0x3e, 0xff, 0x25, 0x46, 0x09, 0x09, 0x26, 0x26, 0xbd, 0x05,
+	0x4a, 0xf5, 0xc3, 0x81, 0xd9, 0xda, 0xaf, 0x19, 0x56, 0xb3, 0x5c, 0x7d, 0x5f, 0x3b, 0xb4, 0x0e,
+	0x3f, 0x35, 0x6b, 0x56, 0xeb, 0xc0, 0x6c, 0xd6, 0xaa, 0x8d, 0xdd, 0x46, 0x6d, 0x27, 0x2d, 0xc8,
+	0x0f, 0x8e, 0x4f, 0x94, 0xcd, 0x96, 0xc3, 0x5c, 0x8c, 0x48, 0x87, 0xcc, 0xbc, 0x92, 0x74, 0x20,
+	0x47, 0x82, 0xcd, 0xbd, 0xb2, 0x59, 0x4f, 0x8b, 0xf2, 0xc6, 0xf1, 0x89, 0x92, 0x5a, 0x98, 0xab,
+	0x54, 0x02, 0x0f, 0x23, 0x01, 0xc1, 0x74, 0xd2, 0x31, 0x39, 0x73, 0x7c, 0xa2, 0xa4, 0x8f, 0x96,
+	0x26, 0x22, 0x27, 0xbe, 0xfd, 0xc8, 0x09, 0x95, 0x83, 0xd3, 0xcb, 0x9c, 0x78, 0x76, 0x99, 0x13,
+	0xff, 0x5c, 0xe6, 0xc4, 0xef, 0x57, 0x39, 0xe1, 0xec, 0x2a, 0x27, 0x9c, 0x5f, 0xe5, 0x84, 0xcf,
+	0xaf, 0xbb, 0x84, 0xf7, 0x46, 0x6d, 0x0d, 0xd1, 0xa1, 0x3e, 0x5d, 0x92, 0xd7, 0xe3, 0x78, 0x39,
+	0x5f, 0xb7, 0x7e, 0x49, 0xff, 0x1a, 0xee, 0xdc, 0x70, 0xf9, 0xb5, 0xd7, 0xc2, 0xed, 0x57, 0xfa,
+	0x17, 0x00, 0x00, 0xff, 0xff, 0x75, 0x9e, 0x8c, 0x87, 0x9b, 0x05, 0x00, 0x00,
 }
 
 func (m *ValidatorSetChangePacketData) Marshal() (dAtA []byte, err error) {
@@ -553,13 +516,13 @@ func (m *ValidatorSetChangePacketData) MarshalToSizedBuffer(dAtA []byte) (int, e
 		for iNdEx := len(m.SlashAcks) - 1; iNdEx >= 0; iNdEx-- {
 			i -= len(m.SlashAcks[iNdEx])
 			copy(dAtA[i:], m.SlashAcks[iNdEx])
-			i = encodeVarintCcv(dAtA, i, uint64(len(m.SlashAcks[iNdEx])))
+			i = encodeVarintWire(dAtA, i, uint64(len(m.SlashAcks[iNdEx])))
 			i--
 			dAtA[i] = 0x1a
 		}
 	}
 	if m.ValsetUpdateId != 0 {
-		i = encodeVarintCcv(dAtA, i, uint64(m.ValsetUpdateId))
+		i = encodeVarintWire(dAtA, i, uint64(m.ValsetUpdateId))
 		i--
 		dAtA[i] = 0x10
 	}
@@ -571,44 +534,7 @@ func (m *ValidatorSetChangePacketData) MarshalToSizedBuffer(dAtA []byte) (int, e
 					return 0, err
 				}
 				i -= size
-				i = encodeVarintCcv(dAtA, i, uint64(size))
-			}
-			i--
-			dAtA[i] = 0xa
-		}
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *ValidatorSetChangePackets) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *ValidatorSetChangePackets) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *ValidatorSetChangePackets) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if len(m.List) > 0 {
-		for iNdEx := len(m.List) - 1; iNdEx >= 0; iNdEx-- {
-			{
-				size, err := m.List[iNdEx].MarshalToSizedBuffer(dAtA[:i])
-				if err != nil {
-					return 0, err
-				}
-				i -= size
-				i = encodeVarintCcv(dAtA, i, uint64(size))
+				i = encodeVarintWire(dAtA, i, uint64(size))
 			}
 			i--
 			dAtA[i] = 0xa
@@ -638,7 +564,7 @@ func (m *VSCMaturedPacketData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	var l int
 	_ = l
 	if m.ValsetUpdateId != 0 {
-		i = encodeVarintCcv(dAtA, i, uint64(m.ValsetUpdateId))
+		i = encodeVarintWire(dAtA, i, uint64(m.ValsetUpdateId))
 		i--
 		dAtA[i] = 0x8
 	}
@@ -666,12 +592,12 @@ func (m *SlashPacketData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	var l int
 	_ = l
 	if m.Infraction != 0 {
-		i = encodeVarintCcv(dAtA, i, uint64(m.Infraction))
+		i = encodeVarintWire(dAtA, i, uint64(m.Infraction))
 		i--
 		dAtA[i] = 0x18
 	}
 	if m.ValsetUpdateId != 0 {
-		i = encodeVarintCcv(dAtA, i, uint64(m.ValsetUpdateId))
+		i = encodeVarintWire(dAtA, i, uint64(m.ValsetUpdateId))
 		i--
 		dAtA[i] = 0x10
 	}
@@ -681,54 +607,13 @@ func (m *SlashPacketData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			return 0, err
 		}
 		i -= size
-		i = encodeVarintCcv(dAtA, i, uint64(size))
+		i = encodeVarintWire(dAtA, i, uint64(size))
 	}
 	i--
 	dAtA[i] = 0xa
 	return len(dAtA) - i, nil
 }
 
-func (m *MaturedUnbondingOps) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *MaturedUnbondingOps) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *MaturedUnbondingOps) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if len(m.Ids) > 0 {
-		dAtA3 := make([]byte, len(m.Ids)*10)
-		var j2 int
-		for _, num := range m.Ids {
-			for num >= 1<<7 {
-				dAtA3[j2] = uint8(uint64(num)&0x7f | 0x80)
-				num >>= 7
-				j2++
-			}
-			dAtA3[j2] = uint8(num)
-			j2++
-		}
-		i -= j2
-		copy(dAtA[i:], dAtA3[:j2])
-		i = encodeVarintCcv(dAtA, i, uint64(j2))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
 func (m *ConsumerPacketData) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -759,7 +644,7 @@ func (m *ConsumerPacketData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		}
 	}
 	if m.Type != 0 {
-		i = encodeVarintCcv(dAtA, i, uint64(m.Type))
+		i = encodeVarintWire(dAtA, i, uint64(m.Type))
 		i--
 		dAtA[i] = 0x8
 	}
@@ -780,7 +665,7 @@ func (m *ConsumerPacketData_SlashPacketData) MarshalToSizedBuffer(dAtA []byte) (
 				return 0, err
 			}
 			i -= size
-			i = encodeVarintCcv(dAtA, i, uint64(size))
+			i = encodeVarintWire(dAtA, i, uint64(size))
 		}
 		i--
 		dAtA[i] = 0x12
@@ -801,7 +686,7 @@ func (m *ConsumerPacketData_VscMaturedPacketData) MarshalToSizedBuffer(dAtA []by
 				return 0, err
 			}
 			i -= size
-			i = encodeVarintCcv(dAtA, i, uint64(size))
+			i = encodeVarintWire(dAtA, i, uint64(size))
 		}
 		i--
 		dAtA[i] = 0x1a
@@ -836,7 +721,7 @@ func (m *ConsumerPacketDataList) MarshalToSizedBuffer(dAtA []byte) (int, error)
 					return 0, err
 				}
 				i -= size
-				i = encodeVarintCcv(dAtA, i, uint64(size))
+				i = encodeVarintWire(dAtA, i, uint64(size))
 			}
 			i--
 			dAtA[i] = 0xa
@@ -845,8 +730,45 @@ func (m *ConsumerPacketDataList) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	return len(dAtA) - i, nil
 }
 
-func encodeVarintCcv(dAtA []byte, offset int, v uint64) int {
-	offset -= sovCcv(v)
+func (m *HandshakeMetadata) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *HandshakeMetadata) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *HandshakeMetadata) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.Version) > 0 {
+		i -= len(m.Version)
+		copy(dAtA[i:], m.Version)
+		i = encodeVarintWire(dAtA, i, uint64(len(m.Version)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.ProviderFeePoolAddr) > 0 {
+		i -= len(m.ProviderFeePoolAddr)
+		copy(dAtA[i:], m.ProviderFeePoolAddr)
+		i = encodeVarintWire(dAtA, i, uint64(len(m.ProviderFeePoolAddr)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func encodeVarintWire(dAtA []byte, offset int, v uint64) int {
+	offset -= sovWire(v)
 	base := offset
 	for v >= 1<<7 {
 		dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -865,31 +787,16 @@ func (m *ValidatorSetChangePacketData) Size() (n int) {
 	if len(m.ValidatorUpdates) > 0 {
 		for _, e := range m.ValidatorUpdates {
 			l = e.Size()
-			n += 1 + l + sovCcv(uint64(l))
+			n += 1 + l + sovWire(uint64(l))
 		}
 	}
 	if m.ValsetUpdateId != 0 {
-		n += 1 + sovCcv(uint64(m.ValsetUpdateId))
+		n += 1 + sovWire(uint64(m.ValsetUpdateId))
 	}
 	if len(m.SlashAcks) > 0 {
 		for _, s := range m.SlashAcks {
 			l = len(s)
-			n += 1 + l + sovCcv(uint64(l))
-		}
-	}
-	return n
-}
-
-func (m *ValidatorSetChangePackets) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if len(m.List) > 0 {
-		for _, e := range m.List {
-			l = e.Size()
-			n += 1 + l + sovCcv(uint64(l))
+			n += 1 + l + sovWire(uint64(l))
 		}
 	}
 	return n
@@ -902,7 +809,7 @@ func (m *VSCMaturedPacketData) Size() (n int) {
 	var l int
 	_ = l
 	if m.ValsetUpdateId != 0 {
-		n += 1 + sovCcv(uint64(m.ValsetUpdateId))
+		n += 1 + sovWire(uint64(m.ValsetUpdateId))
 	}
 	return n
 }
@@ -914,28 +821,12 @@ func (m *SlashPacketData) Size() (n int) {
 	var l int
 	_ = l
 	l = m.Validator.Size()
-	n += 1 + l + sovCcv(uint64(l))
+	n += 1 + l + sovWire(uint64(l))
 	if m.ValsetUpdateId != 0 {
-		n += 1 + sovCcv(uint64(m.ValsetUpdateId))
+		n += 1 + sovWire(uint64(m.ValsetUpdateId))
 	}
 	if m.Infraction != 0 {
-		n += 1 + sovCcv(uint64(m.Infraction))
-	}
-	return n
-}
-
-func (m *MaturedUnbondingOps) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if len(m.Ids) > 0 {
-		l = 0
-		for _, e := range m.Ids {
-			l += sovCcv(uint64(e))
-		}
-		n += 1 + sovCcv(uint64(l)) + l
+		n += 1 + sovWire(uint64(m.Infraction))
 	}
 	return n
 }
@@ -947,7 +838,7 @@ func (m *ConsumerPacketData) Size() (n int) {
 	var l int
 	_ = l
 	if m.Type != 0 {
-		n += 1 + sovCcv(uint64(m.Type))
+		n += 1 + sovWire(uint64(m.Type))
 	}
 	if m.Data != nil {
 		n += m.Data.Size()
@@ -963,7 +854,7 @@ func (m *ConsumerPacketData_SlashPacketData) Size() (n int) {
 	_ = l
 	if m.SlashPacketData != nil {
 		l = m.SlashPacketData.Size()
-		n += 1 + l + sovCcv(uint64(l))
+		n += 1 + l + sovWire(uint64(l))
 	}
 	return n
 }
@@ -975,7 +866,7 @@ func (m *ConsumerPacketData_VscMaturedPacketData) Size() (n int) {
 	_ = l
 	if m.VscMaturedPacketData != nil {
 		l = m.VscMaturedPacketData.Size()
-		n += 1 + l + sovCcv(uint64(l))
+		n += 1 + l + sovWire(uint64(l))
 	}
 	return n
 }
@@ -988,17 +879,34 @@ func (m *ConsumerPacketDataList) Size() (n int) {
 	if len(m.List) > 0 {
 		for _, e := range m.List {
 			l = e.Size()
-			n += 1 + l + sovCcv(uint64(l))
+			n += 1 + l + sovWire(uint64(l))
 		}
 	}
 	return n
 }
 
-func sovCcv(x uint64) (n int) {
+func (m *HandshakeMetadata) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.ProviderFeePoolAddr)
+	if l > 0 {
+		n += 1 + l + sovWire(uint64(l))
+	}
+	l = len(m.Version)
+	if l > 0 {
+		n += 1 + l + sovWire(uint64(l))
+	}
+	return n
+}
+
+func sovWire(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
-func sozCcv(x uint64) (n int) {
-	return sovCcv(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+func sozWire(x uint64) (n int) {
+	return sovWire(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
 func (m *ValidatorSetChangePacketData) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
@@ -1008,7 +916,7 @@ func (m *ValidatorSetChangePacketData) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCcv
+				return ErrIntOverflowWire
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -1036,7 +944,7 @@ func (m *ValidatorSetChangePacketData) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCcv
+					return ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1049,11 +957,11 @@ func (m *ValidatorSetChangePacketData) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -1070,7 +978,7 @@ func (m *ValidatorSetChangePacketData) Unmarshal(dAtA []byte) error {
 			m.ValsetUpdateId = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCcv
+					return ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1089,7 +997,7 @@ func (m *ValidatorSetChangePacketData) Unmarshal(dAtA []byte) error {
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCcv
+					return ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1103,11 +1011,11 @@ func (m *ValidatorSetChangePacketData) Unmarshal(dAtA []byte) error {
 			}
 			intStringLen := int(stringLen)
 			if intStringLen < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			postIndex := iNdEx + intStringLen
 			if postIndex < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -1116,96 +1024,12 @@ func (m *ValidatorSetChangePacketData) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCcv(dAtA[iNdEx:])
+			skippy, err := skipWire(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthCcv
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *ValidatorSetChangePackets) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowCcv
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: ValidatorSetChangePackets: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: ValidatorSetChangePackets: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field List", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowCcv
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthCcv
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthCcv
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.List = append(m.List, ValidatorSetChangePacketData{})
-			if err := m.List[len(m.List)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipCcv(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -1227,7 +1051,7 @@ func (m *VSCMaturedPacketData) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCcv
+				return ErrIntOverflowWire
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -1255,7 +1079,7 @@ func (m *VSCMaturedPacketData) Unmarshal(dAtA []byte) error {
 			m.ValsetUpdateId = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCcv
+					return ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1269,12 +1093,12 @@ func (m *VSCMaturedPacketData) Unmarshal(dAtA []byte) error {
 			}
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCcv(dAtA[iNdEx:])
+			skippy, err := skipWire(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -1296,7 +1120,7 @@ func (m *SlashPacketData) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCcv
+				return ErrIntOverflowWire
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -1324,7 +1148,7 @@ func (m *SlashPacketData) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCcv
+					return ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1337,11 +1161,11 @@ func (m *SlashPacketData) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -1357,7 +1181,7 @@ func (m *SlashPacketData) Unmarshal(dAtA []byte) error {
 			m.ValsetUpdateId = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCcv
+					return ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1376,7 +1200,7 @@ func (m *SlashPacketData) Unmarshal(dAtA []byte) error {
 			m.Infraction = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCcv
+					return ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1390,138 +1214,12 @@ func (m *SlashPacketData) Unmarshal(dAtA []byte) error {
 			}
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCcv(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthCcv
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *MaturedUnbondingOps) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowCcv
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: MaturedUnbondingOps: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MaturedUnbondingOps: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType == 0 {
-				var v uint64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowCcv
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					v |= uint64(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				m.Ids = append(m.Ids, v)
-			} else if wireType == 2 {
-				var packedLen int
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowCcv
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					packedLen |= int(b&0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				if packedLen < 0 {
-					return ErrInvalidLengthCcv
-				}
-				postIndex := iNdEx + packedLen
-				if postIndex < 0 {
-					return ErrInvalidLengthCcv
-				}
-				if postIndex > l {
-					return io.ErrUnexpectedEOF
-				}
-				var elementCount int
-				var count int
-				for _, integer := range dAtA[iNdEx:postIndex] {
-					if integer < 128 {
-						count++
-					}
-				}
-				elementCount = count
-				if elementCount != 0 && len(m.Ids) == 0 {
-					m.Ids = make([]uint64, 0, elementCount)
-				}
-				for iNdEx < postIndex {
-					var v uint64
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowCcv
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						v |= uint64(b&0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					m.Ids = append(m.Ids, v)
-				}
-			} else {
-				return fmt.Errorf("proto: wrong wireType = %d for field Ids", wireType)
-			}
-		default:
-			iNdEx = preIndex
-			skippy, err := skipCcv(dAtA[iNdEx:])
+			skippy, err := skipWire(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -1543,7 +1241,7 @@ func (m *ConsumerPacketData) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCcv
+				return ErrIntOverflowWire
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -1571,7 +1269,7 @@ func (m *ConsumerPacketData) Unmarshal(dAtA []byte) error {
 			m.Type = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCcv
+					return ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1590,7 +1288,7 @@ func (m *ConsumerPacketData) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCcv
+					return ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1603,11 +1301,11 @@ func (m *ConsumerPacketData) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -1625,7 +1323,7 @@ func (m *ConsumerPacketData) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCcv
+					return ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1638,11 +1336,11 @@ func (m *ConsumerPacketData) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -1655,12 +1353,12 @@ func (m *ConsumerPacketData) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCcv(dAtA[iNdEx:])
+			skippy, err := skipWire(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -1682,7 +1380,7 @@ func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return ErrIntOverflowCcv
+				return ErrIntOverflowWire
 			}
 			if iNdEx >= l {
 				return io.ErrUnexpectedEOF
@@ -1710,7 +1408,7 @@ func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error {
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return ErrIntOverflowCcv
+					return ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return io.ErrUnexpectedEOF
@@ -1723,11 +1421,11 @@ func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error {
 				}
 			}
 			if msglen < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			postIndex := iNdEx + msglen
 			if postIndex < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
@@ -1739,12 +1437,126 @@ func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
-			skippy, err := skipCcv(dAtA[iNdEx:])
+			skippy, err := skipWire(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthWire
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *HandshakeMetadata) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowWire
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: HandshakeMetadata: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: HandshakeMetadata: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ProviderFeePoolAddr", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowWire
+				}
+				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 ErrInvalidLengthWire
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthWire
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ProviderFeePoolAddr = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowWire
+				}
+				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 ErrInvalidLengthWire
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthWire
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Version = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipWire(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
 			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthCcv
+				return ErrInvalidLengthWire
 			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
@@ -1758,7 +1570,7 @@ func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func skipCcv(dAtA []byte) (n int, err error) {
+func skipWire(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
 	depth := 0
@@ -1766,7 +1578,7 @@ func skipCcv(dAtA []byte) (n int, err error) {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
 			if shift >= 64 {
-				return 0, ErrIntOverflowCcv
+				return 0, ErrIntOverflowWire
 			}
 			if iNdEx >= l {
 				return 0, io.ErrUnexpectedEOF
@@ -1783,7 +1595,7 @@ func skipCcv(dAtA []byte) (n int, err error) {
 		case 0:
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return 0, ErrIntOverflowCcv
+					return 0, ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return 0, io.ErrUnexpectedEOF
@@ -1799,7 +1611,7 @@ func skipCcv(dAtA []byte) (n int, err error) {
 			var length int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
-					return 0, ErrIntOverflowCcv
+					return 0, ErrIntOverflowWire
 				}
 				if iNdEx >= l {
 					return 0, io.ErrUnexpectedEOF
@@ -1812,14 +1624,14 @@ func skipCcv(dAtA []byte) (n int, err error) {
 				}
 			}
 			if length < 0 {
-				return 0, ErrInvalidLengthCcv
+				return 0, ErrInvalidLengthWire
 			}
 			iNdEx += length
 		case 3:
 			depth++
 		case 4:
 			if depth == 0 {
-				return 0, ErrUnexpectedEndOfGroupCcv
+				return 0, ErrUnexpectedEndOfGroupWire
 			}
 			depth--
 		case 5:
@@ -1828,7 +1640,7 @@ func skipCcv(dAtA []byte) (n int, err error) {
 			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
 		}
 		if iNdEx < 0 {
-			return 0, ErrInvalidLengthCcv
+			return 0, ErrInvalidLengthWire
 		}
 		if depth == 0 {
 			return iNdEx, nil
@@ -1838,7 +1650,7 @@ func skipCcv(dAtA []byte) (n int, err error) {
 }
 
 var (
-	ErrInvalidLengthCcv        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowCcv          = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroupCcv = fmt.Errorf("proto: unexpected end of group")
+	ErrInvalidLengthWire        = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowWire          = fmt.Errorf("proto: integer overflow")
+	ErrUnexpectedEndOfGroupWire = fmt.Errorf("proto: unexpected end of group")
 )

From 0974bdc162c3e4302a5b372333465f1473808935 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Thu, 22 Jun 2023 13:23:55 -0700
Subject: [PATCH 07/21] no circ dep

---
 .../ccv/consumer/v1/consumer.proto            |  16 -
 .../ccv/v1/shared_consumer.proto              |  23 +-
 x/ccv/consumer/types/consumer.pb.go           | 425 +-------------
 x/ccv/types/shared_consumer.pb.go             | 534 +++++++++++++++---
 4 files changed, 495 insertions(+), 503 deletions(-)

diff --git a/proto/interchain_security/ccv/consumer/v1/consumer.proto b/proto/interchain_security/ccv/consumer/v1/consumer.proto
index 5feb1bb8fb..edb99a2882 100644
--- a/proto/interchain_security/ccv/consumer/v1/consumer.proto
+++ b/proto/interchain_security/ccv/consumer/v1/consumer.proto
@@ -9,13 +9,6 @@ import "google/protobuf/any.proto";
 import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
 import "google/protobuf/duration.proto";
-import "google/protobuf/timestamp.proto";
-
-// LastTransmissionBlockHeight is the last time validator holding
-// pools were transmitted to the provider chain.
-//
-// This type is only used internally to the consumer CCV module. 
-message LastTransmissionBlockHeight { int64 height = 1; }
 
 // CrossChainValidator defines the type used to store validator information internal 
 // to the consumer CCV module.  Note one cross chain validator entry is persisted for
@@ -30,12 +23,3 @@ message CrossChainValidator {
     (gogoproto.moretags) = "yaml:\"consensus_pubkey\""
   ];
 }
-
-// MaturingVSCPacket represents a vsc packet that is maturing internal to the
-// consumer CCV module, where the consumer has not yet relayed a VSCMatured packet
-// back to the provider. 
-message MaturingVSCPacket {
-  uint64 vscId = 1;
-  google.protobuf.Timestamp maturity_time = 2
-      [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ];
-}
diff --git a/proto/interchain_security/ccv/v1/shared_consumer.proto b/proto/interchain_security/ccv/v1/shared_consumer.proto
index 95d57b9f57..3f161ad978 100644
--- a/proto/interchain_security/ccv/v1/shared_consumer.proto
+++ b/proto/interchain_security/ccv/v1/shared_consumer.proto
@@ -4,13 +4,13 @@ package interchain_security.ccv.v1;
 
 option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/types";
 
-import "interchain_security/ccv/consumer/v1/consumer.proto";
 import "tendermint/abci/types.proto";
 import "ibc/lightclients/tendermint/v1/tendermint.proto";
 import "ibc/core/channel/v1/channel.proto";
 import "google/protobuf/duration.proto";
 import "gogoproto/gogo.proto";
 import "interchain_security/ccv/v1/wire.proto";
+import "google/protobuf/timestamp.proto";
 
 //
 // Note any type defined in this file is referenced/persisted in both the consumer and provider CCV modules,
@@ -97,7 +97,7 @@ message GenesisState {
     // ProviderConsensusState filled in on new chain, nil on restart.
     ibc.lightclients.tendermint.v1.ConsensusState provider_consensus_state = 6;
     // MaturingPackets nil on new chain, filled in on restart.
-    repeated interchain_security.ccv.consumer.v1.MaturingVSCPacket
+    repeated MaturingVSCPacket
         maturing_packets = 7 [ (gogoproto.nullable) = false ];
     // InitialValset filled in on new chain and on restart.
     repeated .tendermint.abci.ValidatorUpdate initial_val_set = 8
@@ -112,7 +112,7 @@ message GenesisState {
     interchain_security.ccv.v1.ConsumerPacketDataList pending_consumer_packets =
         11 [ (gogoproto.nullable) = false ];
     // LastTransmissionBlockHeight nil on new chain, filled in on restart.
-    interchain_security.ccv.consumer.v1.LastTransmissionBlockHeight
+    LastTransmissionBlockHeight
         last_transmission_block_height = 12 [ (gogoproto.nullable) = false ];
     bool preCCV = 13; // flag indicating whether the consumer CCV module starts in
                       // pre-CCV state
@@ -128,4 +128,19 @@ message HeightToValsetUpdateID {
 // OutstandingDowntime defines the type used internally to the consumer CCV module,
 // AND used in shared consumer genesis state, in order to not send multiple slashing 
 // requests for the same downtime infraction.
-message OutstandingDowntime { string validator_consensus_address = 1; }
\ No newline at end of file
+message OutstandingDowntime { string validator_consensus_address = 1; }
+
+// LastTransmissionBlockHeight is the last time validator holding
+// pools were transmitted to the provider chain. This type is used internally 
+// to the consumer CCV module AND used in shared consumer genesis state.
+message LastTransmissionBlockHeight { int64 height = 1; }
+
+// MaturingVSCPacket represents a vsc packet that is maturing internal to the
+// consumer CCV module, where the consumer has not yet relayed a VSCMatured packet
+// back to the provider.  This type is used internally to the consumer CCV module
+// AND used in shared consumer genesis state.
+message MaturingVSCPacket {
+    uint64 vscId = 1;
+    google.protobuf.Timestamp maturity_time = 2
+        [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ];
+}
diff --git a/x/ccv/consumer/types/consumer.pb.go b/x/ccv/consumer/types/consumer.pb.go
index 1c6a322004..dcb9854535 100644
--- a/x/ccv/consumer/types/consumer.pb.go
+++ b/x/ccv/consumer/types/consumer.pb.go
@@ -9,21 +9,17 @@ import (
 	types "github.com/cosmos/cosmos-sdk/codec/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
-	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
 	_ "github.com/cosmos/interchain-security/v3/x/ccv/types"
 	_ "google.golang.org/protobuf/types/known/durationpb"
-	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
 	math "math"
 	math_bits "math/bits"
-	time "time"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
-var _ = time.Kitchen
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
@@ -31,54 +27,6 @@ var _ = time.Kitchen
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
-// LastTransmissionBlockHeight is the last time validator holding
-// pools were transmitted to the provider chain.
-//
-// This type is only used internally to the consumer CCV module.
-type LastTransmissionBlockHeight struct {
-	Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"`
-}
-
-func (m *LastTransmissionBlockHeight) Reset()         { *m = LastTransmissionBlockHeight{} }
-func (m *LastTransmissionBlockHeight) String() string { return proto.CompactTextString(m) }
-func (*LastTransmissionBlockHeight) ProtoMessage()    {}
-func (*LastTransmissionBlockHeight) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5b27a82b276e7f93, []int{0}
-}
-func (m *LastTransmissionBlockHeight) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *LastTransmissionBlockHeight) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_LastTransmissionBlockHeight.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *LastTransmissionBlockHeight) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_LastTransmissionBlockHeight.Merge(m, src)
-}
-func (m *LastTransmissionBlockHeight) XXX_Size() int {
-	return m.Size()
-}
-func (m *LastTransmissionBlockHeight) XXX_DiscardUnknown() {
-	xxx_messageInfo_LastTransmissionBlockHeight.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_LastTransmissionBlockHeight proto.InternalMessageInfo
-
-func (m *LastTransmissionBlockHeight) GetHeight() int64 {
-	if m != nil {
-		return m.Height
-	}
-	return 0
-}
-
 // CrossChainValidator defines the type used to store validator information internal
 // to the consumer CCV module.  Note one cross chain validator entry is persisted for
 // each consumer validator, where incoming VSC packets update this data, which is eventually
@@ -94,7 +42,7 @@ func (m *CrossChainValidator) Reset()         { *m = CrossChainValidator{} }
 func (m *CrossChainValidator) String() string { return proto.CompactTextString(m) }
 func (*CrossChainValidator) ProtoMessage()    {}
 func (*CrossChainValidator) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5b27a82b276e7f93, []int{1}
+	return fileDescriptor_5b27a82b276e7f93, []int{0}
 }
 func (m *CrossChainValidator) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -144,65 +92,8 @@ func (m *CrossChainValidator) GetPubkey() *types.Any {
 	return nil
 }
 
-// MaturingVSCPacket represents a vsc packet that is maturing internal to the
-// consumer CCV module, where the consumer has not yet relayed a VSCMatured packet
-// back to the provider.
-type MaturingVSCPacket struct {
-	VscId        uint64    `protobuf:"varint,1,opt,name=vscId,proto3" json:"vscId,omitempty"`
-	MaturityTime time.Time `protobuf:"bytes,2,opt,name=maturity_time,json=maturityTime,proto3,stdtime" json:"maturity_time"`
-}
-
-func (m *MaturingVSCPacket) Reset()         { *m = MaturingVSCPacket{} }
-func (m *MaturingVSCPacket) String() string { return proto.CompactTextString(m) }
-func (*MaturingVSCPacket) ProtoMessage()    {}
-func (*MaturingVSCPacket) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5b27a82b276e7f93, []int{2}
-}
-func (m *MaturingVSCPacket) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *MaturingVSCPacket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_MaturingVSCPacket.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *MaturingVSCPacket) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MaturingVSCPacket.Merge(m, src)
-}
-func (m *MaturingVSCPacket) XXX_Size() int {
-	return m.Size()
-}
-func (m *MaturingVSCPacket) XXX_DiscardUnknown() {
-	xxx_messageInfo_MaturingVSCPacket.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MaturingVSCPacket proto.InternalMessageInfo
-
-func (m *MaturingVSCPacket) GetVscId() uint64 {
-	if m != nil {
-		return m.VscId
-	}
-	return 0
-}
-
-func (m *MaturingVSCPacket) GetMaturityTime() time.Time {
-	if m != nil {
-		return m.MaturityTime
-	}
-	return time.Time{}
-}
-
 func init() {
-	proto.RegisterType((*LastTransmissionBlockHeight)(nil), "interchain_security.ccv.consumer.v1.LastTransmissionBlockHeight")
 	proto.RegisterType((*CrossChainValidator)(nil), "interchain_security.ccv.consumer.v1.CrossChainValidator")
-	proto.RegisterType((*MaturingVSCPacket)(nil), "interchain_security.ccv.consumer.v1.MaturingVSCPacket")
 }
 
 func init() {
@@ -210,64 +101,29 @@ func init() {
 }
 
 var fileDescriptor_5b27a82b276e7f93 = []byte{
-	// 458 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x41, 0x6e, 0xd3, 0x40,
-	0x14, 0x8d, 0x29, 0x04, 0x34, 0x2d, 0x0b, 0x4c, 0x04, 0x21, 0x48, 0x4e, 0x65, 0x84, 0xd4, 0x4d,
-	0x3d, 0x4a, 0x22, 0x36, 0x48, 0x2c, 0x48, 0x36, 0x54, 0x80, 0x54, 0x99, 0xaa, 0x48, 0x6c, 0xa2,
-	0xf1, 0x78, 0x70, 0x46, 0x89, 0x67, 0xac, 0xf9, 0x33, 0x2e, 0x73, 0x8b, 0x1e, 0x83, 0x03, 0x70,
-	0x88, 0x8a, 0x55, 0x97, 0xac, 0x0a, 0x4a, 0x6e, 0xc0, 0x09, 0x90, 0xc7, 0x76, 0x10, 0x05, 0x76,
-	0xff, 0xe9, 0xfd, 0xf7, 0xf4, 0xe6, 0xcd, 0x47, 0x63, 0x2e, 0x34, 0x53, 0x74, 0x41, 0xb8, 0x98,
-	0x03, 0xa3, 0x46, 0x71, 0x6d, 0x31, 0xa5, 0x25, 0xa6, 0x52, 0x80, 0xc9, 0x99, 0xc2, 0xe5, 0x68,
-	0x3b, 0x47, 0x85, 0x92, 0x5a, 0xfa, 0x4f, 0xfe, 0xa1, 0x89, 0x28, 0x2d, 0xa3, 0xed, 0x5e, 0x39,
-	0x1a, 0x3c, 0xfd, 0x9f, 0x71, 0x39, 0xc2, 0x67, 0x5c, 0xb1, 0xda, 0x6b, 0xf0, 0x28, 0x93, 0x32,
-	0x5b, 0x31, 0xec, 0x50, 0x62, 0x3e, 0x62, 0x22, 0x6c, 0x43, 0xf5, 0x32, 0x99, 0x49, 0x37, 0xe2,
-	0x6a, 0x6a, 0x05, 0x54, 0x42, 0x2e, 0x61, 0x5e, 0x13, 0x35, 0x68, 0xa8, 0xe0, 0xba, 0x57, 0x6a,
-	0x14, 0xd1, 0x5c, 0x8a, 0x86, 0x1f, 0x5e, 0xe7, 0x35, 0xcf, 0x19, 0x68, 0x92, 0x17, 0xf5, 0x42,
-	0xf8, 0x0c, 0x3d, 0x7e, 0x43, 0x40, 0x9f, 0x28, 0x22, 0x20, 0xe7, 0x00, 0x5c, 0x8a, 0xe9, 0x4a,
-	0xd2, 0xe5, 0x2b, 0xc6, 0xb3, 0x85, 0xf6, 0x1f, 0xa0, 0xee, 0xc2, 0x4d, 0x7d, 0x6f, 0xdf, 0x3b,
-	0xd8, 0x89, 0x1b, 0x14, 0x7e, 0xf6, 0xd0, 0xfd, 0x99, 0x92, 0x00, 0xb3, 0xea, 0xb5, 0xa7, 0x64,
-	0xc5, 0x53, 0xa2, 0xa5, 0xf2, 0xfb, 0xe8, 0x36, 0x49, 0x53, 0xc5, 0x00, 0x9c, 0x60, 0x2f, 0x6e,
-	0xa1, 0xdf, 0x43, 0xb7, 0x0a, 0x79, 0xc6, 0x54, 0xff, 0x86, 0x33, 0xaa, 0x81, 0x4f, 0x50, 0xb7,
-	0x30, 0xc9, 0x92, 0xd9, 0xfe, 0xce, 0xbe, 0x77, 0xb0, 0x3b, 0xee, 0x45, 0x75, 0xe0, 0xa8, 0x0d,
-	0x1c, 0xbd, 0x14, 0x76, 0x3a, 0xf9, 0x79, 0x35, 0x7c, 0x68, 0x49, 0xbe, 0x7a, 0x1e, 0x56, 0x7d,
-	0x33, 0x01, 0x06, 0xe6, 0xb5, 0x2e, 0xfc, 0xfa, 0xe5, 0xb0, 0xd7, 0x54, 0x42, 0x95, 0x2d, 0xb4,
-	0x8c, 0x8e, 0x4d, 0xf2, 0x9a, 0xd9, 0xb8, 0x31, 0x0e, 0x35, 0xba, 0xf7, 0x96, 0x68, 0xa3, 0xb8,
-	0xc8, 0x4e, 0xdf, 0xcd, 0x8e, 0x09, 0x5d, 0x32, 0x5d, 0xa5, 0x29, 0x81, 0x1e, 0xa5, 0x2e, 0xe5,
-	0xcd, 0xb8, 0x06, 0xfe, 0x11, 0xba, 0x9b, 0xbb, 0x55, 0x6d, 0xe7, 0x55, 0x51, 0x2e, 0xeb, 0xee,
-	0x78, 0xf0, 0x57, 0xa8, 0x93, 0xb6, 0xc5, 0xe9, 0x9d, 0x8b, 0xab, 0x61, 0xe7, 0xfc, 0xfb, 0xd0,
-	0x8b, 0xf7, 0x5a, 0x69, 0x45, 0x4e, 0xdf, 0x5f, 0xac, 0x03, 0xef, 0x72, 0x1d, 0x78, 0x3f, 0xd6,
-	0x81, 0x77, 0xbe, 0x09, 0x3a, 0x97, 0x9b, 0xa0, 0xf3, 0x6d, 0x13, 0x74, 0x3e, 0xbc, 0xc8, 0xb8,
-	0x5e, 0x98, 0x24, 0xa2, 0x32, 0x6f, 0xfe, 0x12, 0xff, 0xbe, 0x9b, 0xc3, 0xed, 0xdd, 0x94, 0x13,
-	0xfc, 0xe9, 0xcf, 0xab, 0xd4, 0xb6, 0x60, 0x90, 0x74, 0x5d, 0x88, 0xc9, 0xaf, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xff, 0xc7, 0xac, 0x19, 0xc6, 0x02, 0x00, 0x00,
-}
-
-func (m *LastTransmissionBlockHeight) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *LastTransmissionBlockHeight) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *LastTransmissionBlockHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.Height != 0 {
-		i = encodeVarintConsumer(dAtA, i, uint64(m.Height))
-		i--
-		dAtA[i] = 0x8
-	}
-	return len(dAtA) - i, nil
+	// 346 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x51, 0x3d, 0x4e, 0xeb, 0x40,
+	0x18, 0xcc, 0xbe, 0xe8, 0xe5, 0x49, 0x7e, 0xaf, 0xf2, 0xb3, 0x84, 0x49, 0x61, 0xa2, 0x20, 0xa4,
+	0x34, 0xd9, 0x55, 0x92, 0x0e, 0x89, 0x82, 0xa4, 0xa4, 0x41, 0x29, 0x40, 0xa2, 0x89, 0xd6, 0xeb,
+	0xc5, 0xb1, 0x88, 0xf7, 0xb3, 0xf6, 0xc7, 0x61, 0x6f, 0xc1, 0x31, 0x38, 0x00, 0x87, 0x40, 0x54,
+	0x29, 0xa9, 0x10, 0x4a, 0x6e, 0xc0, 0x09, 0x50, 0xb2, 0x4e, 0x10, 0x08, 0xba, 0x19, 0x8d, 0x67,
+	0xbe, 0xf1, 0xac, 0xd7, 0xcf, 0x84, 0xe6, 0x92, 0x4d, 0x69, 0x26, 0x26, 0x8a, 0x33, 0x23, 0x33,
+	0x6d, 0x09, 0x63, 0x25, 0x61, 0x20, 0x94, 0xc9, 0xb9, 0x24, 0x65, 0x6f, 0x87, 0x71, 0x21, 0x41,
+	0x83, 0x7f, 0xf8, 0x8d, 0x07, 0x33, 0x56, 0xe2, 0xdd, 0x77, 0x65, 0xaf, 0x79, 0xf4, 0x53, 0x70,
+	0xd9, 0x23, 0xf3, 0x4c, 0x72, 0x97, 0xd5, 0xdc, 0x4f, 0x01, 0xd2, 0x19, 0x27, 0x1b, 0x16, 0x9b,
+	0x6b, 0x42, 0x85, 0xad, 0xa4, 0x20, 0x85, 0x14, 0x36, 0x90, 0xac, 0xd1, 0xd6, 0xc0, 0x40, 0xe5,
+	0xa0, 0x26, 0x4e, 0x70, 0xa4, 0x92, 0xa2, 0xaf, 0x59, 0x89, 0x91, 0x54, 0x67, 0x20, 0x9c, 0xde,
+	0xbe, 0x47, 0xde, 0xff, 0x91, 0x04, 0xa5, 0x46, 0xeb, 0x56, 0x17, 0x74, 0x96, 0x25, 0x54, 0x83,
+	0xf4, 0x43, 0xef, 0x0f, 0x4d, 0x12, 0xc9, 0x95, 0x0a, 0x51, 0x0b, 0x75, 0xfe, 0x8d, 0xb7, 0xd4,
+	0x0f, 0xbc, 0xdf, 0x05, 0xcc, 0xb9, 0x0c, 0x7f, 0xb5, 0x50, 0xa7, 0x3e, 0x76, 0xc4, 0xa7, 0x5e,
+	0xa3, 0x30, 0xf1, 0x0d, 0xb7, 0x61, 0xbd, 0x85, 0x3a, 0x7f, 0xfb, 0x01, 0x76, 0x87, 0xf1, 0xf6,
+	0x30, 0x3e, 0x15, 0x76, 0x38, 0x78, 0x7b, 0x39, 0xd8, 0xb3, 0x34, 0x9f, 0x1d, 0xb7, 0xd7, 0xbb,
+	0x70, 0xa1, 0x8c, 0x9a, 0x38, 0x5f, 0xfb, 0xe9, 0xa1, 0x1b, 0x54, 0xd5, 0x99, 0xb4, 0x85, 0x06,
+	0x7c, 0x6e, 0xe2, 0x33, 0x6e, 0xc7, 0x55, 0xf0, 0xf0, 0xf2, 0x71, 0x19, 0xa1, 0xc5, 0x32, 0x42,
+	0xaf, 0xcb, 0x08, 0xdd, 0xad, 0xa2, 0xda, 0x62, 0x15, 0xd5, 0x9e, 0x57, 0x51, 0xed, 0xea, 0x24,
+	0xcd, 0xf4, 0xd4, 0xc4, 0x98, 0x41, 0x5e, 0xfd, 0x3d, 0xf9, 0x58, 0xba, 0xbb, 0x5b, 0xba, 0x1c,
+	0x90, 0xdb, 0xcf, 0xef, 0xa8, 0x6d, 0xc1, 0x55, 0xdc, 0xd8, 0x74, 0x1c, 0xbc, 0x07, 0x00, 0x00,
+	0xff, 0xff, 0x0f, 0xc7, 0xd1, 0x61, 0xf8, 0x01, 0x00, 0x00,
 }
 
 func (m *CrossChainValidator) Marshal() (dAtA []byte, err error) {
@@ -317,42 +173,6 @@ func (m *CrossChainValidator) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *MaturingVSCPacket) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *MaturingVSCPacket) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *MaturingVSCPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	n2, err2 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.MaturityTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.MaturityTime):])
-	if err2 != nil {
-		return 0, err2
-	}
-	i -= n2
-	i = encodeVarintConsumer(dAtA, i, uint64(n2))
-	i--
-	dAtA[i] = 0x12
-	if m.VscId != 0 {
-		i = encodeVarintConsumer(dAtA, i, uint64(m.VscId))
-		i--
-		dAtA[i] = 0x8
-	}
-	return len(dAtA) - i, nil
-}
-
 func encodeVarintConsumer(dAtA []byte, offset int, v uint64) int {
 	offset -= sovConsumer(v)
 	base := offset
@@ -364,18 +184,6 @@ func encodeVarintConsumer(dAtA []byte, offset int, v uint64) int {
 	dAtA[offset] = uint8(v)
 	return base
 }
-func (m *LastTransmissionBlockHeight) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.Height != 0 {
-		n += 1 + sovConsumer(uint64(m.Height))
-	}
-	return n
-}
-
 func (m *CrossChainValidator) Size() (n int) {
 	if m == nil {
 		return 0
@@ -396,95 +204,12 @@ func (m *CrossChainValidator) Size() (n int) {
 	return n
 }
 
-func (m *MaturingVSCPacket) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.VscId != 0 {
-		n += 1 + sovConsumer(uint64(m.VscId))
-	}
-	l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.MaturityTime)
-	n += 1 + l + sovConsumer(uint64(l))
-	return n
-}
-
 func sovConsumer(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
 func sozConsumer(x uint64) (n int) {
 	return sovConsumer(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
-func (m *LastTransmissionBlockHeight) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowConsumer
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: LastTransmissionBlockHeight: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: LastTransmissionBlockHeight: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
-			}
-			m.Height = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.Height |= int64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		default:
-			iNdEx = preIndex
-			skippy, err := skipConsumer(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
 func (m *CrossChainValidator) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -624,108 +349,6 @@ func (m *CrossChainValidator) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MaturingVSCPacket) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowConsumer
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: MaturingVSCPacket: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MaturingVSCPacket: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field VscId", wireType)
-			}
-			m.VscId = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.VscId |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field MaturityTime", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.MaturityTime, dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipConsumer(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
 func skipConsumer(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/x/ccv/types/shared_consumer.pb.go b/x/ccv/types/shared_consumer.pb.go
index 0b4c77a8be..522f34d0d5 100644
--- a/x/ccv/types/shared_consumer.pb.go
+++ b/x/ccv/types/shared_consumer.pb.go
@@ -5,14 +5,14 @@ package types
 
 import (
 	fmt "fmt"
-	types1 "github.com/cometbft/cometbft/abci/types"
+	types "github.com/cometbft/cometbft/abci/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
 	_ "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	_07_tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
-	types "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	_ "google.golang.org/protobuf/types/known/durationpb"
+	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -214,9 +214,9 @@ type GenesisState struct {
 	// ProviderConsensusState filled in on new chain, nil on restart.
 	ProviderConsensusState *_07_tendermint.ConsensusState `protobuf:"bytes,6,opt,name=provider_consensus_state,json=providerConsensusState,proto3" json:"provider_consensus_state,omitempty"`
 	// MaturingPackets nil on new chain, filled in on restart.
-	MaturingPackets []types.MaturingVSCPacket `protobuf:"bytes,7,rep,name=maturing_packets,json=maturingPackets,proto3" json:"maturing_packets"`
+	MaturingPackets []MaturingVSCPacket `protobuf:"bytes,7,rep,name=maturing_packets,json=maturingPackets,proto3" json:"maturing_packets"`
 	// InitialValset filled in on new chain and on restart.
-	InitialValSet []types1.ValidatorUpdate `protobuf:"bytes,8,rep,name=initial_val_set,json=initialValSet,proto3" json:"initial_val_set"`
+	InitialValSet []types.ValidatorUpdate `protobuf:"bytes,8,rep,name=initial_val_set,json=initialValSet,proto3" json:"initial_val_set"`
 	// HeightToValsetUpdateId nil on new chain, filled in on restart.
 	HeightToValsetUpdateId []HeightToValsetUpdateID `protobuf:"bytes,9,rep,name=height_to_valset_update_id,json=heightToValsetUpdateId,proto3" json:"height_to_valset_update_id"`
 	// OutstandingDowntimes nil on new chain, filled  in on restart.
@@ -224,8 +224,8 @@ type GenesisState struct {
 	// PendingConsumerPackets nil on new chain, filled in on restart.
 	PendingConsumerPackets ConsumerPacketDataList `protobuf:"bytes,11,opt,name=pending_consumer_packets,json=pendingConsumerPackets,proto3" json:"pending_consumer_packets"`
 	// LastTransmissionBlockHeight nil on new chain, filled in on restart.
-	LastTransmissionBlockHeight types.LastTransmissionBlockHeight `protobuf:"bytes,12,opt,name=last_transmission_block_height,json=lastTransmissionBlockHeight,proto3" json:"last_transmission_block_height"`
-	PreCCV                      bool                              `protobuf:"varint,13,opt,name=preCCV,proto3" json:"preCCV,omitempty"`
+	LastTransmissionBlockHeight LastTransmissionBlockHeight `protobuf:"bytes,12,opt,name=last_transmission_block_height,json=lastTransmissionBlockHeight,proto3" json:"last_transmission_block_height"`
+	PreCCV                      bool                        `protobuf:"varint,13,opt,name=preCCV,proto3" json:"preCCV,omitempty"`
 }
 
 func (m *GenesisState) Reset()         { *m = GenesisState{} }
@@ -303,14 +303,14 @@ func (m *GenesisState) GetProviderConsensusState() *_07_tendermint.ConsensusStat
 	return nil
 }
 
-func (m *GenesisState) GetMaturingPackets() []types.MaturingVSCPacket {
+func (m *GenesisState) GetMaturingPackets() []MaturingVSCPacket {
 	if m != nil {
 		return m.MaturingPackets
 	}
 	return nil
 }
 
-func (m *GenesisState) GetInitialValSet() []types1.ValidatorUpdate {
+func (m *GenesisState) GetInitialValSet() []types.ValidatorUpdate {
 	if m != nil {
 		return m.InitialValSet
 	}
@@ -338,11 +338,11 @@ func (m *GenesisState) GetPendingConsumerPackets() ConsumerPacketDataList {
 	return ConsumerPacketDataList{}
 }
 
-func (m *GenesisState) GetLastTransmissionBlockHeight() types.LastTransmissionBlockHeight {
+func (m *GenesisState) GetLastTransmissionBlockHeight() LastTransmissionBlockHeight {
 	if m != nil {
 		return m.LastTransmissionBlockHeight
 	}
-	return types.LastTransmissionBlockHeight{}
+	return LastTransmissionBlockHeight{}
 }
 
 func (m *GenesisState) GetPreCCV() bool {
@@ -453,11 +453,116 @@ func (m *OutstandingDowntime) GetValidatorConsensusAddress() string {
 	return ""
 }
 
+// LastTransmissionBlockHeight is the last time validator holding
+// pools were transmitted to the provider chain. This type is used internally
+// to the consumer CCV module AND used in shared consumer genesis state.
+type LastTransmissionBlockHeight struct {
+	Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"`
+}
+
+func (m *LastTransmissionBlockHeight) Reset()         { *m = LastTransmissionBlockHeight{} }
+func (m *LastTransmissionBlockHeight) String() string { return proto.CompactTextString(m) }
+func (*LastTransmissionBlockHeight) ProtoMessage()    {}
+func (*LastTransmissionBlockHeight) Descriptor() ([]byte, []int) {
+	return fileDescriptor_d0a8be0efc64dfbc, []int{4}
+}
+func (m *LastTransmissionBlockHeight) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *LastTransmissionBlockHeight) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_LastTransmissionBlockHeight.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *LastTransmissionBlockHeight) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LastTransmissionBlockHeight.Merge(m, src)
+}
+func (m *LastTransmissionBlockHeight) XXX_Size() int {
+	return m.Size()
+}
+func (m *LastTransmissionBlockHeight) XXX_DiscardUnknown() {
+	xxx_messageInfo_LastTransmissionBlockHeight.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LastTransmissionBlockHeight proto.InternalMessageInfo
+
+func (m *LastTransmissionBlockHeight) GetHeight() int64 {
+	if m != nil {
+		return m.Height
+	}
+	return 0
+}
+
+// MaturingVSCPacket represents a vsc packet that is maturing internal to the
+// consumer CCV module, where the consumer has not yet relayed a VSCMatured packet
+// back to the provider.  This type is used internally to the consumer CCV module
+// AND used in shared consumer genesis state.
+type MaturingVSCPacket struct {
+	VscId        uint64    `protobuf:"varint,1,opt,name=vscId,proto3" json:"vscId,omitempty"`
+	MaturityTime time.Time `protobuf:"bytes,2,opt,name=maturity_time,json=maturityTime,proto3,stdtime" json:"maturity_time"`
+}
+
+func (m *MaturingVSCPacket) Reset()         { *m = MaturingVSCPacket{} }
+func (m *MaturingVSCPacket) String() string { return proto.CompactTextString(m) }
+func (*MaturingVSCPacket) ProtoMessage()    {}
+func (*MaturingVSCPacket) Descriptor() ([]byte, []int) {
+	return fileDescriptor_d0a8be0efc64dfbc, []int{5}
+}
+func (m *MaturingVSCPacket) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MaturingVSCPacket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MaturingVSCPacket.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MaturingVSCPacket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MaturingVSCPacket.Merge(m, src)
+}
+func (m *MaturingVSCPacket) XXX_Size() int {
+	return m.Size()
+}
+func (m *MaturingVSCPacket) XXX_DiscardUnknown() {
+	xxx_messageInfo_MaturingVSCPacket.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MaturingVSCPacket proto.InternalMessageInfo
+
+func (m *MaturingVSCPacket) GetVscId() uint64 {
+	if m != nil {
+		return m.VscId
+	}
+	return 0
+}
+
+func (m *MaturingVSCPacket) GetMaturityTime() time.Time {
+	if m != nil {
+		return m.MaturityTime
+	}
+	return time.Time{}
+}
+
 func init() {
 	proto.RegisterType((*Params)(nil), "interchain_security.ccv.v1.Params")
 	proto.RegisterType((*GenesisState)(nil), "interchain_security.ccv.v1.GenesisState")
 	proto.RegisterType((*HeightToValsetUpdateID)(nil), "interchain_security.ccv.v1.HeightToValsetUpdateID")
 	proto.RegisterType((*OutstandingDowntime)(nil), "interchain_security.ccv.v1.OutstandingDowntime")
+	proto.RegisterType((*LastTransmissionBlockHeight)(nil), "interchain_security.ccv.v1.LastTransmissionBlockHeight")
+	proto.RegisterType((*MaturingVSCPacket)(nil), "interchain_security.ccv.v1.MaturingVSCPacket")
 }
 
 func init() {
@@ -465,76 +570,80 @@ func init() {
 }
 
 var fileDescriptor_d0a8be0efc64dfbc = []byte{
-	// 1100 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcf, 0x53, 0x1b, 0x37,
-	0x14, 0xc6, 0x81, 0x1a, 0x5b, 0x40, 0x21, 0x22, 0x71, 0x37, 0x30, 0x35, 0x86, 0xb6, 0x33, 0x9e,
-	0x69, 0xb3, 0x5b, 0x20, 0xd3, 0x43, 0x0f, 0x9d, 0x04, 0xbb, 0x69, 0xe8, 0xa4, 0x81, 0x2e, 0x84,
-	0x43, 0x7a, 0xd0, 0xc8, 0x92, 0xf0, 0x6a, 0xb2, 0x96, 0x3c, 0x92, 0x76, 0x29, 0xf7, 0xde, 0x7a,
-	0xe9, 0xb1, 0x7f, 0x52, 0x8e, 0x39, 0x76, 0x7a, 0x68, 0x3b, 0xf0, 0x8f, 0x74, 0x56, 0xd2, 0x1a,
-	0x3b, 0xc1, 0x84, 0xdb, 0x4a, 0xef, 0xfb, 0xbe, 0xa7, 0xf7, 0x43, 0x4f, 0x0b, 0xbe, 0xe6, 0xc2,
-	0x30, 0x45, 0x12, 0xcc, 0x05, 0xd2, 0x8c, 0x64, 0x8a, 0x9b, 0xf3, 0x88, 0x90, 0x3c, 0xca, 0xb7,
-	0x23, 0x9d, 0x60, 0xc5, 0x28, 0x22, 0x52, 0xe8, 0x6c, 0xc0, 0x54, 0x38, 0x54, 0xd2, 0x48, 0xb8,
-	0x76, 0x0d, 0x23, 0x24, 0x24, 0x0f, 0xf3, 0xed, 0xb5, 0x9d, 0x69, 0x6a, 0xa5, 0x46, 0x21, 0x3b,
-	0xa9, 0xb7, 0xb6, 0x6e, 0x98, 0xa0, 0x4c, 0x0d, 0xb8, 0x30, 0x11, 0xee, 0x11, 0x1e, 0x99, 0xf3,
-	0x21, 0xd3, 0xde, 0x18, 0xf1, 0x1e, 0x89, 0x52, 0xde, 0x4f, 0x0c, 0x49, 0x39, 0x13, 0x46, 0x47,
-	0x63, 0xe8, 0x7c, 0x7b, 0x6c, 0xe5, 0x09, 0x9b, 0x05, 0x81, 0x48, 0xc5, 0x22, 0x92, 0x60, 0x21,
-	0x58, 0x6a, 0x3d, 0xba, 0x4f, 0x0f, 0x69, 0xf6, 0xa5, 0xec, 0xa7, 0x2c, 0xb2, 0xab, 0x5e, 0x76,
-	0x1a, 0xd1, 0x4c, 0x61, 0xc3, 0xa5, 0xf0, 0xf6, 0x7b, 0x7d, 0xd9, 0x97, 0xf6, 0x33, 0x2a, 0xbe,
-	0xfc, 0xee, 0x17, 0x37, 0x24, 0xea, 0x8c, 0x2b, 0xe6, 0x60, 0x5b, 0xbf, 0x55, 0x41, 0xf5, 0x10,
-	0x2b, 0x3c, 0xd0, 0x30, 0x00, 0xf3, 0x4c, 0xe0, 0x5e, 0xca, 0x68, 0x50, 0x69, 0x55, 0xda, 0xb5,
-	0xb8, 0x5c, 0xc2, 0x03, 0xf0, 0x79, 0x2f, 0x95, 0xe4, 0xb5, 0x46, 0x43, 0xa6, 0x10, 0xe5, 0xda,
-	0x28, 0xde, 0xcb, 0x8a, 0x23, 0x20, 0xa3, 0xb0, 0xd0, 0x03, 0xae, 0x35, 0x97, 0x22, 0xb8, 0xd3,
-	0xaa, 0xb4, 0x67, 0xe3, 0x4d, 0x87, 0x3d, 0x64, 0xaa, 0x3b, 0x86, 0x3c, 0x1e, 0x03, 0xc2, 0x1f,
-	0xc1, 0xe6, 0x54, 0x15, 0xe4, 0xa3, 0x0f, 0x66, 0x5b, 0x95, 0x76, 0x3d, 0xde, 0xa0, 0x53, 0x44,
-	0x3a, 0x0e, 0x06, 0xbf, 0x05, 0x6b, 0x43, 0x25, 0x73, 0x4e, 0x99, 0x42, 0xa7, 0x8c, 0xa1, 0xa1,
-	0x94, 0x29, 0xc2, 0x94, 0x2a, 0xa4, 0x8d, 0x0a, 0xe6, 0xac, 0x48, 0xa3, 0x44, 0x3c, 0x65, 0xec,
-	0x50, 0xca, 0xf4, 0x09, 0xa5, 0xea, 0xc8, 0x28, 0xf8, 0x33, 0x80, 0x84, 0xe4, 0xc8, 0xf0, 0x01,
-	0x93, 0x99, 0x29, 0xa2, 0xe3, 0x92, 0x06, 0x1f, 0xb5, 0x2a, 0xed, 0x85, 0x9d, 0x07, 0xa1, 0xcb,
-	0x7b, 0x58, 0xe6, 0x3d, 0xec, 0xfa, 0xbc, 0xef, 0xd5, 0xde, 0xfc, 0xb3, 0x31, 0xf3, 0xe7, 0xbf,
-	0x1b, 0x95, 0x78, 0x85, 0x90, 0xfc, 0xd8, 0xb1, 0x0f, 0x2d, 0x19, 0xfe, 0x02, 0x3e, 0xb1, 0xd1,
-	0x9c, 0x32, 0xf5, 0xae, 0x6e, 0xf5, 0xf6, 0xba, 0xf7, 0x4b, 0x8d, 0x49, 0xf1, 0x67, 0xa0, 0x55,
-	0x76, 0x23, 0x52, 0x6c, 0x22, 0x85, 0xa7, 0x0a, 0x93, 0xe2, 0x23, 0x98, 0xb7, 0x11, 0x37, 0x4b,
-	0x5c, 0x3c, 0x01, 0x7b, 0xea, 0x51, 0xf0, 0x21, 0x80, 0x09, 0xd7, 0x46, 0x2a, 0x4e, 0x70, 0x8a,
-	0x98, 0x30, 0x8a, 0x33, 0x1d, 0xd4, 0x6c, 0x01, 0xef, 0x5e, 0x59, 0xbe, 0x77, 0x06, 0xf8, 0x02,
-	0xac, 0x64, 0xa2, 0x27, 0x05, 0xe5, 0xa2, 0x5f, 0x86, 0x53, 0xbf, 0x7d, 0x38, 0xcb, 0x23, 0xb2,
-	0x0f, 0x64, 0x17, 0x34, 0xb4, 0x3c, 0x35, 0x48, 0x0e, 0x0d, 0x2a, 0x32, 0x64, 0x12, 0xc5, 0x74,
-	0x22, 0x53, 0x1a, 0x00, 0x7b, 0xfc, 0xd5, 0xc2, 0x7a, 0x30, 0x34, 0x07, 0x99, 0x39, 0x2e, 0x4d,
-	0xf0, 0x33, 0xb0, 0xa4, 0xd8, 0x19, 0x56, 0x14, 0x51, 0x26, 0xe4, 0x40, 0x07, 0x0b, 0xad, 0xd9,
-	0x76, 0x3d, 0x5e, 0x74, 0x9b, 0x5d, 0xbb, 0x07, 0x1f, 0x81, 0x51, 0xb1, 0xd1, 0x24, 0x7a, 0xd1,
-	0xa2, 0xef, 0x95, 0xd6, 0x78, 0x8c, 0xb5, 0xf5, 0x77, 0x0d, 0x2c, 0xfe, 0xc0, 0x04, 0xd3, 0x5c,
-	0x1f, 0x19, 0x6c, 0x18, 0x7c, 0x0c, 0xaa, 0x43, 0x7b, 0x2d, 0xec, 0x5d, 0x58, 0xd8, 0xd9, 0x0a,
-	0xa7, 0x8f, 0x91, 0xd0, 0x5d, 0xa0, 0xbd, 0xb9, 0x22, 0xde, 0xd8, 0xf3, 0xe0, 0x57, 0x00, 0x8e,
-	0x0e, 0xe2, 0x86, 0x01, 0xe2, 0xd4, 0x5e, 0x91, 0x7a, 0xbc, 0x52, 0x5a, 0x3a, 0xd6, 0xb0, 0x4f,
-	0x61, 0x08, 0x56, 0xaf, 0xd0, 0xae, 0xb3, 0x0b, 0xb8, 0xbb, 0x03, 0x77, 0x47, 0x70, 0x67, 0xd9,
-	0xa7, 0x70, 0x1d, 0xd4, 0x05, 0x3b, 0x43, 0xf6, 0x3c, 0xb6, 0xc9, 0x6b, 0x71, 0x4d, 0xb0, 0xb3,
-	0x4e, 0xb1, 0x86, 0x08, 0xdc, 0x7f, 0xd7, 0xb5, 0x2e, 0xa2, 0xf2, 0x9d, 0xfd, 0x65, 0xc8, 0x7b,
-	0x24, 0x1c, 0x9f, 0x52, 0xe1, 0xd8, 0x5c, 0xca, 0xb7, 0x43, 0x77, 0x2a, 0x9b, 0x88, 0x78, 0x75,
-	0xf2, 0xa8, 0x2e, 0x3b, 0x09, 0x08, 0xae, 0x1c, 0x48, 0xa1, 0x99, 0xd0, 0x99, 0xf6, 0x3e, 0x5c,
-	0x97, 0x87, 0x1f, 0xf4, 0x51, 0xd2, 0x9c, 0x9b, 0x51, 0xd1, 0x26, 0xf7, 0x61, 0x1f, 0xac, 0x0c,
-	0xb0, 0xc9, 0x94, 0xed, 0x3b, 0x4c, 0x5e, 0x33, 0xa3, 0x83, 0xf9, 0xd6, 0x6c, 0x7b, 0x61, 0xe7,
-	0x9b, 0xa9, 0x15, 0x19, 0x0d, 0xec, 0x7c, 0x3b, 0xfc, 0xc9, 0x93, 0x4f, 0x8e, 0x3a, 0x87, 0x96,
-	0xee, 0xab, 0xb4, 0x5c, 0xaa, 0xba, 0xdd, 0xa2, 0xc3, 0x97, 0xb9, 0xe0, 0x86, 0xe3, 0x14, 0xe5,
-	0x38, 0x45, 0x9a, 0x99, 0xa0, 0x66, 0xfd, 0xb4, 0xc6, 0x0f, 0x5e, 0x0c, 0xfc, 0xf0, 0x04, 0xa7,
-	0x9c, 0x62, 0x23, 0xd5, 0xcb, 0x21, 0xc5, 0x86, 0x79, 0xc5, 0x25, 0x4f, 0x3f, 0xc1, 0xe9, 0x11,
-	0x33, 0xd0, 0x80, 0xb5, 0x84, 0x15, 0xe1, 0x23, 0x23, 0x0b, 0x45, 0xcd, 0x0c, 0xca, 0x2c, 0xbe,
-	0xa8, 0x6b, 0xdd, 0x4a, 0xef, 0xdc, 0xd4, 0x54, 0xcf, 0x2c, 0xfb, 0x58, 0x9e, 0x58, 0xae, 0x73,
-	0xb5, 0xdf, 0xf5, 0xce, 0x1a, 0xc9, 0x75, 0x56, 0x0a, 0xcf, 0xc1, 0xa7, 0x32, 0x33, 0xda, 0x60,
-	0x77, 0x53, 0xa9, 0x3c, 0x13, 0xc5, 0x10, 0x42, 0x3a, 0xc5, 0x3a, 0xe1, 0xa2, 0x1f, 0x00, 0xeb,
-	0x38, 0xba, 0xc9, 0xf1, 0xc1, 0x95, 0x40, 0xd7, 0xf3, 0xbd, 0xd7, 0x75, 0xf9, 0xbe, 0xe9, 0xc8,
-	0x2b, 0x43, 0x05, 0x82, 0x21, 0x73, 0x6e, 0x47, 0x33, 0xaa, 0xac, 0xd8, 0x82, 0xed, 0x89, 0x1b,
-	0xc3, 0xed, 0x78, 0x8e, 0xab, 0x47, 0x17, 0x1b, 0xfc, 0x9c, 0xeb, 0xb2, 0x5a, 0x0d, 0xaf, 0x3c,
-	0x09, 0xd2, 0xf0, 0xf7, 0x0a, 0x68, 0xa6, 0x58, 0x9b, 0xc9, 0x07, 0xc4, 0xbe, 0x3f, 0xc8, 0x65,
-	0x28, 0x58, 0xb4, 0xae, 0x1f, 0xdf, 0xaa, 0x59, 0x9e, 0x63, 0x6d, 0xc6, 0x9f, 0x98, 0xbd, 0x42,
-	0xc8, 0xd5, 0xa1, 0xcc, 0x40, 0x3a, 0x1d, 0x02, 0x1b, 0xa0, 0x3a, 0x54, 0xac, 0xd3, 0x39, 0x09,
-	0x96, 0xec, 0x85, 0xf4, 0xab, 0xad, 0x57, 0xa0, 0x71, 0x7d, 0x31, 0x0b, 0x86, 0x3f, 0x66, 0x31,
-	0x65, 0xe6, 0x62, 0xbf, 0x82, 0x6d, 0xb0, 0xf2, 0x5e, 0xcb, 0xdc, 0xb1, 0x88, 0x8f, 0xf3, 0x89,
-	0x82, 0x6f, 0xbd, 0x04, 0xab, 0xd7, 0xd4, 0x0b, 0x7e, 0x07, 0xd6, 0xf3, 0xb2, 0x4b, 0xc7, 0x6e,
-	0x68, 0xf1, 0x2c, 0x32, 0xed, 0x66, 0x5a, 0x3d, 0x7e, 0x30, 0x82, 0x8c, 0x2e, 0xdd, 0x13, 0x07,
-	0xd8, 0x7b, 0xf1, 0xe6, 0xa2, 0x59, 0x79, 0x7b, 0xd1, 0xac, 0xfc, 0x77, 0xd1, 0xac, 0xfc, 0x71,
-	0xd9, 0x9c, 0x79, 0x7b, 0xd9, 0x9c, 0xf9, 0xeb, 0xb2, 0x39, 0xf3, 0xea, 0x51, 0x9f, 0x9b, 0x24,
-	0xeb, 0x85, 0x44, 0x0e, 0x22, 0x22, 0xf5, 0x40, 0xea, 0xe8, 0x2a, 0xb5, 0x0f, 0x47, 0x7f, 0x1a,
-	0xf9, 0x6e, 0xf4, 0xab, 0xfd, 0xdd, 0xb0, 0x7f, 0x47, 0xbd, 0xaa, 0x7d, 0x1d, 0x76, 0xff, 0x0f,
-	0x00, 0x00, 0xff, 0xff, 0x27, 0x23, 0xb9, 0x3e, 0xbf, 0x09, 0x00, 0x00,
+	// 1156 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcb, 0x6e, 0x1b, 0x37,
+	0x17, 0xb6, 0xe2, 0xc4, 0x91, 0x68, 0xfb, 0x8f, 0x43, 0x27, 0xfe, 0x27, 0x36, 0x2a, 0x2b, 0x6a,
+	0x0b, 0x08, 0x68, 0x33, 0x53, 0x3b, 0x29, 0x0a, 0x74, 0x51, 0x34, 0x96, 0x9a, 0xc6, 0x45, 0x1a,
+	0xbb, 0x63, 0xc7, 0x8b, 0x14, 0x28, 0x41, 0x91, 0xb4, 0x44, 0x64, 0x44, 0x0e, 0x48, 0xce, 0xb8,
+	0xde, 0x16, 0x7d, 0x80, 0x2c, 0xfb, 0x48, 0x59, 0x66, 0xd9, 0x55, 0x5b, 0x24, 0x2f, 0x52, 0xf0,
+	0x32, 0xb2, 0xe4, 0x8b, 0x9a, 0xdd, 0x90, 0xe7, 0xfb, 0xce, 0xfd, 0xf0, 0x0c, 0xf8, 0x82, 0x0b,
+	0xc3, 0x14, 0x19, 0x62, 0x2e, 0x90, 0x66, 0xa4, 0x50, 0xdc, 0x9c, 0x26, 0x84, 0x94, 0x49, 0xb9,
+	0x95, 0xe8, 0x21, 0x56, 0x8c, 0x22, 0x22, 0x85, 0x2e, 0x46, 0x4c, 0xc5, 0xb9, 0x92, 0x46, 0xc2,
+	0xf5, 0x4b, 0x18, 0x31, 0x21, 0x65, 0x5c, 0x6e, 0xad, 0x6f, 0x18, 0x26, 0x28, 0x53, 0x23, 0x2e,
+	0x4c, 0x82, 0xfb, 0x84, 0x27, 0xe6, 0x34, 0x67, 0xda, 0x13, 0xd7, 0x13, 0xde, 0x27, 0x49, 0xc6,
+	0x07, 0x43, 0x43, 0x32, 0xce, 0x84, 0xd1, 0xc9, 0x04, 0xba, 0xdc, 0x9a, 0x38, 0x05, 0xc2, 0x7d,
+	0x4b, 0x20, 0x52, 0xb1, 0x84, 0x0c, 0xb1, 0x10, 0x2c, 0xb3, 0xa8, 0xf0, 0x19, 0x20, 0xcd, 0x81,
+	0x94, 0x83, 0x8c, 0x25, 0xee, 0xd4, 0x2f, 0x8e, 0x13, 0x5a, 0x28, 0x6c, 0xb8, 0x14, 0x41, 0x7e,
+	0x67, 0x20, 0x07, 0xd2, 0x7d, 0x26, 0xf6, 0x2b, 0xdc, 0x7e, 0x3a, 0x23, 0xe8, 0x13, 0xae, 0x58,
+	0x80, 0x6d, 0x9e, 0x57, 0x6e, 0xf8, 0x88, 0x69, 0x83, 0x47, 0xb9, 0x07, 0xb4, 0x7f, 0x5f, 0x00,
+	0x0b, 0xfb, 0x58, 0xe1, 0x91, 0x86, 0x11, 0xb8, 0xc9, 0x04, 0xee, 0x67, 0x8c, 0x46, 0xb5, 0x56,
+	0xad, 0x53, 0x4f, 0xab, 0x23, 0xdc, 0x03, 0x9f, 0xf4, 0x33, 0x49, 0x5e, 0x69, 0x94, 0x33, 0x85,
+	0x28, 0xd7, 0x46, 0xf1, 0x7e, 0x61, 0x7d, 0x44, 0x46, 0x61, 0xa1, 0x47, 0x5c, 0x6b, 0x2e, 0x45,
+	0x74, 0xad, 0x55, 0xeb, 0xcc, 0xa7, 0xf7, 0x3d, 0x76, 0x9f, 0xa9, 0xde, 0x04, 0xf2, 0x70, 0x02,
+	0x08, 0x7f, 0x00, 0xf7, 0xaf, 0xd4, 0x82, 0x42, 0x7a, 0xa2, 0xf9, 0x56, 0xad, 0xd3, 0x48, 0x37,
+	0xe9, 0x15, 0x4a, 0xba, 0x1e, 0x06, 0xbf, 0x06, 0xeb, 0xb9, 0x92, 0x25, 0xa7, 0x4c, 0xa1, 0x63,
+	0xc6, 0x50, 0x2e, 0x65, 0x86, 0x30, 0xa5, 0x0a, 0x69, 0xa3, 0xa2, 0xeb, 0x4e, 0xc9, 0x5a, 0x85,
+	0x78, 0xc2, 0xd8, 0xbe, 0x94, 0xd9, 0x63, 0x4a, 0xd5, 0x81, 0x51, 0xf0, 0x27, 0x00, 0x09, 0x29,
+	0x91, 0x4d, 0x8a, 0x2c, 0x8c, 0x8d, 0x8e, 0x4b, 0x1a, 0xdd, 0x68, 0xd5, 0x3a, 0x8b, 0xdb, 0xf7,
+	0x62, 0x9f, 0xbb, 0xb8, 0xca, 0x5d, 0xdc, 0x0b, 0x85, 0xd9, 0xa9, 0xbf, 0xf9, 0x6b, 0x73, 0xee,
+	0x8f, 0xbf, 0x37, 0x6b, 0xe9, 0x0a, 0x21, 0xe5, 0xa1, 0x67, 0xef, 0x3b, 0x32, 0xfc, 0x19, 0xfc,
+	0xdf, 0x45, 0x73, 0xcc, 0xd4, 0x79, 0xbd, 0x0b, 0x1f, 0xae, 0xf7, 0x6e, 0xa5, 0x63, 0x5a, 0xf9,
+	0x53, 0xd0, 0xaa, 0x5a, 0x19, 0x29, 0x36, 0x95, 0xc2, 0x63, 0x85, 0x89, 0xfd, 0x88, 0x6e, 0xba,
+	0x88, 0x9b, 0x15, 0x2e, 0x9d, 0x82, 0x3d, 0x09, 0x28, 0xf8, 0x00, 0xc0, 0x21, 0xd7, 0x46, 0x2a,
+	0x4e, 0x70, 0x86, 0x98, 0x30, 0x8a, 0x33, 0x1d, 0xd5, 0x5d, 0x01, 0x6f, 0x9f, 0x49, 0xbe, 0xf3,
+	0x02, 0xf8, 0x1c, 0xac, 0x14, 0xa2, 0x2f, 0x05, 0xe5, 0x62, 0x50, 0x85, 0xd3, 0xf8, 0xf0, 0x70,
+	0x6e, 0x8d, 0xc9, 0x21, 0x90, 0x87, 0x60, 0x4d, 0xcb, 0x63, 0x83, 0x64, 0x6e, 0x90, 0xcd, 0x90,
+	0x19, 0x2a, 0xa6, 0x87, 0x32, 0xa3, 0x11, 0x70, 0xee, 0xaf, 0x5a, 0xe9, 0x5e, 0x6e, 0xf6, 0x0a,
+	0x73, 0x58, 0x89, 0xe0, 0xc7, 0x60, 0x59, 0xb1, 0x13, 0xac, 0x28, 0xa2, 0x4c, 0xc8, 0x91, 0x8e,
+	0x16, 0x5b, 0xf3, 0x9d, 0x46, 0xba, 0xe4, 0x2f, 0x7b, 0xee, 0x0e, 0x3e, 0x02, 0xe3, 0x62, 0xa3,
+	0x69, 0xf4, 0x92, 0x43, 0xdf, 0xa9, 0xa4, 0xe9, 0x04, 0xab, 0xfd, 0xa6, 0x0e, 0x96, 0xbe, 0x67,
+	0x82, 0x69, 0xae, 0x0f, 0x0c, 0x36, 0x0c, 0x7e, 0x0b, 0x16, 0x72, 0x37, 0x16, 0x6e, 0x16, 0x16,
+	0xb7, 0xdb, 0xf1, 0xd5, 0x6f, 0x46, 0xec, 0x07, 0x68, 0xe7, 0xba, 0x8d, 0x37, 0x0d, 0x3c, 0xf8,
+	0x39, 0x80, 0x63, 0x47, 0xfc, 0x6b, 0x81, 0x38, 0x75, 0x23, 0xd2, 0x48, 0x57, 0x2a, 0x49, 0xd7,
+	0x09, 0x76, 0x29, 0x8c, 0xc1, 0xea, 0x19, 0xda, 0x77, 0xb6, 0x85, 0xfb, 0x19, 0xb8, 0x3d, 0x86,
+	0x7b, 0xc9, 0x2e, 0x85, 0x1b, 0xa0, 0x21, 0xd8, 0x09, 0x72, 0xfe, 0xb8, 0x26, 0xaf, 0xa7, 0x75,
+	0xc1, 0x4e, 0xba, 0xf6, 0x0c, 0x11, 0xb8, 0x7b, 0xde, 0xb4, 0xb6, 0x51, 0x85, 0xce, 0xfe, 0x2c,
+	0xe6, 0x7d, 0x12, 0x4f, 0x3e, 0x63, 0xf1, 0xc4, 0xc3, 0x55, 0x6e, 0xc5, 0xde, 0x2b, 0x97, 0x88,
+	0x74, 0x75, 0xda, 0x55, 0x9f, 0x9d, 0x21, 0x88, 0xce, 0x0c, 0x48, 0xa1, 0x99, 0xd0, 0x85, 0x0e,
+	0x36, 0x7c, 0x97, 0xc7, 0xff, 0x69, 0xa3, 0xa2, 0x79, 0x33, 0xe3, 0xa2, 0x4d, 0xdf, 0xc3, 0x5f,
+	0xc0, 0xca, 0x08, 0x9b, 0x42, 0xb9, 0xbe, 0xc3, 0xe4, 0x15, 0x33, 0x3a, 0xba, 0xd9, 0x9a, 0xef,
+	0x2c, 0x6e, 0x3f, 0x98, 0x55, 0x91, 0x1f, 0x03, 0xe7, 0xe8, 0xa0, 0xbb, 0xef, 0x58, 0xa1, 0x38,
+	0xb7, 0x2a, 0x65, 0xfe, 0xd6, 0x36, 0xf6, 0x2d, 0x2e, 0xb8, 0xe1, 0x38, 0x43, 0x25, 0xce, 0x90,
+	0x66, 0x26, 0xaa, 0x3b, 0xf5, 0xad, 0x49, 0x7f, 0xed, 0x22, 0x88, 0x8f, 0x70, 0xc6, 0x29, 0x36,
+	0x52, 0xbd, 0xc8, 0x29, 0x36, 0x2c, 0x68, 0x5c, 0x0e, 0xf4, 0x23, 0x9c, 0x1d, 0x30, 0x03, 0x0d,
+	0x58, 0x1f, 0x32, 0x1b, 0x35, 0x32, 0xd2, 0x6a, 0xd4, 0xcc, 0xa0, 0xc2, 0xe1, 0x6d, 0x39, 0x1b,
+	0x4e, 0xf5, 0xf6, 0x2c, 0xcf, 0x9f, 0x3a, 0xf6, 0xa1, 0x3c, 0x72, 0x5c, 0x6f, 0x6a, 0xb7, 0x17,
+	0x8c, 0xad, 0x0d, 0x2f, 0x93, 0x52, 0x78, 0x0a, 0x3e, 0x92, 0x85, 0xd1, 0x06, 0xfb, 0x01, 0xa5,
+	0xf2, 0x44, 0xd8, 0xb7, 0x07, 0xe9, 0x0c, 0xeb, 0x21, 0x17, 0x83, 0x08, 0x38, 0xc3, 0xc9, 0x2c,
+	0xc3, 0x7b, 0x67, 0x0a, 0x7a, 0x81, 0x1f, 0xac, 0x6e, 0xc8, 0x8b, 0xa2, 0x83, 0xa0, 0x19, 0x2a,
+	0x10, 0xe5, 0xcc, 0x9b, 0x1d, 0x3f, 0x4d, 0x55, 0xa1, 0x16, 0x5d, 0x2b, 0xcc, 0x0c, 0xb7, 0x1b,
+	0x38, 0xbe, 0x1e, 0x3d, 0x6c, 0xf0, 0x33, 0xae, 0xab, 0x6a, 0xad, 0x05, 0xcd, 0xd3, 0x20, 0x0d,
+	0x7f, 0xab, 0x81, 0x66, 0x86, 0xb5, 0x99, 0xde, 0x1b, 0x6e, 0xed, 0x20, 0x9f, 0xa1, 0x68, 0xc9,
+	0x99, 0xfe, 0x6a, 0x96, 0xe9, 0x67, 0x58, 0x9b, 0xc9, 0x85, 0xb2, 0x63, 0xf9, 0x3e, 0xfd, 0x55,
+	0xe0, 0xd9, 0xd5, 0x10, 0xb8, 0x06, 0x16, 0x72, 0xc5, 0xba, 0xdd, 0xa3, 0x68, 0xd9, 0x8d, 0x5f,
+	0x38, 0xb5, 0x5f, 0x82, 0xb5, 0xcb, 0x6b, 0x68, 0x19, 0xc1, 0x3b, 0xfb, 0xa6, 0x5c, 0x4f, 0xc3,
+	0x09, 0x76, 0xc0, 0xca, 0x85, 0x4e, 0xb9, 0xe6, 0x10, 0xff, 0x2b, 0xa7, 0xea, 0xdc, 0x7e, 0x01,
+	0x56, 0x2f, 0x29, 0x13, 0xfc, 0x06, 0x6c, 0x94, 0x55, 0x73, 0x4e, 0xcc, 0xa3, 0x5d, 0x82, 0x4c,
+	0xfb, 0x17, 0xac, 0x91, 0xde, 0x1b, 0x43, 0xc6, 0x23, 0xf6, 0xd8, 0x03, 0xda, 0x5f, 0x82, 0x8d,
+	0x67, 0xb3, 0x23, 0x9d, 0xf0, 0x7b, 0xbe, 0xf2, 0xbb, 0x6d, 0xc0, 0xed, 0x0b, 0x73, 0x06, 0xef,
+	0x80, 0x1b, 0xa5, 0x26, 0xbb, 0x34, 0xc4, 0xe8, 0x0f, 0x70, 0x17, 0x2c, 0xfb, 0xc9, 0x33, 0xa7,
+	0x6e, 0x2b, 0xba, 0xf8, 0x16, 0xb7, 0xd7, 0x2f, 0x2c, 0x8f, 0xc3, 0xea, 0xff, 0xc4, 0x6f, 0x8f,
+	0xd7, 0x76, 0x7b, 0x2c, 0x55, 0x54, 0x2b, 0xdc, 0x79, 0xfe, 0xe6, 0x5d, 0xb3, 0xf6, 0xf6, 0x5d,
+	0xb3, 0xf6, 0xcf, 0xbb, 0x66, 0xed, 0xf5, 0xfb, 0xe6, 0xdc, 0xdb, 0xf7, 0xcd, 0xb9, 0x3f, 0xdf,
+	0x37, 0xe7, 0x5e, 0x3e, 0x1a, 0x70, 0x33, 0x2c, 0xfa, 0x31, 0x91, 0xa3, 0x84, 0x48, 0x3d, 0x92,
+	0x3a, 0x39, 0x2b, 0xff, 0x83, 0xf1, 0x5f, 0x52, 0xf9, 0x30, 0xf9, 0xd5, 0xfd, 0x2a, 0xb9, 0x3f,
+	0xbb, 0xfe, 0x82, 0xb3, 0xfd, 0xf0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x04, 0x66, 0x9a, 0xcf,
+	0x47, 0x0a, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
@@ -880,6 +989,70 @@ func (m *OutstandingDowntime) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
+func (m *LastTransmissionBlockHeight) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *LastTransmissionBlockHeight) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *LastTransmissionBlockHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.Height != 0 {
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(m.Height))
+		i--
+		dAtA[i] = 0x8
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *MaturingVSCPacket) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MaturingVSCPacket) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MaturingVSCPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	n9, err9 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.MaturityTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.MaturityTime):])
+	if err9 != nil {
+		return 0, err9
+	}
+	i -= n9
+	i = encodeVarintSharedConsumer(dAtA, i, uint64(n9))
+	i--
+	dAtA[i] = 0x12
+	if m.VscId != 0 {
+		i = encodeVarintSharedConsumer(dAtA, i, uint64(m.VscId))
+		i--
+		dAtA[i] = 0x8
+	}
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintSharedConsumer(dAtA []byte, offset int, v uint64) int {
 	offset -= sovSharedConsumer(v)
 	base := offset
@@ -1032,6 +1205,32 @@ func (m *OutstandingDowntime) Size() (n int) {
 	return n
 }
 
+func (m *LastTransmissionBlockHeight) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Height != 0 {
+		n += 1 + sovSharedConsumer(uint64(m.Height))
+	}
+	return n
+}
+
+func (m *MaturingVSCPacket) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.VscId != 0 {
+		n += 1 + sovSharedConsumer(uint64(m.VscId))
+	}
+	l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.MaturityTime)
+	n += 1 + l + sovSharedConsumer(uint64(l))
+	return n
+}
+
 func sovSharedConsumer(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -1684,7 +1883,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.MaturingPackets = append(m.MaturingPackets, types.MaturingVSCPacket{})
+			m.MaturingPackets = append(m.MaturingPackets, MaturingVSCPacket{})
 			if err := m.MaturingPackets[len(m.MaturingPackets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -1718,7 +1917,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.InitialValSet = append(m.InitialValSet, types1.ValidatorUpdate{})
+			m.InitialValSet = append(m.InitialValSet, types.ValidatorUpdate{})
 			if err := m.InitialValSet[len(m.InitialValSet)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -2068,6 +2267,177 @@ func (m *OutstandingDowntime) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *LastTransmissionBlockHeight) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowSharedConsumer
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: LastTransmissionBlockHeight: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: LastTransmissionBlockHeight: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
+			}
+			m.Height = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Height |= int64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		default:
+			iNdEx = preIndex
+			skippy, err := skipSharedConsumer(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MaturingVSCPacket) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowSharedConsumer
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MaturingVSCPacket: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MaturingVSCPacket: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field VscId", wireType)
+			}
+			m.VscId = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.VscId |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field MaturityTime", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.MaturityTime, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipSharedConsumer(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipSharedConsumer(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0

From d652827a3becff963ab886d3e74b25ed415286e8 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Mon, 14 Aug 2023 11:57:56 -0700
Subject: [PATCH 08/21] Update wire.proto

---
 proto/interchain_security/ccv/v1/wire.proto | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/proto/interchain_security/ccv/v1/wire.proto b/proto/interchain_security/ccv/v1/wire.proto
index 465ff14f24..a188117033 100644
--- a/proto/interchain_security/ccv/v1/wire.proto
+++ b/proto/interchain_security/ccv/v1/wire.proto
@@ -11,7 +11,8 @@ import "tendermint/abci/types.proto";
 
 //
 // Note any type defined in this file is used by both the consumer and provider
-// AND SENT OVER THE WIRE. Ideally these schemas should never change. 
+// AND SENT OVER THE WIRE. Ideally these schemas should never change, or at least 
+// be backwards compatible if ever changed. 
 // 
 
 // This packet is sent from provider chain to consumer chain if the validator

From 41f60d4c0e9143d95a20bf7accf364147df1f366 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Mon, 14 Aug 2023 12:03:27 -0700
Subject: [PATCH 09/21] comments

---
 proto/interchain_security/ccv/consumer/v1/consumer.proto | 6 ++++++
 proto/interchain_security/ccv/provider/v1/genesis.proto  | 2 ++
 proto/interchain_security/ccv/provider/v1/provider.proto | 7 +++++++
 proto/interchain_security/ccv/v1/shared_consumer.proto   | 2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/proto/interchain_security/ccv/consumer/v1/consumer.proto b/proto/interchain_security/ccv/consumer/v1/consumer.proto
index 3b9704dddd..a7d2ce0ff2 100644
--- a/proto/interchain_security/ccv/consumer/v1/consumer.proto
+++ b/proto/interchain_security/ccv/consumer/v1/consumer.proto
@@ -10,6 +10,12 @@ import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
 import "google/protobuf/duration.proto";
 
+
+//
+// Note any type defined in this file is ONLY used internally to the consumer CCV module.
+// These schemas can change with proper consideration of compatibility or migration. 
+// 
+
 // CrossChainValidator defines the type used to store validator information internal 
 // to the consumer CCV module.  Note one cross chain validator entry is persisted for
 // each consumer validator, where incoming VSC packets update this data, which is eventually
diff --git a/proto/interchain_security/ccv/provider/v1/genesis.proto b/proto/interchain_security/ccv/provider/v1/genesis.proto
index 22da5c4200..c7ea70a39f 100644
--- a/proto/interchain_security/ccv/provider/v1/genesis.proto
+++ b/proto/interchain_security/ccv/provider/v1/genesis.proto
@@ -11,6 +11,8 @@ import "interchain_security/ccv/provider/v1/provider.proto";
 import "tendermint/crypto/keys.proto";
 
 // GenesisState defines the CCV provider chain genesis state
+// 
+// TODO: Change to ProviderGenesisState for consistency with consumer, or create issue for this.
 message GenesisState {
   // strictly positive and set to 1 (DefaultValsetUpdateID) for a new chain
   uint64 valset_update_id = 1;
diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto
index 9e5af0a417..8ecc355896 100644
--- a/proto/interchain_security/ccv/provider/v1/provider.proto
+++ b/proto/interchain_security/ccv/provider/v1/provider.proto
@@ -15,6 +15,11 @@ import "tendermint/crypto/keys.proto";
 import "cosmos/evidence/v1beta1/evidence.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
+//
+// Note any type defined in this file is ONLY used internally to the provider CCV module.
+// These schemas can change with proper consideration of compatibility or migration. 
+// 
+
 // ConsumerAdditionProposal is a governance proposal on the provider chain to
 // spawn a new consumer chain. If it passes, then all validators on the provider
 // chain are expected to validate the consumer chain at spawn time or get
@@ -141,6 +146,8 @@ message GlobalSlashEntry {
 // Params defines the parameters for CCV Provider module
 // 
 // Note this type is only used internally to the provider CCV module. 
+//
+// TODO: change to ProviderParams for consistency with consumer, or create issue for this.
 message Params {
   ibc.lightclients.tendermint.v1.ClientState template_client = 1;
   // TrustingPeriodFraction is used to compute the consumer and provider IBC
diff --git a/proto/interchain_security/ccv/v1/shared_consumer.proto b/proto/interchain_security/ccv/v1/shared_consumer.proto
index 3f161ad978..930fc4d8eb 100644
--- a/proto/interchain_security/ccv/v1/shared_consumer.proto
+++ b/proto/interchain_security/ccv/v1/shared_consumer.proto
@@ -17,7 +17,7 @@ import "google/protobuf/timestamp.proto";
 // but not sent over the wire. These schemas could change, only with careful consideration of effects!
 //
 
-// TODO: rename to ConsumerParams (make issue)
+// TODO: rename to ConsumerParams (or make issue)
 // 
 // Params defines the parameters for CCV consumer module.
 // 

From ea1bb3ed55be7180b91b142bb45a6374ec36b391 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Mon, 14 Aug 2023 12:11:38 -0700
Subject: [PATCH 10/21] dun builds

---
 .../ccv/consumer/v1/consumer.proto            |   4 +-
 .../ccv/v1/shared_consumer.proto              |   3 +-
 x/ccv/consumer/types/consumer.pb.go           | 462 +++++++++-
 x/ccv/consumer/types/query.pb.go              | 782 ++++++++++++++++-
 x/ccv/provider/types/genesis.pb.go            | 243 ++++--
 x/ccv/provider/types/provider.pb.go           | 454 +++++++---
 x/ccv/types/shared_consumer.pb.go             | 158 ++--
 x/ccv/types/wire.pb.go                        | 805 ++++++++++++++----
 8 files changed, 2435 insertions(+), 476 deletions(-)

diff --git a/proto/interchain_security/ccv/consumer/v1/consumer.proto b/proto/interchain_security/ccv/consumer/v1/consumer.proto
index a7d2ce0ff2..90700513cc 100644
--- a/proto/interchain_security/ccv/consumer/v1/consumer.proto
+++ b/proto/interchain_security/ccv/consumer/v1/consumer.proto
@@ -9,7 +9,7 @@ import "google/protobuf/any.proto";
 import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
 import "google/protobuf/duration.proto";
-
+import "google/protobuf/timestamp.proto";
 
 //
 // Note any type defined in this file is ONLY used internally to the consumer CCV module.
@@ -37,7 +37,7 @@ message CrossChainValidator {
 // Note this type is is only used internally to the consumer CCV module 
 // for exporting / importing state in InitGenesis and ExportGenesis. 
 message ConsumerPacketDataList {
-  repeated ConsumerPacketData list = 1 [ (gogoproto.nullable) = false ];
+  repeated interchain_security.ccv.v1.ConsumerPacketData list = 1 [ (gogoproto.nullable) = false ];
 }
 
 // A record storing the state of a slash packet sent to the provider chain
diff --git a/proto/interchain_security/ccv/v1/shared_consumer.proto b/proto/interchain_security/ccv/v1/shared_consumer.proto
index 930fc4d8eb..3f5a218f03 100644
--- a/proto/interchain_security/ccv/v1/shared_consumer.proto
+++ b/proto/interchain_security/ccv/v1/shared_consumer.proto
@@ -11,6 +11,7 @@ import "google/protobuf/duration.proto";
 import "gogoproto/gogo.proto";
 import "interchain_security/ccv/v1/wire.proto";
 import "google/protobuf/timestamp.proto";
+import "interchain_security/ccv/consumer/v1/consumer.proto";
 
 //
 // Note any type defined in this file is referenced/persisted in both the consumer and provider CCV modules,
@@ -109,7 +110,7 @@ message GenesisState {
     repeated OutstandingDowntime outstanding_downtime_slashing = 10
         [ (gogoproto.nullable) = false ];
     // PendingConsumerPackets nil on new chain, filled in on restart.
-    interchain_security.ccv.v1.ConsumerPacketDataList pending_consumer_packets =
+    interchain_security.ccv.consumer.v1.ConsumerPacketDataList pending_consumer_packets =
         11 [ (gogoproto.nullable) = false ];
     // LastTransmissionBlockHeight nil on new chain, filled in on restart.
     LastTransmissionBlockHeight
diff --git a/x/ccv/consumer/types/consumer.pb.go b/x/ccv/consumer/types/consumer.pb.go
index dcb9854535..e83fd1ba2a 100644
--- a/x/ccv/consumer/types/consumer.pb.go
+++ b/x/ccv/consumer/types/consumer.pb.go
@@ -9,17 +9,21 @@ import (
 	types "github.com/cosmos/cosmos-sdk/codec/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
-	_ "github.com/cosmos/interchain-security/v3/x/ccv/types"
+	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
+	types1 "github.com/cosmos/interchain-security/v3/x/ccv/types"
 	_ "google.golang.org/protobuf/types/known/durationpb"
+	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
 	math "math"
 	math_bits "math/bits"
+	time "time"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
+var _ = time.Kitchen
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
@@ -31,6 +35,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // to the consumer CCV module.  Note one cross chain validator entry is persisted for
 // each consumer validator, where incoming VSC packets update this data, which is eventually
 // forwarded to comet for consumer chain consensus.
+//
+// Note this type is only used internally to the consumer CCV module.
 type CrossChainValidator struct {
 	Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
 	Power   int64  `protobuf:"varint,2,opt,name=power,proto3" json:"power,omitempty"`
@@ -92,8 +98,114 @@ func (m *CrossChainValidator) GetPubkey() *types.Any {
 	return nil
 }
 
+// ConsumerPacketDataList is a list of consumer packet data packets.
+//
+// Note this type is is only used internally to the consumer CCV module
+// for exporting / importing state in InitGenesis and ExportGenesis.
+type ConsumerPacketDataList struct {
+	List []types1.ConsumerPacketData `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
+}
+
+func (m *ConsumerPacketDataList) Reset()         { *m = ConsumerPacketDataList{} }
+func (m *ConsumerPacketDataList) String() string { return proto.CompactTextString(m) }
+func (*ConsumerPacketDataList) ProtoMessage()    {}
+func (*ConsumerPacketDataList) Descriptor() ([]byte, []int) {
+	return fileDescriptor_5b27a82b276e7f93, []int{1}
+}
+func (m *ConsumerPacketDataList) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ConsumerPacketDataList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_ConsumerPacketDataList.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *ConsumerPacketDataList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConsumerPacketDataList.Merge(m, src)
+}
+func (m *ConsumerPacketDataList) XXX_Size() int {
+	return m.Size()
+}
+func (m *ConsumerPacketDataList) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConsumerPacketDataList.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ConsumerPacketDataList proto.InternalMessageInfo
+
+func (m *ConsumerPacketDataList) GetList() []types1.ConsumerPacketData {
+	if m != nil {
+		return m.List
+	}
+	return nil
+}
+
+// A record storing the state of a slash packet sent to the provider chain
+// which may bounce back and forth until handled by the provider.
+//
+// Note this type is only used internally to the consumer CCV module.
+type SlashRecord struct {
+	WaitingOnReply bool      `protobuf:"varint,1,opt,name=waiting_on_reply,json=waitingOnReply,proto3" json:"waiting_on_reply,omitempty"`
+	SendTime       time.Time `protobuf:"bytes,2,opt,name=send_time,json=sendTime,proto3,stdtime" json:"send_time"`
+}
+
+func (m *SlashRecord) Reset()         { *m = SlashRecord{} }
+func (m *SlashRecord) String() string { return proto.CompactTextString(m) }
+func (*SlashRecord) ProtoMessage()    {}
+func (*SlashRecord) Descriptor() ([]byte, []int) {
+	return fileDescriptor_5b27a82b276e7f93, []int{2}
+}
+func (m *SlashRecord) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *SlashRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_SlashRecord.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *SlashRecord) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SlashRecord.Merge(m, src)
+}
+func (m *SlashRecord) XXX_Size() int {
+	return m.Size()
+}
+func (m *SlashRecord) XXX_DiscardUnknown() {
+	xxx_messageInfo_SlashRecord.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SlashRecord proto.InternalMessageInfo
+
+func (m *SlashRecord) GetWaitingOnReply() bool {
+	if m != nil {
+		return m.WaitingOnReply
+	}
+	return false
+}
+
+func (m *SlashRecord) GetSendTime() time.Time {
+	if m != nil {
+		return m.SendTime
+	}
+	return time.Time{}
+}
+
 func init() {
 	proto.RegisterType((*CrossChainValidator)(nil), "interchain_security.ccv.consumer.v1.CrossChainValidator")
+	proto.RegisterType((*ConsumerPacketDataList)(nil), "interchain_security.ccv.consumer.v1.ConsumerPacketDataList")
+	proto.RegisterType((*SlashRecord)(nil), "interchain_security.ccv.consumer.v1.SlashRecord")
 }
 
 func init() {
@@ -101,29 +213,37 @@ func init() {
 }
 
 var fileDescriptor_5b27a82b276e7f93 = []byte{
-	// 346 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x51, 0x3d, 0x4e, 0xeb, 0x40,
-	0x18, 0xcc, 0xbe, 0xe8, 0xe5, 0x49, 0x7e, 0xaf, 0xf2, 0xb3, 0x84, 0x49, 0x61, 0xa2, 0x20, 0xa4,
-	0x34, 0xd9, 0x55, 0x92, 0x0e, 0x89, 0x82, 0xa4, 0xa4, 0x41, 0x29, 0x40, 0xa2, 0x89, 0xd6, 0xeb,
-	0xc5, 0xb1, 0x88, 0xf7, 0xb3, 0xf6, 0xc7, 0x61, 0x6f, 0xc1, 0x31, 0x38, 0x00, 0x87, 0x40, 0x54,
-	0x29, 0xa9, 0x10, 0x4a, 0x6e, 0xc0, 0x09, 0x50, 0xb2, 0x4e, 0x10, 0x08, 0xba, 0x19, 0x8d, 0x67,
-	0xbe, 0xf1, 0xac, 0xd7, 0xcf, 0x84, 0xe6, 0x92, 0x4d, 0x69, 0x26, 0x26, 0x8a, 0x33, 0x23, 0x33,
-	0x6d, 0x09, 0x63, 0x25, 0x61, 0x20, 0x94, 0xc9, 0xb9, 0x24, 0x65, 0x6f, 0x87, 0x71, 0x21, 0x41,
-	0x83, 0x7f, 0xf8, 0x8d, 0x07, 0x33, 0x56, 0xe2, 0xdd, 0x77, 0x65, 0xaf, 0x79, 0xf4, 0x53, 0x70,
-	0xd9, 0x23, 0xf3, 0x4c, 0x72, 0x97, 0xd5, 0xdc, 0x4f, 0x01, 0xd2, 0x19, 0x27, 0x1b, 0x16, 0x9b,
-	0x6b, 0x42, 0x85, 0xad, 0xa4, 0x20, 0x85, 0x14, 0x36, 0x90, 0xac, 0xd1, 0xd6, 0xc0, 0x40, 0xe5,
-	0xa0, 0x26, 0x4e, 0x70, 0xa4, 0x92, 0xa2, 0xaf, 0x59, 0x89, 0x91, 0x54, 0x67, 0x20, 0x9c, 0xde,
-	0xbe, 0x47, 0xde, 0xff, 0x91, 0x04, 0xa5, 0x46, 0xeb, 0x56, 0x17, 0x74, 0x96, 0x25, 0x54, 0x83,
-	0xf4, 0x43, 0xef, 0x0f, 0x4d, 0x12, 0xc9, 0x95, 0x0a, 0x51, 0x0b, 0x75, 0xfe, 0x8d, 0xb7, 0xd4,
-	0x0f, 0xbc, 0xdf, 0x05, 0xcc, 0xb9, 0x0c, 0x7f, 0xb5, 0x50, 0xa7, 0x3e, 0x76, 0xc4, 0xa7, 0x5e,
-	0xa3, 0x30, 0xf1, 0x0d, 0xb7, 0x61, 0xbd, 0x85, 0x3a, 0x7f, 0xfb, 0x01, 0x76, 0x87, 0xf1, 0xf6,
-	0x30, 0x3e, 0x15, 0x76, 0x38, 0x78, 0x7b, 0x39, 0xd8, 0xb3, 0x34, 0x9f, 0x1d, 0xb7, 0xd7, 0xbb,
-	0x70, 0xa1, 0x8c, 0x9a, 0x38, 0x5f, 0xfb, 0xe9, 0xa1, 0x1b, 0x54, 0xd5, 0x99, 0xb4, 0x85, 0x06,
-	0x7c, 0x6e, 0xe2, 0x33, 0x6e, 0xc7, 0x55, 0xf0, 0xf0, 0xf2, 0x71, 0x19, 0xa1, 0xc5, 0x32, 0x42,
-	0xaf, 0xcb, 0x08, 0xdd, 0xad, 0xa2, 0xda, 0x62, 0x15, 0xd5, 0x9e, 0x57, 0x51, 0xed, 0xea, 0x24,
-	0xcd, 0xf4, 0xd4, 0xc4, 0x98, 0x41, 0x5e, 0xfd, 0x3d, 0xf9, 0x58, 0xba, 0xbb, 0x5b, 0xba, 0x1c,
-	0x90, 0xdb, 0xcf, 0xef, 0xa8, 0x6d, 0xc1, 0x55, 0xdc, 0xd8, 0x74, 0x1c, 0xbc, 0x07, 0x00, 0x00,
-	0xff, 0xff, 0x0f, 0xc7, 0xd1, 0x61, 0xf8, 0x01, 0x00, 0x00,
+	// 479 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x4d, 0x8e, 0xd3, 0x30,
+	0x18, 0xad, 0xe9, 0x30, 0x14, 0x17, 0x21, 0x14, 0x2a, 0x08, 0x5d, 0xa4, 0x55, 0x10, 0x52, 0x36,
+	0xe3, 0xa8, 0xed, 0x0e, 0x89, 0xc5, 0xb4, 0x2c, 0x90, 0x40, 0x62, 0x14, 0x10, 0x48, 0x6c, 0x22,
+	0xc7, 0x31, 0xa9, 0x35, 0x89, 0x1d, 0xd9, 0x4e, 0x8a, 0x39, 0xc5, 0x1c, 0x83, 0x03, 0x70, 0x88,
+	0x11, 0xab, 0x59, 0xb2, 0x1a, 0x50, 0x7b, 0x03, 0x4e, 0x80, 0xf2, 0xd3, 0x22, 0x66, 0xa6, 0xbb,
+	0xef, 0xf9, 0xf9, 0xbd, 0xcf, 0x7e, 0xdf, 0x07, 0xa7, 0x8c, 0x6b, 0x2a, 0xc9, 0x12, 0x33, 0x1e,
+	0x2a, 0x4a, 0x0a, 0xc9, 0xb4, 0xf1, 0x09, 0x29, 0x7d, 0x22, 0xb8, 0x2a, 0x32, 0x2a, 0xfd, 0x72,
+	0xb2, 0xab, 0x51, 0x2e, 0x85, 0x16, 0xd6, 0xd3, 0x1b, 0x34, 0x88, 0x90, 0x12, 0xed, 0xee, 0x95,
+	0x93, 0xe1, 0xb3, 0x7d, 0xc6, 0xe5, 0xc4, 0x5f, 0x31, 0x49, 0x1b, 0xaf, 0xe1, 0x93, 0x44, 0x88,
+	0x24, 0xa5, 0x7e, 0x8d, 0xa2, 0xe2, 0xb3, 0x8f, 0xb9, 0x69, 0xa9, 0x41, 0x22, 0x12, 0x51, 0x97,
+	0x7e, 0x55, 0x6d, 0x05, 0x44, 0xa8, 0x4c, 0xa8, 0xb0, 0x21, 0x1a, 0xd0, 0x52, 0xce, 0x55, 0xaf,
+	0xb8, 0x90, 0x58, 0x33, 0xc1, 0x5b, 0x7e, 0x74, 0x95, 0xd7, 0x2c, 0xa3, 0x4a, 0xe3, 0x2c, 0x6f,
+	0x2e, 0xb8, 0xdf, 0x00, 0x7c, 0xb8, 0x90, 0x42, 0xa9, 0x45, 0xf5, 0xec, 0x0f, 0x38, 0x65, 0x31,
+	0xd6, 0x42, 0x5a, 0x36, 0xbc, 0x83, 0xe3, 0x58, 0x52, 0xa5, 0x6c, 0x30, 0x06, 0xde, 0xbd, 0x60,
+	0x0b, 0xad, 0x01, 0xbc, 0x9d, 0x8b, 0x15, 0x95, 0xf6, 0xad, 0x31, 0xf0, 0xba, 0x41, 0x03, 0x2c,
+	0x0c, 0x0f, 0xf3, 0x22, 0x3a, 0xa5, 0xc6, 0xee, 0x8e, 0x81, 0xd7, 0x9f, 0x0e, 0x50, 0xd3, 0x19,
+	0x6d, 0x3b, 0xa3, 0x63, 0x6e, 0xe6, 0xb3, 0x3f, 0x97, 0xa3, 0xc7, 0x06, 0x67, 0xe9, 0x73, 0xb7,
+	0x0a, 0x8e, 0x72, 0x55, 0xa8, 0xb0, 0xd1, 0xb9, 0x3f, 0xbe, 0x1f, 0x0d, 0xda, 0xbf, 0x11, 0x69,
+	0x72, 0x2d, 0xd0, 0x49, 0x11, 0xbd, 0xa6, 0x26, 0x68, 0x8d, 0xdd, 0x08, 0x3e, 0x5a, 0xb4, 0x69,
+	0x9f, 0x60, 0x72, 0x4a, 0xf5, 0x4b, 0xac, 0xf1, 0x1b, 0xa6, 0xb4, 0xf5, 0x0a, 0x1e, 0xa4, 0x4c,
+	0x69, 0x1b, 0x8c, 0xbb, 0x5e, 0x7f, 0x8a, 0xd0, 0xbe, 0x61, 0x95, 0x13, 0x74, 0xdd, 0x61, 0x7e,
+	0x70, 0x7e, 0x39, 0xea, 0x04, 0xb5, 0x83, 0xfb, 0x15, 0xf6, 0xdf, 0xa5, 0x58, 0x2d, 0x03, 0x4a,
+	0x84, 0x8c, 0x2d, 0x0f, 0x3e, 0x58, 0x61, 0xa6, 0x19, 0x4f, 0x42, 0xc1, 0x43, 0x49, 0xf3, 0xd4,
+	0xd4, 0x71, 0xf4, 0x82, 0xfb, 0xed, 0xf9, 0x5b, 0x1e, 0x54, 0xa7, 0xd6, 0x31, 0xbc, 0xab, 0x28,
+	0x8f, 0xc3, 0x2a, 0xdf, 0x3a, 0x99, 0xfe, 0x74, 0x78, 0x2d, 0x82, 0xf7, 0xdb, 0xf0, 0xe7, 0xbd,
+	0xaa, 0xe7, 0xd9, 0xaf, 0x11, 0x08, 0x7a, 0x95, 0xac, 0x22, 0xe6, 0x1f, 0xcf, 0xd7, 0x0e, 0xb8,
+	0x58, 0x3b, 0xe0, 0xf7, 0xda, 0x01, 0x67, 0x1b, 0xa7, 0x73, 0xb1, 0x71, 0x3a, 0x3f, 0x37, 0x4e,
+	0xe7, 0xd3, 0x8b, 0x84, 0xe9, 0x65, 0x11, 0x21, 0x22, 0xb2, 0x76, 0xfc, 0xfe, 0xbf, 0x2f, 0x1e,
+	0xed, 0x56, 0xad, 0x9c, 0xf9, 0x5f, 0xfe, 0x5f, 0x64, 0x6d, 0x72, 0xaa, 0xa2, 0xc3, 0xfa, 0x01,
+	0xb3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xcb, 0xdf, 0xa0, 0xf9, 0x02, 0x00, 0x00,
 }
 
 func (m *CrossChainValidator) Marshal() (dAtA []byte, err error) {
@@ -173,6 +293,84 @@ func (m *CrossChainValidator) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
+func (m *ConsumerPacketDataList) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *ConsumerPacketDataList) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ConsumerPacketDataList) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.List) > 0 {
+		for iNdEx := len(m.List) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.List[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintConsumer(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0xa
+		}
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *SlashRecord) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *SlashRecord) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *SlashRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	n2, err2 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.SendTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.SendTime):])
+	if err2 != nil {
+		return 0, err2
+	}
+	i -= n2
+	i = encodeVarintConsumer(dAtA, i, uint64(n2))
+	i--
+	dAtA[i] = 0x12
+	if m.WaitingOnReply {
+		i--
+		if m.WaitingOnReply {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x8
+	}
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintConsumer(dAtA []byte, offset int, v uint64) int {
 	offset -= sovConsumer(v)
 	base := offset
@@ -204,6 +402,35 @@ func (m *CrossChainValidator) Size() (n int) {
 	return n
 }
 
+func (m *ConsumerPacketDataList) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.List) > 0 {
+		for _, e := range m.List {
+			l = e.Size()
+			n += 1 + l + sovConsumer(uint64(l))
+		}
+	}
+	return n
+}
+
+func (m *SlashRecord) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.WaitingOnReply {
+		n += 2
+	}
+	l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.SendTime)
+	n += 1 + l + sovConsumer(uint64(l))
+	return n
+}
+
 func sovConsumer(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -349,6 +576,193 @@ func (m *CrossChainValidator) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowConsumer
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: ConsumerPacketDataList: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: ConsumerPacketDataList: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field List", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.List = append(m.List, types1.ConsumerPacketData{})
+			if err := m.List[len(m.List)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipConsumer(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthConsumer
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *SlashRecord) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowConsumer
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: SlashRecord: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: SlashRecord: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field WaitingOnReply", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.WaitingOnReply = bool(v != 0)
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field SendTime", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.SendTime, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipConsumer(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthConsumer
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipConsumer(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/x/ccv/consumer/types/query.pb.go b/x/ccv/consumer/types/query.pb.go
index 391bf5e6a6..5ed38da3f8 100644
--- a/x/ccv/consumer/types/query.pb.go
+++ b/x/ccv/consumer/types/query.pb.go
@@ -296,12 +296,171 @@ func (m *QueryParamsResponse) GetParams() types.Params {
 	return types.Params{}
 }
 
+type QueryProviderInfoRequest struct {
+}
+
+func (m *QueryProviderInfoRequest) Reset()         { *m = QueryProviderInfoRequest{} }
+func (m *QueryProviderInfoRequest) String() string { return proto.CompactTextString(m) }
+func (*QueryProviderInfoRequest) ProtoMessage()    {}
+func (*QueryProviderInfoRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_f627751d3cc10225, []int{5}
+}
+func (m *QueryProviderInfoRequest) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *QueryProviderInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_QueryProviderInfoRequest.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *QueryProviderInfoRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryProviderInfoRequest.Merge(m, src)
+}
+func (m *QueryProviderInfoRequest) XXX_Size() int {
+	return m.Size()
+}
+func (m *QueryProviderInfoRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryProviderInfoRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryProviderInfoRequest proto.InternalMessageInfo
+
+type QueryProviderInfoResponse struct {
+	Consumer ChainInfo `protobuf:"bytes,1,opt,name=consumer,proto3" json:"consumer"`
+	Provider ChainInfo `protobuf:"bytes,2,opt,name=provider,proto3" json:"provider"`
+}
+
+func (m *QueryProviderInfoResponse) Reset()         { *m = QueryProviderInfoResponse{} }
+func (m *QueryProviderInfoResponse) String() string { return proto.CompactTextString(m) }
+func (*QueryProviderInfoResponse) ProtoMessage()    {}
+func (*QueryProviderInfoResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_f627751d3cc10225, []int{6}
+}
+func (m *QueryProviderInfoResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *QueryProviderInfoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_QueryProviderInfoResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *QueryProviderInfoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryProviderInfoResponse.Merge(m, src)
+}
+func (m *QueryProviderInfoResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *QueryProviderInfoResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryProviderInfoResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_QueryProviderInfoResponse proto.InternalMessageInfo
+
+func (m *QueryProviderInfoResponse) GetConsumer() ChainInfo {
+	if m != nil {
+		return m.Consumer
+	}
+	return ChainInfo{}
+}
+
+func (m *QueryProviderInfoResponse) GetProvider() ChainInfo {
+	if m != nil {
+		return m.Provider
+	}
+	return ChainInfo{}
+}
+
+type ChainInfo struct {
+	ChainID      string `protobuf:"bytes,1,opt,name=chainID,proto3" json:"chainID,omitempty"`
+	ClientID     string `protobuf:"bytes,2,opt,name=clientID,proto3" json:"clientID,omitempty"`
+	ConnectionID string `protobuf:"bytes,3,opt,name=connectionID,proto3" json:"connectionID,omitempty"`
+	ChannelID    string `protobuf:"bytes,4,opt,name=channelID,proto3" json:"channelID,omitempty"`
+}
+
+func (m *ChainInfo) Reset()         { *m = ChainInfo{} }
+func (m *ChainInfo) String() string { return proto.CompactTextString(m) }
+func (*ChainInfo) ProtoMessage()    {}
+func (*ChainInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_f627751d3cc10225, []int{7}
+}
+func (m *ChainInfo) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ChainInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_ChainInfo.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *ChainInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChainInfo.Merge(m, src)
+}
+func (m *ChainInfo) XXX_Size() int {
+	return m.Size()
+}
+func (m *ChainInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_ChainInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ChainInfo proto.InternalMessageInfo
+
+func (m *ChainInfo) GetChainID() string {
+	if m != nil {
+		return m.ChainID
+	}
+	return ""
+}
+
+func (m *ChainInfo) GetClientID() string {
+	if m != nil {
+		return m.ClientID
+	}
+	return ""
+}
+
+func (m *ChainInfo) GetConnectionID() string {
+	if m != nil {
+		return m.ConnectionID
+	}
+	return ""
+}
+
+func (m *ChainInfo) GetChannelID() string {
+	if m != nil {
+		return m.ChannelID
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*NextFeeDistributionEstimate)(nil), "interchain_security.ccv.consumer.v1.NextFeeDistributionEstimate")
 	proto.RegisterType((*QueryNextFeeDistributionEstimateRequest)(nil), "interchain_security.ccv.consumer.v1.QueryNextFeeDistributionEstimateRequest")
 	proto.RegisterType((*QueryNextFeeDistributionEstimateResponse)(nil), "interchain_security.ccv.consumer.v1.QueryNextFeeDistributionEstimateResponse")
 	proto.RegisterType((*QueryParamsRequest)(nil), "interchain_security.ccv.consumer.v1.QueryParamsRequest")
 	proto.RegisterType((*QueryParamsResponse)(nil), "interchain_security.ccv.consumer.v1.QueryParamsResponse")
+	proto.RegisterType((*QueryProviderInfoRequest)(nil), "interchain_security.ccv.consumer.v1.QueryProviderInfoRequest")
+	proto.RegisterType((*QueryProviderInfoResponse)(nil), "interchain_security.ccv.consumer.v1.QueryProviderInfoResponse")
+	proto.RegisterType((*ChainInfo)(nil), "interchain_security.ccv.consumer.v1.ChainInfo")
 }
 
 func init() {
@@ -309,41 +468,50 @@ func init() {
 }
 
 var fileDescriptor_f627751d3cc10225 = []byte{
-	// 536 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x6b, 0x13, 0x41,
-	0x14, 0xce, 0xe6, 0x97, 0x38, 0xc5, 0xcb, 0x18, 0x61, 0x89, 0xb2, 0x96, 0x55, 0x30, 0x0a, 0xd9,
-	0x69, 0x92, 0x43, 0xf5, 0x20, 0x96, 0xaa, 0xc5, 0x83, 0x4a, 0x0d, 0x42, 0xc1, 0x4b, 0x98, 0x4c,
-	0x5e, 0x37, 0x03, 0xc9, 0x4e, 0x3a, 0x33, 0xbb, 0x24, 0x37, 0xf1, 0x0f, 0x10, 0xc1, 0xff, 0xc4,
-	0x8b, 0xff, 0x42, 0x8f, 0x05, 0x2f, 0x9e, 0x44, 0x12, 0xff, 0x08, 0x8f, 0xb2, 0xb3, 0xbb, 0x75,
-	0x03, 0xa6, 0x89, 0xd0, 0xdb, 0xe4, 0xfb, 0xde, 0xfb, 0xe6, 0x7b, 0xdf, 0xbc, 0x2c, 0x22, 0x3c,
-	0xd0, 0x20, 0xd9, 0x90, 0xf2, 0xa0, 0xa7, 0x80, 0x85, 0x92, 0xeb, 0x19, 0x61, 0x2c, 0x22, 0x4c,
-	0x04, 0x2a, 0x1c, 0x83, 0x24, 0x51, 0x8b, 0x9c, 0x84, 0x20, 0x67, 0xde, 0x44, 0x0a, 0x2d, 0xf0,
-	0x9d, 0x7f, 0x34, 0x78, 0x8c, 0x45, 0x5e, 0xd6, 0xe0, 0x45, 0xad, 0xfa, 0xce, 0x2a, 0xd5, 0xa8,
-	0x45, 0xd4, 0x90, 0x4a, 0x18, 0xf4, 0xce, 0xcb, 0x8d, 0x6c, 0xbd, 0xe6, 0x0b, 0x5f, 0x98, 0x23,
-	0x89, 0x4f, 0x29, 0x7a, 0xcb, 0x17, 0xc2, 0x1f, 0x01, 0xa1, 0x13, 0x4e, 0x68, 0x10, 0x08, 0x4d,
-	0x35, 0x17, 0x81, 0x4a, 0xd9, 0xf6, 0x26, 0xde, 0x97, 0xef, 0x71, 0x3f, 0x16, 0xd1, 0xcd, 0xd7,
-	0x30, 0xd5, 0x07, 0x00, 0xcf, 0xb8, 0xd2, 0x92, 0xf7, 0xc3, 0x58, 0xf2, 0xb9, 0xd2, 0x7c, 0x4c,
-	0x35, 0xe0, 0xbb, 0xe8, 0x1a, 0x0b, 0xa5, 0x84, 0x40, 0xbf, 0x00, 0xee, 0x0f, 0xb5, 0x6d, 0x6d,
-	0x5b, 0x8d, 0x52, 0x77, 0x19, 0xc4, 0x0e, 0x42, 0x23, 0xaa, 0xb2, 0x92, 0xa2, 0x29, 0xc9, 0x21,
-	0x31, 0x1f, 0xc0, 0x34, 0xe3, 0x4b, 0x09, 0xff, 0x17, 0xc1, 0x1d, 0x74, 0x63, 0x90, 0xbb, 0xbd,
-	0x77, 0x2c, 0x29, 0x8b, 0x0f, 0x76, 0x79, 0xdb, 0x6a, 0x5c, 0xed, 0xd6, 0xf2, 0xe4, 0x41, 0xca,
-	0xe1, 0x1a, 0xaa, 0x68, 0xa1, 0xe9, 0xc8, 0xae, 0x98, 0xa2, 0xe4, 0x47, 0x7c, 0x95, 0x16, 0x87,
-	0x52, 0x44, 0x7c, 0x00, 0xd2, 0xae, 0x1a, 0x2a, 0x87, 0x24, 0xfc, 0xd3, 0x34, 0x04, 0xfb, 0x4a,
-	0xc6, 0x67, 0x88, 0x7b, 0x1f, 0xdd, 0x7b, 0x13, 0x3f, 0xef, 0x05, 0xa1, 0x74, 0xe1, 0x24, 0x04,
-	0xa5, 0xdd, 0xf7, 0x16, 0x6a, 0xac, 0xaf, 0x55, 0x13, 0x11, 0x28, 0xc0, 0x6f, 0x51, 0x79, 0x40,
-	0x35, 0x35, 0xf9, 0x6d, 0xb5, 0xf7, 0xbc, 0x0d, 0xd6, 0xc6, 0xbb, 0x48, 0xd7, 0xa8, 0xb9, 0x35,
-	0x84, 0x8d, 0x83, 0x43, 0x2a, 0xe9, 0x58, 0x65, 0xc6, 0x8e, 0xd0, 0xf5, 0x25, 0x34, 0xb5, 0xb0,
-	0x87, 0xaa, 0x13, 0x83, 0xa4, 0x26, 0xdc, 0x95, 0x26, 0xa2, 0x96, 0x97, 0xf4, 0xee, 0x97, 0x4f,
-	0x7f, 0xdc, 0x2e, 0x74, 0xd3, 0xbe, 0xf6, 0xd7, 0x12, 0xaa, 0x18, 0x65, 0xfc, 0xdb, 0x42, 0xf6,
-	0xaa, 0xd9, 0xf1, 0xcb, 0x8d, 0xa6, 0xdb, 0x30, 0xe6, 0xfa, 0xab, 0x4b, 0x52, 0x4b, 0x52, 0x70,
-	0x9f, 0x7c, 0xf8, 0xf6, 0xeb, 0x73, 0xf1, 0x11, 0xde, 0x5d, 0xff, 0x57, 0x8f, 0x37, 0xb4, 0x79,
-	0x0c, 0xd0, 0xcc, 0xef, 0x1f, 0xfe, 0x62, 0xa1, 0xad, 0x5c, 0xbc, 0x78, 0x77, 0x73, 0x7f, 0x4b,
-	0xcf, 0x54, 0x7f, 0xf8, 0xff, 0x8d, 0xe9, 0x0c, 0x3b, 0x66, 0x86, 0x07, 0xb8, 0xb1, 0x7e, 0x86,
-	0xe4, 0xe5, 0xf6, 0x8f, 0x4e, 0xe7, 0x8e, 0x75, 0x36, 0x77, 0xac, 0x9f, 0x73, 0xc7, 0xfa, 0xb4,
-	0x70, 0x0a, 0x67, 0x0b, 0xa7, 0xf0, 0x7d, 0xe1, 0x14, 0xde, 0x3d, 0xf6, 0xb9, 0x1e, 0x86, 0x7d,
-	0x8f, 0x89, 0x31, 0x61, 0x42, 0x8d, 0x85, 0xca, 0x89, 0x36, 0xcf, 0x45, 0xa3, 0x0e, 0x99, 0x2e,
-	0x2b, 0xeb, 0xd9, 0x04, 0x54, 0xbf, 0x6a, 0xbe, 0x23, 0x9d, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
-	0xd5, 0xeb, 0x88, 0x17, 0x39, 0x05, 0x00, 0x00,
+	// 686 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4f, 0x6b, 0x13, 0x41,
+	0x14, 0xcf, 0xa6, 0x4d, 0xdb, 0x4c, 0xf5, 0xe0, 0x18, 0x21, 0xae, 0x65, 0x2d, 0xab, 0x60, 0x14,
+	0xb2, 0xdb, 0xb4, 0x87, 0xea, 0xa1, 0x5a, 0x6c, 0x2c, 0x06, 0x54, 0xea, 0x22, 0x14, 0xbc, 0x94,
+	0xe9, 0x64, 0x9a, 0x0c, 0x24, 0x33, 0xe9, 0xcc, 0xec, 0xd2, 0xde, 0x44, 0xf1, 0x2a, 0x82, 0xdf,
+	0xc4, 0x2f, 0xe0, 0xb5, 0xe0, 0xa5, 0xe0, 0xc5, 0x93, 0x48, 0xeb, 0x87, 0xf0, 0x28, 0x3b, 0x3b,
+	0x9b, 0x6e, 0xe8, 0xbf, 0xad, 0x7a, 0x9b, 0x79, 0xbf, 0xf7, 0x7e, 0xef, 0xf7, 0xde, 0xbc, 0xb7,
+	0x0b, 0x7c, 0xca, 0x14, 0x11, 0xb8, 0x8b, 0x28, 0xdb, 0x90, 0x04, 0x87, 0x82, 0xaa, 0x5d, 0x1f,
+	0xe3, 0xc8, 0xc7, 0x9c, 0xc9, 0xb0, 0x4f, 0x84, 0x1f, 0x35, 0xfc, 0xed, 0x90, 0x88, 0x5d, 0x6f,
+	0x20, 0xb8, 0xe2, 0xf0, 0xd6, 0x09, 0x01, 0x1e, 0xc6, 0x91, 0x97, 0x06, 0x78, 0x51, 0xc3, 0x9e,
+	0x3b, 0x8d, 0x35, 0x6a, 0xf8, 0xb2, 0x8b, 0x04, 0x69, 0x6f, 0x0c, 0xdd, 0x35, 0xad, 0x5d, 0xe9,
+	0xf0, 0x0e, 0xd7, 0x47, 0x3f, 0x3e, 0x19, 0xeb, 0x4c, 0x87, 0xf3, 0x4e, 0x8f, 0xf8, 0x68, 0x40,
+	0x7d, 0xc4, 0x18, 0x57, 0x48, 0x51, 0xce, 0xa4, 0x41, 0xe7, 0xf3, 0x68, 0x1f, 0xcd, 0xe3, 0x7e,
+	0x28, 0x82, 0x1b, 0x2f, 0xc8, 0x8e, 0x5a, 0x25, 0xa4, 0x49, 0xa5, 0x12, 0x74, 0x33, 0x8c, 0x29,
+	0x9f, 0x48, 0x45, 0xfb, 0x48, 0x11, 0x78, 0x1b, 0x5c, 0xc6, 0xa1, 0x10, 0x84, 0xa9, 0xa7, 0x84,
+	0x76, 0xba, 0xaa, 0x6a, 0xcd, 0x5a, 0xb5, 0xb1, 0x60, 0xd4, 0x08, 0x1d, 0x00, 0x7a, 0x48, 0xa6,
+	0x2e, 0x45, 0xed, 0x92, 0xb1, 0xc4, 0x38, 0x23, 0x3b, 0x29, 0x3e, 0x96, 0xe0, 0x47, 0x16, 0xb8,
+	0x00, 0xae, 0xb5, 0x33, 0xd9, 0x37, 0xb6, 0x04, 0xc2, 0xf1, 0xa1, 0x3a, 0x3e, 0x6b, 0xd5, 0xca,
+	0x41, 0x25, 0x0b, 0xae, 0x1a, 0x0c, 0x56, 0x40, 0x49, 0x71, 0x85, 0x7a, 0xd5, 0x92, 0x76, 0x4a,
+	0x2e, 0x71, 0x2a, 0xc5, 0xd7, 0x04, 0x8f, 0x68, 0x9b, 0x88, 0xea, 0x84, 0x86, 0x32, 0x96, 0x04,
+	0x5f, 0x31, 0x4d, 0xa8, 0x4e, 0xa6, 0x78, 0x6a, 0x71, 0xef, 0x82, 0x3b, 0x2f, 0xe3, 0xe7, 0x3d,
+	0xa3, 0x29, 0x01, 0xd9, 0x0e, 0x89, 0x54, 0xee, 0x1b, 0x0b, 0xd4, 0xce, 0xf7, 0x95, 0x03, 0xce,
+	0x24, 0x81, 0xaf, 0xc0, 0x78, 0x1b, 0x29, 0xa4, 0xfb, 0x37, 0x3d, 0xbf, 0xec, 0xe5, 0x18, 0x1b,
+	0xef, 0x2c, 0x5e, 0xcd, 0xe6, 0x56, 0x00, 0xd4, 0x0a, 0xd6, 0x90, 0x40, 0x7d, 0x99, 0x0a, 0x5b,
+	0x07, 0x57, 0x47, 0xac, 0x46, 0xc2, 0x32, 0x98, 0x18, 0x68, 0x8b, 0x11, 0xe1, 0x9e, 0x2a, 0x22,
+	0x6a, 0x78, 0x49, 0xec, 0xe3, 0xf1, 0xbd, 0x1f, 0x37, 0x0b, 0x81, 0x89, 0x73, 0x6d, 0x50, 0x4d,
+	0x88, 0x4d, 0x37, 0x5b, 0x6c, 0x8b, 0xa7, 0x49, 0xbf, 0x58, 0xe0, 0xfa, 0x09, 0xa0, 0xc9, 0xbd,
+	0x06, 0xa6, 0xd2, 0xca, 0x4c, 0x76, 0x2f, 0x57, 0x0b, 0x56, 0x62, 0x38, 0x66, 0x32, 0x4a, 0x86,
+	0x2c, 0x31, 0xe3, 0x20, 0x7d, 0xe6, 0xe2, 0xbf, 0x30, 0xa6, 0x2c, 0xee, 0x3b, 0x0b, 0x94, 0x87,
+	0x28, 0xac, 0x82, 0x49, 0xcd, 0xd4, 0x6a, 0x6a, 0xc1, 0xe5, 0x20, 0xbd, 0x42, 0x1b, 0x4c, 0xe1,
+	0x1e, 0x25, 0x4c, 0xb5, 0x9a, 0x3a, 0x73, 0x39, 0x18, 0xde, 0xa1, 0x0b, 0x2e, 0x61, 0xce, 0x18,
+	0xd1, 0x23, 0xda, 0x6a, 0xea, 0x59, 0x2f, 0x07, 0x23, 0x36, 0x38, 0x03, 0xca, 0xb8, 0x8b, 0x18,
+	0x23, 0xbd, 0x56, 0xd3, 0x4c, 0xf8, 0x91, 0x61, 0xfe, 0x7d, 0x09, 0x94, 0x74, 0x1f, 0xe1, 0x6f,
+	0xcb, 0xb4, 0xfb, 0x84, 0x39, 0x80, 0xcf, 0x72, 0x15, 0x9b, 0x73, 0x94, 0xed, 0xe7, 0xff, 0x89,
+	0x2d, 0x79, 0x6d, 0xf7, 0xd1, 0xdb, 0x6f, 0xbf, 0x3e, 0x15, 0x1f, 0xc0, 0xc5, 0xf3, 0x3f, 0xa7,
+	0xf1, 0x57, 0xa0, 0xbe, 0x45, 0x48, 0x3d, 0xbb, 0xe3, 0xf0, 0xb3, 0x05, 0xa6, 0x33, 0x23, 0x0c,
+	0x17, 0xf3, 0xeb, 0x1b, 0x59, 0x05, 0xfb, 0xfe, 0xc5, 0x03, 0x4d, 0x0d, 0x73, 0xba, 0x86, 0x7b,
+	0xb0, 0x76, 0x7e, 0x0d, 0xc9, 0x76, 0xc0, 0xaf, 0x16, 0xb8, 0x72, 0x6c, 0x03, 0xe0, 0xd2, 0x05,
+	0x14, 0x1c, 0x5f, 0x2b, 0xfb, 0xe1, 0xdf, 0x86, 0x9b, 0x32, 0x16, 0x75, 0x19, 0x0d, 0xe8, 0xe7,
+	0x28, 0xc3, 0xc4, 0xd7, 0x69, 0xbc, 0x1d, 0xeb, 0x7b, 0x07, 0x8e, 0xb5, 0x7f, 0xe0, 0x58, 0x3f,
+	0x0f, 0x1c, 0xeb, 0xe3, 0xa1, 0x53, 0xd8, 0x3f, 0x74, 0x0a, 0xdf, 0x0f, 0x9d, 0xc2, 0xeb, 0xa5,
+	0x0e, 0x55, 0xdd, 0x70, 0xd3, 0xc3, 0xbc, 0xef, 0x63, 0x2e, 0xfb, 0x5c, 0x66, 0xb8, 0xeb, 0x43,
+	0xee, 0x68, 0xc1, 0xdf, 0x19, 0x4d, 0xa0, 0x76, 0x07, 0x44, 0x6e, 0x4e, 0xe8, 0x3f, 0xcf, 0xc2,
+	0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x69, 0x59, 0x43, 0x6b, 0x07, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -363,6 +531,7 @@ type QueryClient interface {
 	QueryNextFeeDistribution(ctx context.Context, in *QueryNextFeeDistributionEstimateRequest, opts ...grpc.CallOption) (*QueryNextFeeDistributionEstimateResponse, error)
 	// QueryParams queries the ccv/consumer module parameters.
 	QueryParams(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error)
+	QueryProviderInfo(ctx context.Context, in *QueryProviderInfoRequest, opts ...grpc.CallOption) (*QueryProviderInfoResponse, error)
 }
 
 type queryClient struct {
@@ -391,6 +560,15 @@ func (c *queryClient) QueryParams(ctx context.Context, in *QueryParamsRequest, o
 	return out, nil
 }
 
+func (c *queryClient) QueryProviderInfo(ctx context.Context, in *QueryProviderInfoRequest, opts ...grpc.CallOption) (*QueryProviderInfoResponse, error) {
+	out := new(QueryProviderInfoResponse)
+	err := c.cc.Invoke(ctx, "/interchain_security.ccv.consumer.v1.Query/QueryProviderInfo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // QueryServer is the server API for Query service.
 type QueryServer interface {
 	// ConsumerGenesis queries the genesis state needed to start a consumer chain
@@ -398,6 +576,7 @@ type QueryServer interface {
 	QueryNextFeeDistribution(context.Context, *QueryNextFeeDistributionEstimateRequest) (*QueryNextFeeDistributionEstimateResponse, error)
 	// QueryParams queries the ccv/consumer module parameters.
 	QueryParams(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error)
+	QueryProviderInfo(context.Context, *QueryProviderInfoRequest) (*QueryProviderInfoResponse, error)
 }
 
 // UnimplementedQueryServer can be embedded to have forward compatible implementations.
@@ -410,6 +589,9 @@ func (*UnimplementedQueryServer) QueryNextFeeDistribution(ctx context.Context, r
 func (*UnimplementedQueryServer) QueryParams(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method QueryParams not implemented")
 }
+func (*UnimplementedQueryServer) QueryProviderInfo(ctx context.Context, req *QueryProviderInfoRequest) (*QueryProviderInfoResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method QueryProviderInfo not implemented")
+}
 
 func RegisterQueryServer(s grpc1.Server, srv QueryServer) {
 	s.RegisterService(&_Query_serviceDesc, srv)
@@ -451,6 +633,24 @@ func _Query_QueryParams_Handler(srv interface{}, ctx context.Context, dec func(i
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Query_QueryProviderInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(QueryProviderInfoRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(QueryServer).QueryProviderInfo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/interchain_security.ccv.consumer.v1.Query/QueryProviderInfo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(QueryServer).QueryProviderInfo(ctx, req.(*QueryProviderInfoRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Query_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "interchain_security.ccv.consumer.v1.Query",
 	HandlerType: (*QueryServer)(nil),
@@ -463,6 +663,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{
 			MethodName: "QueryParams",
 			Handler:    _Query_QueryParams_Handler,
 		},
+		{
+			MethodName: "QueryProviderInfo",
+			Handler:    _Query_QueryProviderInfo_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "interchain_security/ccv/consumer/v1/query.proto",
@@ -648,6 +852,123 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
+func (m *QueryProviderInfoRequest) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *QueryProviderInfoRequest) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *QueryProviderInfoRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	return len(dAtA) - i, nil
+}
+
+func (m *QueryProviderInfoResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *QueryProviderInfoResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *QueryProviderInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size, err := m.Provider.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintQuery(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x12
+	{
+		size, err := m.Consumer.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintQuery(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0xa
+	return len(dAtA) - i, nil
+}
+
+func (m *ChainInfo) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *ChainInfo) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ChainInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.ChannelID) > 0 {
+		i -= len(m.ChannelID)
+		copy(dAtA[i:], m.ChannelID)
+		i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelID)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if len(m.ConnectionID) > 0 {
+		i -= len(m.ConnectionID)
+		copy(dAtA[i:], m.ConnectionID)
+		i = encodeVarintQuery(dAtA, i, uint64(len(m.ConnectionID)))
+		i--
+		dAtA[i] = 0x1a
+	}
+	if len(m.ClientID) > 0 {
+		i -= len(m.ClientID)
+		copy(dAtA[i:], m.ClientID)
+		i = encodeVarintQuery(dAtA, i, uint64(len(m.ClientID)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.ChainID) > 0 {
+		i -= len(m.ChainID)
+		copy(dAtA[i:], m.ChainID)
+		i = encodeVarintQuery(dAtA, i, uint64(len(m.ChainID)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintQuery(dAtA []byte, offset int, v uint64) int {
 	offset -= sovQuery(v)
 	base := offset
@@ -735,6 +1056,53 @@ func (m *QueryParamsResponse) Size() (n int) {
 	return n
 }
 
+func (m *QueryProviderInfoRequest) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	return n
+}
+
+func (m *QueryProviderInfoResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = m.Consumer.Size()
+	n += 1 + l + sovQuery(uint64(l))
+	l = m.Provider.Size()
+	n += 1 + l + sovQuery(uint64(l))
+	return n
+}
+
+func (m *ChainInfo) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.ChainID)
+	if l > 0 {
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	l = len(m.ClientID)
+	if l > 0 {
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	l = len(m.ConnectionID)
+	if l > 0 {
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	l = len(m.ChannelID)
+	if l > 0 {
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	return n
+}
+
 func sovQuery(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -1245,6 +1613,350 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *QueryProviderInfoRequest) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowQuery
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: QueryProviderInfoRequest: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: QueryProviderInfoRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *QueryProviderInfoResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowQuery
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: QueryProviderInfoResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: QueryProviderInfoResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Consumer", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Consumer.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Provider", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Provider.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *ChainInfo) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowQuery
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: ChainInfo: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: ChainInfo: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ChainID", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				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 ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ChainID = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ClientID", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				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 ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ClientID = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ConnectionID", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				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 ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ConnectionID = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				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 ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ChannelID = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipQuery(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/x/ccv/provider/types/genesis.pb.go b/x/ccv/provider/types/genesis.pb.go
index 79d09f7b0f..803976092f 100644
--- a/x/ccv/provider/types/genesis.pb.go
+++ b/x/ccv/provider/types/genesis.pb.go
@@ -26,6 +26,8 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // GenesisState defines the CCV provider chain genesis state
+//
+// TODO: Change to ProviderGenesisState for consistency with consumer, or create issue for this.
 type GenesisState struct {
 	// strictly positive and set to 1 (DefaultValsetUpdateID) for a new chain
 	ValsetUpdateId uint64 `protobuf:"varint,1,opt,name=valset_update_id,json=valsetUpdateId,proto3" json:"valset_update_id,omitempty"`
@@ -47,7 +49,9 @@ type GenesisState struct {
 	// empty for a new chain
 	ValidatorsByConsumerAddr []ValidatorByConsumerAddr `protobuf:"bytes,10,rep,name=validators_by_consumer_addr,json=validatorsByConsumerAddr,proto3" json:"validators_by_consumer_addr"`
 	// empty for a new chain
-	ConsumerAddrsToPrune []ConsumerAddrsToPrune `protobuf:"bytes,11,rep,name=consumer_addrs_to_prune,json=consumerAddrsToPrune,proto3" json:"consumer_addrs_to_prune"`
+	ConsumerAddrsToPrune      []ConsumerAddrsToPrune     `protobuf:"bytes,11,rep,name=consumer_addrs_to_prune,json=consumerAddrsToPrune,proto3" json:"consumer_addrs_to_prune"`
+	InitTimeoutTimestamps     []InitTimeoutTimestamp     `protobuf:"bytes,12,rep,name=init_timeout_timestamps,json=initTimeoutTimestamps,proto3" json:"init_timeout_timestamps"`
+	ExportedVscSendTimestamps []ExportedVscSendTimestamp `protobuf:"bytes,13,rep,name=exported_vsc_send_timestamps,json=exportedVscSendTimestamps,proto3" json:"exported_vsc_send_timestamps"`
 }
 
 func (m *GenesisState) Reset()         { *m = GenesisState{} }
@@ -160,6 +164,20 @@ func (m *GenesisState) GetConsumerAddrsToPrune() []ConsumerAddrsToPrune {
 	return nil
 }
 
+func (m *GenesisState) GetInitTimeoutTimestamps() []InitTimeoutTimestamp {
+	if m != nil {
+		return m.InitTimeoutTimestamps
+	}
+	return nil
+}
+
+func (m *GenesisState) GetExportedVscSendTimestamps() []ExportedVscSendTimestamp {
+	if m != nil {
+		return m.ExportedVscSendTimestamps
+	}
+	return nil
+}
+
 // The provider CCV module's knowledge of consumer state.
 //
 // Note this type is only used internally to the provider CCV module.
@@ -337,61 +355,66 @@ func init() {
 }
 
 var fileDescriptor_48411d9c7900d48e = []byte{
-	// 854 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x6f, 0x1c, 0x35,
-	0x14, 0xce, 0x24, 0x69, 0x9a, 0x75, 0x9a, 0x10, 0x4c, 0xb4, 0x4c, 0x13, 0xd8, 0x46, 0x8b, 0x2a,
-	0xad, 0x04, 0xcc, 0x74, 0x53, 0x0e, 0xe5, 0x47, 0x0f, 0x4d, 0x2b, 0xc1, 0x0a, 0x21, 0x56, 0xdb,
-	0x1f, 0x88, 0x72, 0xb0, 0xbc, 0xb6, 0xb5, 0xeb, 0x66, 0xc6, 0x1e, 0xd9, 0x9e, 0x69, 0x47, 0x08,
-	0x09, 0xc4, 0x3f, 0xc0, 0x9f, 0xd5, 0x63, 0x8e, 0x9c, 0x2a, 0x94, 0xfc, 0x07, 0x9c, 0x38, 0xa2,
-	0xf1, 0x78, 0xa6, 0xb3, 0x61, 0x13, 0xed, 0x72, 0x9b, 0x79, 0x9f, 0xdf, 0xf7, 0x7d, 0xcf, 0xcf,
-	0x7e, 0x06, 0x7d, 0x2e, 0x0c, 0x53, 0x64, 0x8a, 0xb9, 0x40, 0x9a, 0x91, 0x54, 0x71, 0x93, 0x87,
-	0x84, 0x64, 0x61, 0xa2, 0x64, 0xc6, 0x29, 0x53, 0x61, 0xd6, 0x0f, 0x27, 0x4c, 0x30, 0xcd, 0x75,
-	0x90, 0x28, 0x69, 0x24, 0xfc, 0x68, 0x4e, 0x4a, 0x40, 0x48, 0x16, 0x54, 0x29, 0x41, 0xd6, 0xdf,
-	0xdf, 0x9b, 0xc8, 0x89, 0xb4, 0xeb, 0xc3, 0xe2, 0xab, 0x4c, 0xdd, 0xbf, 0x73, 0x99, 0x5a, 0xd6,
-	0x0f, 0xf5, 0x14, 0x2b, 0x46, 0x11, 0x91, 0x42, 0xa7, 0x31, 0x53, 0x2e, 0xe3, 0xf6, 0x15, 0x19,
-	0x2f, 0xb9, 0x62, 0x6e, 0xd9, 0xd1, 0x22, 0x65, 0xd4, 0xfe, 0xca, 0x9c, 0x0f, 0x0c, 0x13, 0x94,
-	0xa9, 0x98, 0x0b, 0x13, 0x12, 0x95, 0x27, 0x46, 0x86, 0x27, 0x2c, 0x77, 0x55, 0x76, 0x4f, 0x5b,
-	0xe0, 0xc6, 0xd7, 0x65, 0xdd, 0x8f, 0x0d, 0x36, 0x0c, 0xf6, 0xc0, 0x6e, 0x86, 0x23, 0xcd, 0x0c,
-	0x4a, 0x13, 0x8a, 0x0d, 0x43, 0x9c, 0xfa, 0xde, 0xa1, 0xd7, 0x5b, 0x1f, 0xed, 0x94, 0xf1, 0xa7,
-	0x36, 0x3c, 0xa0, 0xf0, 0x67, 0xf0, 0x4e, 0x55, 0x05, 0xd2, 0x45, 0xae, 0xf6, 0x57, 0x0f, 0xd7,
-	0x7a, 0x5b, 0x47, 0x47, 0xc1, 0x02, 0x5b, 0x17, 0x3c, 0x74, 0xb9, 0x56, 0xf6, 0xb8, 0xf3, 0xfa,
-	0xcd, 0xad, 0x95, 0xbf, 0xdf, 0xdc, 0x6a, 0xe7, 0x38, 0x8e, 0xbe, 0xe8, 0x5e, 0x20, 0xee, 0x8e,
-	0x76, 0x48, 0x73, 0xb9, 0x86, 0x3f, 0x81, 0xed, 0x54, 0x8c, 0xa5, 0xa0, 0x5c, 0x4c, 0x90, 0x4c,
-	0xb4, 0xbf, 0x66, 0xa5, 0xef, 0x2c, 0x24, 0xfd, 0xb4, 0xca, 0xfc, 0x3e, 0x39, 0x5e, 0x2f, 0x84,
-	0x47, 0x37, 0xd2, 0xb7, 0x21, 0x0d, 0x5f, 0x80, 0xbd, 0x18, 0x9b, 0x54, 0x31, 0x34, 0xab, 0xb1,
-	0x7e, 0xe8, 0xf5, 0xb6, 0x8e, 0xee, 0x2d, 0xa4, 0xf1, 0x9d, 0x25, 0xa0, 0x0d, 0x29, 0x3d, 0x82,
-	0x25, 0x6b, 0x33, 0x06, 0x7f, 0x01, 0xfb, 0x17, 0xf7, 0x1b, 0x19, 0x89, 0xa6, 0x8c, 0x4f, 0xa6,
-	0xc6, 0xbf, 0x66, 0xab, 0xfa, 0x72, 0x21, 0xc5, 0x67, 0x33, 0xed, 0x79, 0x22, 0xbf, 0xb1, 0x14,
-	0xae, 0xc0, 0x76, 0x36, 0x17, 0x85, 0xbf, 0x7b, 0xe0, 0xa0, 0xde, 0x6c, 0x4c, 0x29, 0x37, 0x5c,
-	0x0a, 0x94, 0x28, 0x99, 0x48, 0x8d, 0x23, 0xed, 0x6f, 0x58, 0x03, 0xf7, 0x97, 0xea, 0xe8, 0x03,
-	0x47, 0x33, 0x74, 0x2c, 0xce, 0xc2, 0x4d, 0x72, 0x09, 0xae, 0xe1, 0xaf, 0x1e, 0xd8, 0xaf, 0x5d,
-	0x28, 0x16, 0xcb, 0x0c, 0x47, 0x0d, 0x13, 0xd7, 0xad, 0x89, 0xaf, 0x96, 0x32, 0x31, 0x2a, 0x59,
-	0x2e, 0x78, 0xf0, 0xc9, 0x7c, 0x58, 0xc3, 0x01, 0xd8, 0x48, 0xb0, 0xc2, 0xb1, 0xf6, 0x37, 0x6d,
-	0x97, 0x3f, 0x5e, 0x48, 0x6d, 0x68, 0x53, 0x1c, 0xb9, 0x23, 0xb0, 0xd5, 0x64, 0x38, 0xe2, 0x14,
-	0x1b, 0xa9, 0xea, 0x9b, 0x8e, 0x92, 0x74, 0x5c, 0x5c, 0x3c, 0xbf, 0xb5, 0x44, 0x35, 0xcf, 0x2a,
-	0x9a, 0xaa, 0xac, 0x61, 0x3a, 0xfe, 0x96, 0xe5, 0x55, 0x35, 0xd9, 0x1c, 0xb8, 0xd0, 0x80, 0xbf,
-	0x79, 0xe0, 0xa0, 0x06, 0x35, 0x1a, 0xe7, 0xa8, 0xd9, 0x64, 0xe5, 0x83, 0xff, 0xe3, 0xe1, 0x38,
-	0x6f, 0x74, 0x58, 0xfd, 0xc7, 0x83, 0x9e, 0xc5, 0x61, 0x06, 0xde, 0x9f, 0x11, 0xd5, 0xc5, 0xb9,
-	0x4e, 0x54, 0x2a, 0x98, 0xbf, 0x65, 0xe5, 0x3f, 0x5f, 0xf6, 0x54, 0x29, 0xfd, 0x44, 0x0e, 0x0b,
-	0x02, 0xa7, 0xbd, 0x47, 0xe6, 0x60, 0xdd, 0x7f, 0xd6, 0xc0, 0xf6, 0xcc, 0x70, 0x81, 0x37, 0xc1,
-	0x66, 0x29, 0xe2, 0x66, 0x59, 0x6b, 0x74, 0xdd, 0xfe, 0x0f, 0x28, 0xfc, 0x10, 0x00, 0x32, 0xc5,
-	0x42, 0xb0, 0xa8, 0x00, 0x57, 0x2d, 0xd8, 0x72, 0x91, 0x01, 0x85, 0x07, 0xa0, 0x45, 0x22, 0xce,
-	0x84, 0x29, 0xd0, 0x35, 0x8b, 0x6e, 0x96, 0x81, 0x01, 0x85, 0xb7, 0xc1, 0x0e, 0x17, 0xdc, 0x70,
-	0x1c, 0x55, 0xd7, 0x75, 0xdd, 0x0e, 0xca, 0x6d, 0x17, 0x75, 0x57, 0xec, 0x47, 0xb0, 0x5b, 0xef,
-	0x83, 0x7b, 0x62, 0xfc, 0x6b, 0xf6, 0x8c, 0xf5, 0x2e, 0xdd, 0x80, 0xac, 0x1f, 0x34, 0xa7, 0xb2,
-	0xab, 0xb7, 0x9e, 0xb7, 0x0e, 0x83, 0x06, 0xb4, 0x13, 0x56, 0xce, 0x27, 0x37, 0x44, 0x0a, 0xeb,
-	0x13, 0x56, 0xdd, 0xdb, 0x7b, 0x57, 0x09, 0xd4, 0x7d, 0x7d, 0xcc, 0xcc, 0x43, 0x9b, 0x36, 0xc4,
-	0xe4, 0x84, 0x99, 0x47, 0xd8, 0xe0, 0x6a, 0x83, 0x1d, 0x7b, 0x39, 0x5a, 0xca, 0x45, 0x1a, 0x7e,
-	0x02, 0xa0, 0x8e, 0xb0, 0x9e, 0x22, 0x2a, 0x5f, 0x0a, 0xc3, 0x63, 0x86, 0x30, 0x39, 0xb1, 0x97,
-	0xb4, 0x35, 0xda, 0xb5, 0xc8, 0x23, 0x07, 0x3c, 0x20, 0x27, 0xf0, 0x05, 0x78, 0x6f, 0x66, 0x8a,
-	0x22, 0x2e, 0x28, 0x7b, 0xe5, 0x6f, 0x5a, 0x83, 0x9f, 0x2d, 0x76, 0x02, 0x35, 0x69, 0xce, 0x4c,
-	0x67, 0xee, 0xdd, 0xe6, 0xcc, 0x1e, 0x14, 0xa4, 0xdd, 0xe7, 0xa0, 0x3d, 0x7f, 0x0a, 0x2e, 0xf1,
-	0xac, 0xb5, 0xc1, 0x86, 0xeb, 0xe6, 0xaa, 0xc5, 0xdd, 0xdf, 0xf1, 0x0f, 0xaf, 0xcf, 0x3a, 0xde,
-	0xe9, 0x59, 0xc7, 0xfb, 0xeb, 0xac, 0xe3, 0xfd, 0x71, 0xde, 0x59, 0x39, 0x3d, 0xef, 0xac, 0xfc,
-	0x79, 0xde, 0x59, 0x79, 0x7e, 0x7f, 0xc2, 0xcd, 0x34, 0x1d, 0x07, 0x44, 0xc6, 0x21, 0x91, 0x3a,
-	0x96, 0x3a, 0x7c, 0x5b, 0xd5, 0xa7, 0xf5, 0x3b, 0x9d, 0xdd, 0x0d, 0x5f, 0xcd, 0x3e, 0xd6, 0x26,
-	0x4f, 0x98, 0x1e, 0x6f, 0xd8, 0x97, 0xf8, 0xee, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc8, 0xca,
-	0xbf, 0x7b, 0xa4, 0x08, 0x00, 0x00,
+	// 929 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x6e, 0x1b, 0x37,
+	0x17, 0xf5, 0xd8, 0x8e, 0x63, 0xd1, 0x3f, 0x9f, 0x3f, 0xd6, 0x55, 0xc6, 0x76, 0xaa, 0x18, 0x2a,
+	0x02, 0x08, 0x68, 0xab, 0x89, 0x9c, 0x2e, 0xd2, 0x9f, 0x2c, 0xe2, 0xa4, 0x68, 0x85, 0xa2, 0xa8,
+	0x20, 0x3b, 0x2e, 0x9a, 0x2e, 0x08, 0x8a, 0x24, 0x24, 0xc6, 0x33, 0xe4, 0x80, 0xe4, 0x8c, 0x2d,
+	0x14, 0x05, 0x5a, 0xb4, 0x0f, 0xd0, 0xc7, 0xca, 0xd2, 0xcb, 0xae, 0x82, 0xc2, 0x7e, 0x83, 0xae,
+	0xba, 0x2c, 0x86, 0xc3, 0x99, 0x8c, 0x5c, 0x39, 0x90, 0xba, 0xb2, 0xc5, 0xc3, 0x7b, 0xce, 0xb9,
+	0xbc, 0xe4, 0xbd, 0x03, 0x3a, 0x5c, 0x18, 0xa6, 0xc8, 0x08, 0x73, 0x81, 0x34, 0x23, 0x89, 0xe2,
+	0x66, 0x1c, 0x10, 0x92, 0x06, 0xb1, 0x92, 0x29, 0xa7, 0x4c, 0x05, 0x69, 0x27, 0x18, 0x32, 0xc1,
+	0x34, 0xd7, 0xed, 0x58, 0x49, 0x23, 0xe1, 0xfb, 0x53, 0x42, 0xda, 0x84, 0xa4, 0xed, 0x22, 0xa4,
+	0x9d, 0x76, 0x76, 0xb7, 0x87, 0x72, 0x28, 0xed, 0xfe, 0x20, 0xfb, 0x2f, 0x0f, 0xdd, 0x7d, 0x70,
+	0x93, 0x5a, 0xda, 0x09, 0xf4, 0x08, 0x2b, 0x46, 0x11, 0x91, 0x42, 0x27, 0x11, 0x53, 0x2e, 0xe2,
+	0xfe, 0x5b, 0x22, 0xce, 0xb8, 0x62, 0x6e, 0xdb, 0xc1, 0x2c, 0x69, 0x94, 0xfe, 0xf2, 0x98, 0xbb,
+	0x86, 0x09, 0xca, 0x54, 0xc4, 0x85, 0x09, 0x88, 0x1a, 0xc7, 0x46, 0x06, 0xa7, 0x6c, 0xec, 0xb2,
+	0x6c, 0x5e, 0xac, 0x81, 0xf5, 0x2f, 0xf3, 0xbc, 0x8f, 0x0c, 0x36, 0x0c, 0xb6, 0xc0, 0x56, 0x8a,
+	0x43, 0xcd, 0x0c, 0x4a, 0x62, 0x8a, 0x0d, 0x43, 0x9c, 0xfa, 0xde, 0xbe, 0xd7, 0x5a, 0xee, 0x6f,
+	0xe6, 0xeb, 0xcf, 0xed, 0x72, 0x97, 0xc2, 0x1f, 0xc1, 0xff, 0x8a, 0x2c, 0x90, 0xce, 0x62, 0xb5,
+	0xbf, 0xb8, 0xbf, 0xd4, 0x5a, 0x3b, 0x38, 0x68, 0xcf, 0x70, 0x74, 0xed, 0xa7, 0x2e, 0xd6, 0xca,
+	0x1e, 0x36, 0x5e, 0xbd, 0xbe, 0xb7, 0xf0, 0xd7, 0xeb, 0x7b, 0xf5, 0x31, 0x8e, 0xc2, 0x4f, 0x9b,
+	0xd7, 0x88, 0x9b, 0xfd, 0x4d, 0x52, 0xdd, 0xae, 0xe1, 0x0f, 0x60, 0x23, 0x11, 0x03, 0x29, 0x28,
+	0x17, 0x43, 0x24, 0x63, 0xed, 0x2f, 0x59, 0xe9, 0x07, 0x33, 0x49, 0x3f, 0x2f, 0x22, 0xbf, 0x8d,
+	0x0f, 0x97, 0x33, 0xe1, 0xfe, 0x7a, 0xf2, 0x66, 0x49, 0xc3, 0x97, 0x60, 0x3b, 0xc2, 0x26, 0x51,
+	0x0c, 0x4d, 0x6a, 0x2c, 0xef, 0x7b, 0xad, 0xb5, 0x83, 0x47, 0x33, 0x69, 0x7c, 0x63, 0x09, 0x68,
+	0x45, 0x4a, 0xf7, 0x61, 0xce, 0x5a, 0x5d, 0x83, 0x3f, 0x81, 0xdd, 0xeb, 0xe7, 0x8d, 0x8c, 0x44,
+	0x23, 0xc6, 0x87, 0x23, 0xe3, 0xdf, 0xb2, 0x59, 0x7d, 0x36, 0x93, 0xe2, 0xc9, 0x44, 0x79, 0x8e,
+	0xe5, 0x57, 0x96, 0xc2, 0x25, 0x58, 0x4f, 0xa7, 0xa2, 0xf0, 0x57, 0x0f, 0xec, 0x95, 0x87, 0x8d,
+	0x29, 0xe5, 0x86, 0x4b, 0x81, 0x62, 0x25, 0x63, 0xa9, 0x71, 0xa8, 0xfd, 0x15, 0x6b, 0xe0, 0xf1,
+	0x5c, 0x15, 0x7d, 0xe2, 0x68, 0x7a, 0x8e, 0xc5, 0x59, 0xd8, 0x21, 0x37, 0xe0, 0x1a, 0xfe, 0xec,
+	0x81, 0xdd, 0xd2, 0x85, 0x62, 0x91, 0x4c, 0x71, 0x58, 0x31, 0x71, 0xdb, 0x9a, 0xf8, 0x7c, 0x2e,
+	0x13, 0xfd, 0x9c, 0xe5, 0x9a, 0x07, 0x9f, 0x4c, 0x87, 0x35, 0xec, 0x82, 0x95, 0x18, 0x2b, 0x1c,
+	0x69, 0x7f, 0xd5, 0x56, 0xf9, 0x83, 0x99, 0xd4, 0x7a, 0x36, 0xc4, 0x91, 0x3b, 0x02, 0x9b, 0x4d,
+	0x8a, 0x43, 0x4e, 0xb1, 0x91, 0xaa, 0x7c, 0xe9, 0x28, 0x4e, 0x06, 0xd9, 0xc3, 0xf3, 0x6b, 0x73,
+	0x64, 0x73, 0x52, 0xd0, 0x14, 0x69, 0xf5, 0x92, 0xc1, 0xd7, 0x6c, 0x5c, 0x64, 0x93, 0x4e, 0x81,
+	0x33, 0x0d, 0xf8, 0x8b, 0x07, 0xf6, 0x4a, 0x50, 0xa3, 0xc1, 0x18, 0x55, 0x8b, 0xac, 0x7c, 0xf0,
+	0x5f, 0x3c, 0x1c, 0x8e, 0x2b, 0x15, 0x56, 0xff, 0xf2, 0xa0, 0x27, 0x71, 0x98, 0x82, 0x3b, 0x13,
+	0xa2, 0x3a, 0xbb, 0xd7, 0xb1, 0x4a, 0x04, 0xf3, 0xd7, 0xac, 0xfc, 0x27, 0xf3, 0xde, 0x2a, 0xa5,
+	0x8f, 0x65, 0x2f, 0x23, 0x70, 0xda, 0xdb, 0x64, 0x0a, 0x06, 0xcf, 0xc0, 0x1d, 0x2e, 0xb8, 0x41,
+	0x86, 0x47, 0x4c, 0x26, 0xf9, 0x5f, 0x6d, 0x70, 0x14, 0x6b, 0x7f, 0x7d, 0x0e, 0xdd, 0xae, 0xe0,
+	0xe6, 0x38, 0xa7, 0x38, 0x2e, 0x18, 0x9c, 0xee, 0xbb, 0x7c, 0x0a, 0xa6, 0xe1, 0x6f, 0x1e, 0xb8,
+	0xcb, 0xce, 0x63, 0xa9, 0x0c, 0xa3, 0x28, 0xd5, 0x04, 0x69, 0x26, 0x68, 0x55, 0x7e, 0x63, 0x8e,
+	0xc7, 0xf4, 0x85, 0x23, 0x3a, 0xd1, 0xe4, 0x88, 0x09, 0x7a, 0xdd, 0xc2, 0x0e, 0xbb, 0x01, 0xd7,
+	0xcd, 0xbf, 0x97, 0xc0, 0xc6, 0x44, 0x73, 0x85, 0x3b, 0x60, 0x35, 0x57, 0x73, 0xbd, 0xbc, 0xd6,
+	0xbf, 0x6d, 0x7f, 0x77, 0x29, 0x7c, 0x0f, 0x00, 0x32, 0xc2, 0x42, 0xb0, 0x30, 0x03, 0x17, 0x2d,
+	0x58, 0x73, 0x2b, 0x5d, 0x0a, 0xf7, 0x40, 0x8d, 0x84, 0x9c, 0x09, 0x93, 0xa1, 0x4b, 0x16, 0x5d,
+	0xcd, 0x17, 0xba, 0x14, 0xde, 0x07, 0x9b, 0xd9, 0x41, 0x70, 0x1c, 0x16, 0xed, 0x6a, 0xd9, 0x0e,
+	0x8a, 0x0d, 0xb7, 0xea, 0x5a, 0xcc, 0xf7, 0x60, 0xab, 0xbc, 0x07, 0x6e, 0xc4, 0xfa, 0xb7, 0xec,
+	0x1b, 0x6b, 0xdd, 0x78, 0x12, 0x69, 0xa7, 0x5d, 0x9d, 0x4a, 0x2e, 0xe9, 0x72, 0xde, 0x38, 0x0c,
+	0x1a, 0x50, 0x8f, 0x59, 0xde, 0x9f, 0x5d, 0x13, 0xcd, 0xac, 0x0f, 0x59, 0xd1, 0xb7, 0x1e, 0xbd,
+	0x4d, 0xa0, 0xbc, 0xd7, 0x47, 0xcc, 0x3c, 0xb5, 0x61, 0x3d, 0x4c, 0x4e, 0x99, 0x79, 0x86, 0x0d,
+	0x2e, 0x2e, 0x98, 0x63, 0xcf, 0x5b, 0x6b, 0xbe, 0x49, 0xc3, 0x0f, 0x01, 0xd4, 0x21, 0xd6, 0x23,
+	0x44, 0xe5, 0x99, 0xc8, 0xca, 0x8b, 0x30, 0x39, 0xb5, 0x4d, 0xaa, 0xd6, 0xdf, 0xb2, 0xc8, 0x33,
+	0x07, 0x3c, 0x21, 0xa7, 0xf0, 0x25, 0x78, 0x67, 0x62, 0x8a, 0x20, 0x2e, 0x28, 0x3b, 0xf7, 0x57,
+	0xad, 0xc1, 0x8f, 0x67, 0x7b, 0x81, 0x9a, 0x54, 0x67, 0x86, 0x33, 0xf7, 0xff, 0xea, 0xcc, 0xea,
+	0x66, 0xa4, 0xcd, 0x17, 0xa0, 0x3e, 0x7d, 0x0a, 0xcc, 0x31, 0xd6, 0xeb, 0x60, 0xc5, 0x55, 0x73,
+	0xd1, 0xe2, 0xee, 0xd7, 0xe1, 0x77, 0xaf, 0x2e, 0x1b, 0xde, 0xc5, 0x65, 0xc3, 0xfb, 0xf3, 0xb2,
+	0xe1, 0xfd, 0x7e, 0xd5, 0x58, 0xb8, 0xb8, 0x6a, 0x2c, 0xfc, 0x71, 0xd5, 0x58, 0x78, 0xf1, 0x78,
+	0xc8, 0xcd, 0x28, 0x19, 0xb4, 0x89, 0x8c, 0x02, 0x22, 0x75, 0x24, 0x75, 0xf0, 0x26, 0xab, 0x8f,
+	0xca, 0xef, 0x94, 0xf4, 0x61, 0x70, 0x3e, 0xf9, 0xb1, 0x62, 0xc6, 0x31, 0xd3, 0x83, 0x15, 0xfb,
+	0x25, 0xf2, 0xf0, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x76, 0xce, 0xb9, 0x61, 0xa4, 0x09, 0x00,
+	0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
@@ -414,6 +437,34 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if len(m.ExportedVscSendTimestamps) > 0 {
+		for iNdEx := len(m.ExportedVscSendTimestamps) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.ExportedVscSendTimestamps[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintGenesis(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x6a
+		}
+	}
+	if len(m.InitTimeoutTimestamps) > 0 {
+		for iNdEx := len(m.InitTimeoutTimestamps) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.InitTimeoutTimestamps[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintGenesis(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x62
+		}
+	}
 	if len(m.ConsumerAddrsToPrune) > 0 {
 		for iNdEx := len(m.ConsumerAddrsToPrune) - 1; iNdEx >= 0; iNdEx-- {
 			{
@@ -759,6 +810,18 @@ func (m *GenesisState) Size() (n int) {
 			n += 1 + l + sovGenesis(uint64(l))
 		}
 	}
+	if len(m.InitTimeoutTimestamps) > 0 {
+		for _, e := range m.InitTimeoutTimestamps {
+			l = e.Size()
+			n += 1 + l + sovGenesis(uint64(l))
+		}
+	}
+	if len(m.ExportedVscSendTimestamps) > 0 {
+		for _, e := range m.ExportedVscSendTimestamps {
+			l = e.Size()
+			n += 1 + l + sovGenesis(uint64(l))
+		}
+	}
 	return n
 }
 
@@ -1216,6 +1279,74 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 12:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field InitTimeoutTimestamps", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenesis
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthGenesis
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthGenesis
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.InitTimeoutTimestamps = append(m.InitTimeoutTimestamps, InitTimeoutTimestamp{})
+			if err := m.InitTimeoutTimestamps[len(m.InitTimeoutTimestamps)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 13:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ExportedVscSendTimestamps", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenesis
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthGenesis
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthGenesis
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ExportedVscSendTimestamps = append(m.ExportedVscSendTimestamps, ExportedVscSendTimestamp{})
+			if err := m.ExportedVscSendTimestamps[len(m.ExportedVscSendTimestamps)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipGenesis(dAtA[iNdEx:])
diff --git a/x/ccv/provider/types/provider.pb.go b/x/ccv/provider/types/provider.pb.go
index faff1ec8e3..e76d9459cb 100644
--- a/x/ccv/provider/types/provider.pb.go
+++ b/x/ccv/provider/types/provider.pb.go
@@ -358,6 +358,8 @@ func (m *GlobalSlashEntry) GetProviderValConsAddr() []byte {
 // Params defines the parameters for CCV Provider module
 //
 // Note this type is only used internally to the provider CCV module.
+//
+// TODO: change to ProviderParams for consistency with consumer, or create issue for this.
 type Params struct {
 	TemplateClient *_07_tendermint.ClientState `protobuf:"bytes,1,opt,name=template_client,json=templateClient,proto3" json:"template_client,omitempty"`
 	// TrustingPeriodFraction is used to compute the consumer and provider IBC
@@ -1042,6 +1044,61 @@ func (m *MaturedUnbondingOps) GetIds() []uint64 {
 	return nil
 }
 
+// ExportedVscSendTimestamps is VscSendTimestamp with chainID info for exporting to genesis
+//
+// Note this type is only used internally to the provider CCV module.
+type ExportedVscSendTimestamp struct {
+	ChainId           string             `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
+	VscSendTimestamps []VscSendTimestamp `protobuf:"bytes,2,rep,name=vsc_send_timestamps,json=vscSendTimestamps,proto3" json:"vsc_send_timestamps"`
+}
+
+func (m *ExportedVscSendTimestamp) Reset()         { *m = ExportedVscSendTimestamp{} }
+func (m *ExportedVscSendTimestamp) String() string { return proto.CompactTextString(m) }
+func (*ExportedVscSendTimestamp) ProtoMessage()    {}
+func (*ExportedVscSendTimestamp) Descriptor() ([]byte, []int) {
+	return fileDescriptor_f22ec409a72b7b72, []int{16}
+}
+func (m *ExportedVscSendTimestamp) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ExportedVscSendTimestamp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_ExportedVscSendTimestamp.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *ExportedVscSendTimestamp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ExportedVscSendTimestamp.Merge(m, src)
+}
+func (m *ExportedVscSendTimestamp) XXX_Size() int {
+	return m.Size()
+}
+func (m *ExportedVscSendTimestamp) XXX_DiscardUnknown() {
+	xxx_messageInfo_ExportedVscSendTimestamp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ExportedVscSendTimestamp proto.InternalMessageInfo
+
+func (m *ExportedVscSendTimestamp) GetChainId() string {
+	if m != nil {
+		return m.ChainId
+	}
+	return ""
+}
+
+func (m *ExportedVscSendTimestamp) GetVscSendTimestamps() []VscSendTimestamp {
+	if m != nil {
+		return m.VscSendTimestamps
+	}
+	return nil
+}
+
 // Note this type is only used internally to the provider CCV module.
 type KeyAssignmentReplacement struct {
 	ProviderAddr []byte            `protobuf:"bytes,1,opt,name=provider_addr,json=providerAddr,proto3" json:"provider_addr,omitempty"`
@@ -1053,7 +1110,7 @@ func (m *KeyAssignmentReplacement) Reset()         { *m = KeyAssignmentReplaceme
 func (m *KeyAssignmentReplacement) String() string { return proto.CompactTextString(m) }
 func (*KeyAssignmentReplacement) ProtoMessage()    {}
 func (*KeyAssignmentReplacement) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{16}
+	return fileDescriptor_f22ec409a72b7b72, []int{17}
 }
 func (m *KeyAssignmentReplacement) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1118,7 +1175,7 @@ func (m *ValidatorConsumerPubKey) Reset()         { *m = ValidatorConsumerPubKey
 func (m *ValidatorConsumerPubKey) String() string { return proto.CompactTextString(m) }
 func (*ValidatorConsumerPubKey) ProtoMessage()    {}
 func (*ValidatorConsumerPubKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{17}
+	return fileDescriptor_f22ec409a72b7b72, []int{18}
 }
 func (m *ValidatorConsumerPubKey) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1183,7 +1240,7 @@ func (m *ValidatorByConsumerAddr) Reset()         { *m = ValidatorByConsumerAddr
 func (m *ValidatorByConsumerAddr) String() string { return proto.CompactTextString(m) }
 func (*ValidatorByConsumerAddr) ProtoMessage()    {}
 func (*ValidatorByConsumerAddr) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{18}
+	return fileDescriptor_f22ec409a72b7b72, []int{19}
 }
 func (m *ValidatorByConsumerAddr) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1247,7 +1304,7 @@ func (m *ConsumerAddrsToPrune) Reset()         { *m = ConsumerAddrsToPrune{} }
 func (m *ConsumerAddrsToPrune) String() string { return proto.CompactTextString(m) }
 func (*ConsumerAddrsToPrune) ProtoMessage()    {}
 func (*ConsumerAddrsToPrune) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f22ec409a72b7b72, []int{19}
+	return fileDescriptor_f22ec409a72b7b72, []int{20}
 }
 func (m *ConsumerAddrsToPrune) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1314,6 +1371,7 @@ func init() {
 	proto.RegisterType((*VscSendTimestamp)(nil), "interchain_security.ccv.provider.v1.VscSendTimestamp")
 	proto.RegisterType((*ValidatorSetChangePackets)(nil), "interchain_security.ccv.provider.v1.ValidatorSetChangePackets")
 	proto.RegisterType((*MaturedUnbondingOps)(nil), "interchain_security.ccv.provider.v1.MaturedUnbondingOps")
+	proto.RegisterType((*ExportedVscSendTimestamp)(nil), "interchain_security.ccv.provider.v1.ExportedVscSendTimestamp")
 	proto.RegisterType((*KeyAssignmentReplacement)(nil), "interchain_security.ccv.provider.v1.KeyAssignmentReplacement")
 	proto.RegisterType((*ValidatorConsumerPubKey)(nil), "interchain_security.ccv.provider.v1.ValidatorConsumerPubKey")
 	proto.RegisterType((*ValidatorByConsumerAddr)(nil), "interchain_security.ccv.provider.v1.ValidatorByConsumerAddr")
@@ -1325,109 +1383,112 @@ func init() {
 }
 
 var fileDescriptor_f22ec409a72b7b72 = []byte{
-	// 1632 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x72, 0x1b, 0xc7,
-	0x11, 0xe6, 0x12, 0x20, 0x45, 0x34, 0xf8, 0xa7, 0x25, 0x65, 0x81, 0x0a, 0x03, 0x42, 0xeb, 0xd8,
-	0x61, 0xca, 0xe5, 0x85, 0x49, 0x5d, 0x5c, 0xaa, 0xb8, 0x5c, 0x24, 0x68, 0x5b, 0x34, 0x63, 0x8b,
-	0x5e, 0x32, 0x54, 0x25, 0x39, 0x6c, 0x0d, 0x66, 0x47, 0xc0, 0x14, 0x77, 0x77, 0x56, 0x33, 0xb3,
-	0x2b, 0xe1, 0x92, 0x73, 0x8e, 0xce, 0xcd, 0x95, 0x5c, 0x9c, 0x27, 0xc8, 0x6b, 0xf8, 0xe8, 0x63,
-	0x4e, 0x76, 0x4a, 0x3a, 0xe4, 0x90, 0x97, 0x48, 0xcd, 0xec, 0x3f, 0x49, 0x28, 0x50, 0x25, 0xbe,
-	0xcd, 0xce, 0x74, 0x7f, 0xdd, 0x3d, 0xdd, 0xfd, 0xf5, 0x00, 0xb0, 0x4f, 0x43, 0x49, 0x38, 0x1e,
-	0x23, 0x1a, 0xba, 0x82, 0xe0, 0x98, 0x53, 0x39, 0xe9, 0x63, 0x9c, 0xf4, 0x23, 0xce, 0x12, 0xea,
-	0x11, 0xde, 0x4f, 0xf6, 0x8a, 0xb5, 0x1d, 0x71, 0x26, 0x99, 0xf9, 0xf6, 0x0d, 0x3a, 0x36, 0xc6,
-	0x89, 0x5d, 0xc8, 0x25, 0x7b, 0xf7, 0x3e, 0x98, 0x06, 0x9c, 0xec, 0xf5, 0xc5, 0x18, 0x71, 0xe2,
-	0xb9, 0x98, 0x85, 0x22, 0x0e, 0x72, 0xd8, 0x7b, 0xef, 0xbc, 0x46, 0xe3, 0x39, 0xe5, 0x24, 0x13,
-	0xdb, 0x1c, 0xb1, 0x11, 0xd3, 0xcb, 0xbe, 0x5a, 0x65, 0xbb, 0x3b, 0x23, 0xc6, 0x46, 0x3e, 0xe9,
-	0xeb, 0xaf, 0x61, 0xfc, 0xb4, 0x2f, 0x69, 0x40, 0x84, 0x44, 0x41, 0x94, 0x09, 0x74, 0xaf, 0x0a,
-	0x78, 0x31, 0x47, 0x92, 0xb2, 0x30, 0x07, 0xa0, 0x43, 0xdc, 0xc7, 0x8c, 0x93, 0x3e, 0xf6, 0x29,
-	0x09, 0xa5, 0xb2, 0x9a, 0xae, 0x32, 0x81, 0xbe, 0x12, 0xf0, 0xe9, 0x68, 0x2c, 0xd3, 0x6d, 0xd1,
-	0x97, 0x24, 0xf4, 0x08, 0x0f, 0x68, 0x2a, 0x5c, 0x7e, 0x65, 0x0a, 0xdb, 0x95, 0x73, 0xcc, 0x27,
-	0x91, 0x64, 0xfd, 0x4b, 0x32, 0x11, 0xd9, 0xe9, 0xbb, 0x98, 0x89, 0x80, 0x89, 0x3e, 0x51, 0x37,
-	0x16, 0x62, 0xd2, 0x4f, 0xf6, 0x86, 0x44, 0xa2, 0xbd, 0x62, 0x23, 0xf7, 0x3b, 0x93, 0x1b, 0x22,
-	0x51, 0xca, 0x60, 0x46, 0x33, 0xbf, 0xad, 0x1f, 0x17, 0xa1, 0x33, 0xc8, 0x2e, 0xf2, 0xc0, 0xf3,
-	0xa8, 0x0a, 0xe9, 0x94, 0xb3, 0x88, 0x09, 0xe4, 0x9b, 0x9b, 0xb0, 0x20, 0xa9, 0xf4, 0x49, 0xc7,
-	0xe8, 0x19, 0xbb, 0x2d, 0x27, 0xfd, 0x30, 0x7b, 0xd0, 0xf6, 0x88, 0xc0, 0x9c, 0x46, 0x4a, 0xb8,
-	0x33, 0xaf, 0xcf, 0xaa, 0x5b, 0xe6, 0x16, 0x2c, 0xa5, 0x79, 0xa0, 0x5e, 0xa7, 0xa1, 0x8f, 0x6f,
-	0xe9, 0xef, 0x63, 0xcf, 0xfc, 0x0c, 0x56, 0x69, 0x48, 0x25, 0x45, 0xbe, 0x3b, 0x26, 0xea, 0x36,
-	0x3a, 0xcd, 0x9e, 0xb1, 0xdb, 0xde, 0xbf, 0x67, 0xd3, 0x21, 0xb6, 0xd5, 0x05, 0xda, 0xd9, 0xb5,
-	0x25, 0x7b, 0xf6, 0x23, 0x2d, 0x71, 0xd8, 0xfc, 0xee, 0x87, 0x9d, 0x39, 0x67, 0x25, 0xd3, 0x4b,
-	0x37, 0xcd, 0xfb, 0xb0, 0x3c, 0x22, 0x21, 0x11, 0x54, 0xb8, 0x63, 0x24, 0xc6, 0x9d, 0x85, 0x9e,
-	0xb1, 0xbb, 0xec, 0xb4, 0xb3, 0xbd, 0x47, 0x48, 0x8c, 0xcd, 0x1d, 0x68, 0x0f, 0x69, 0x88, 0xf8,
-	0x24, 0x95, 0x58, 0xd4, 0x12, 0x90, 0x6e, 0x69, 0x81, 0x01, 0x80, 0x88, 0xd0, 0xf3, 0xd0, 0x55,
-	0xd9, 0xee, 0xdc, 0xca, 0x1c, 0x49, 0x33, 0x6d, 0xe7, 0x99, 0xb6, 0xcf, 0xf3, 0x52, 0x38, 0x5c,
-	0x52, 0x8e, 0x7c, 0xfd, 0xe3, 0x8e, 0xe1, 0xb4, 0xb4, 0x9e, 0x3a, 0x31, 0xbf, 0x84, 0xf5, 0x38,
-	0x1c, 0xb2, 0xd0, 0xa3, 0xe1, 0xc8, 0x8d, 0x08, 0xa7, 0xcc, 0xeb, 0x2c, 0x69, 0xa8, 0xad, 0x6b,
-	0x50, 0x47, 0x59, 0xd1, 0xa4, 0x48, 0xdf, 0x28, 0xa4, 0xb5, 0x42, 0xf9, 0x54, 0xeb, 0x9a, 0x5f,
-	0x81, 0x89, 0x71, 0xa2, 0x5d, 0x62, 0xb1, 0xcc, 0x11, 0x5b, 0xb3, 0x23, 0xae, 0x63, 0x9c, 0x9c,
-	0xa7, 0xda, 0x19, 0xe4, 0x1f, 0xe0, 0xae, 0xe4, 0x28, 0x14, 0x4f, 0x09, 0xbf, 0x8a, 0x0b, 0xb3,
-	0xe3, 0xde, 0xc9, 0x31, 0xea, 0xe0, 0x8f, 0xa0, 0x97, 0x77, 0xa2, 0xcb, 0x89, 0x47, 0x85, 0xe4,
-	0x74, 0x18, 0x2b, 0x5d, 0xf7, 0x29, 0x47, 0x58, 0xd7, 0x48, 0x5b, 0x17, 0x41, 0x37, 0x97, 0x73,
-	0x6a, 0x62, 0x9f, 0x66, 0x52, 0xe6, 0x63, 0xf8, 0xc5, 0xd0, 0x67, 0xf8, 0x52, 0x28, 0xe7, 0xdc,
-	0x1a, 0x92, 0x36, 0x1d, 0x50, 0x21, 0x14, 0xda, 0x72, 0xcf, 0xd8, 0x6d, 0x38, 0xf7, 0x53, 0xd9,
-	0x53, 0xc2, 0x8f, 0x2a, 0x92, 0xe7, 0x15, 0x41, 0xf3, 0x7d, 0x30, 0xc7, 0x54, 0x48, 0xc6, 0x29,
-	0x46, 0xbe, 0x4b, 0x42, 0xc9, 0x29, 0x11, 0x9d, 0x15, 0xad, 0x7e, 0xbb, 0x3c, 0xf9, 0x24, 0x3d,
-	0x30, 0x3f, 0x87, 0xfb, 0x53, 0x8d, 0xba, 0x78, 0x8c, 0xc2, 0x90, 0xf8, 0x9d, 0x55, 0x1d, 0xca,
-	0x8e, 0x37, 0xc5, 0xe6, 0x20, 0x15, 0x7b, 0xb8, 0xf4, 0xa7, 0x6f, 0x77, 0xe6, 0xbe, 0xf9, 0x76,
-	0x67, 0xce, 0xfa, 0xbb, 0x01, 0x77, 0x07, 0x45, 0xe0, 0x01, 0x4b, 0x90, 0xff, 0x53, 0x36, 0xd8,
-	0x01, 0xb4, 0x84, 0x64, 0x51, 0x5a, 0xd2, 0xcd, 0x37, 0x28, 0xe9, 0x25, 0xa5, 0xa6, 0x0e, 0xac,
-	0xbf, 0x1a, 0xb0, 0xf9, 0xc9, 0xb3, 0x98, 0x26, 0x0c, 0xa3, 0xff, 0x0b, 0x1f, 0x9c, 0xc0, 0x0a,
-	0xa9, 0xe0, 0x89, 0x4e, 0xa3, 0xd7, 0xd8, 0x6d, 0xef, 0xbf, 0x63, 0xa7, 0xe4, 0x64, 0x17, 0x9c,
-	0x95, 0x11, 0x94, 0x5d, 0xb5, 0xee, 0xd4, 0x75, 0xad, 0x7f, 0x1b, 0xb0, 0xfe, 0x99, 0xcf, 0x86,
-	0xc8, 0x3f, 0xf3, 0x91, 0x18, 0xab, 0xe4, 0x4d, 0x54, 0xd4, 0x9c, 0x64, 0x5d, 0xa3, 0xbd, 0x9b,
-	0x39, 0x6a, 0xa5, 0xa6, 0xfb, 0xf8, 0x63, 0xb8, 0x5d, 0xd4, 0x71, 0x71, 0xb9, 0x3a, 0x98, 0xc3,
-	0x8d, 0x97, 0x3f, 0xec, 0xac, 0xe5, 0x39, 0x1c, 0xe8, 0x8b, 0x3e, 0x72, 0xd6, 0x70, 0x6d, 0xc3,
-	0x33, 0xbb, 0xd0, 0xa6, 0x43, 0xec, 0x0a, 0xf2, 0xcc, 0x0d, 0xe3, 0x40, 0xe7, 0xa5, 0xe9, 0xb4,
-	0xe8, 0x10, 0x9f, 0x91, 0x67, 0x5f, 0xc6, 0x81, 0xf9, 0x00, 0xde, 0xca, 0x27, 0x9c, 0x9b, 0x20,
-	0x5f, 0xcf, 0x2f, 0x17, 0x79, 0x1e, 0xd7, 0x69, 0x5a, 0x76, 0x36, 0xf2, 0xd3, 0x0b, 0xe4, 0x2b,
-	0x63, 0x07, 0x9e, 0xc7, 0xad, 0x7f, 0x2d, 0xc0, 0xe2, 0x29, 0xe2, 0x28, 0x10, 0xe6, 0x39, 0xac,
-	0x49, 0x12, 0x44, 0x3e, 0x92, 0xc4, 0x4d, 0x39, 0x32, 0x8b, 0xf4, 0x3d, 0xcd, 0x9d, 0xd5, 0xd9,
-	0x62, 0x57, 0xa6, 0x49, 0xb2, 0x67, 0x0f, 0xf4, 0xee, 0x99, 0x44, 0x92, 0x38, 0xab, 0x39, 0x46,
-	0xba, 0x69, 0x7e, 0x08, 0x1d, 0xc9, 0x63, 0x21, 0x4b, 0xf6, 0x2a, 0xdb, 0x36, 0x4d, 0xe5, 0x5b,
-	0xf9, 0x79, 0xda, 0xf0, 0x45, 0xbb, 0xde, 0x4c, 0x54, 0x8d, 0xff, 0x85, 0xa8, 0xce, 0x60, 0x43,
-	0xb1, 0xfc, 0x55, 0xcc, 0xe6, 0xec, 0x98, 0xb7, 0x95, 0x7e, 0x1d, 0xf4, 0x2b, 0x30, 0x13, 0x81,
-	0xaf, 0x62, 0x2e, 0xbc, 0x81, 0x9f, 0x89, 0xc0, 0x75, 0x48, 0x0f, 0xb6, 0x85, 0x2a, 0x3e, 0x37,
-	0x20, 0x52, 0xd3, 0x5e, 0xe4, 0x93, 0x90, 0x8a, 0x71, 0x0e, 0xbe, 0x38, 0x3b, 0xf8, 0x96, 0x06,
-	0xfa, 0x42, 0xe1, 0x38, 0x39, 0x4c, 0x66, 0x65, 0x00, 0xdd, 0x9b, 0xad, 0x14, 0x09, 0xba, 0xa5,
-	0x13, 0xf4, 0xb3, 0x1b, 0x20, 0x8a, 0x2c, 0xed, 0xc3, 0x9d, 0x00, 0xbd, 0x70, 0xe5, 0x98, 0x33,
-	0x29, 0x7d, 0xe2, 0xb9, 0x11, 0xc2, 0x97, 0x44, 0x0a, 0x3d, 0xa3, 0x1a, 0xce, 0x46, 0x80, 0x5e,
-	0x9c, 0xe7, 0x67, 0xa7, 0xe9, 0x91, 0x29, 0xe0, 0xdd, 0x0a, 0xa5, 0x3f, 0x47, 0xdc, 0x73, 0x3d,
-	0x12, 0xb2, 0xc0, 0xe5, 0x64, 0xa4, 0x78, 0x0f, 0xa5, 0xec, 0x4e, 0x48, 0x31, 0x96, 0xb2, 0x46,
-	0x56, 0xaf, 0x8c, 0xa2, 0x89, 0x07, 0x8c, 0x86, 0xd9, 0xec, 0xb6, 0x4a, 0xe6, 0x57, 0x68, 0x47,
-	0x0a, 0xcc, 0xa9, 0x60, 0x7d, 0x4a, 0x88, 0xf5, 0x2b, 0x68, 0xe9, 0x86, 0x3e, 0xc0, 0x97, 0xc2,
-	0xdc, 0x86, 0x96, 0xea, 0x0c, 0x22, 0x04, 0x11, 0x1d, 0xa3, 0xd7, 0xd8, 0x6d, 0x39, 0xe5, 0x86,
-	0x25, 0x61, 0x6b, 0xda, 0x9b, 0x45, 0x98, 0x4f, 0xe0, 0x56, 0x44, 0xf4, 0x40, 0xd5, 0x8a, 0xed,
-	0xfd, 0x8f, 0xec, 0x19, 0x1e, 0x9c, 0xf6, 0x34, 0x40, 0x27, 0x47, 0xb3, 0x78, 0xf9, 0x52, 0xba,
-	0xc2, 0xe3, 0xc2, 0xbc, 0xb8, 0x6a, 0xf4, 0xd7, 0x6f, 0x64, 0xf4, 0x0a, 0x5e, 0x69, 0xf3, 0x3d,
-	0x68, 0x1f, 0xa4, 0x61, 0xff, 0x86, 0x0a, 0x79, 0xfd, 0x5a, 0x96, 0xab, 0xd7, 0xf2, 0x39, 0xac,
-	0x66, 0xe3, 0xe7, 0x9c, 0x69, 0x52, 0x32, 0x7f, 0x0e, 0x90, 0xcd, 0x2d, 0x45, 0x66, 0x29, 0x6b,
-	0xb7, 0xb2, 0x9d, 0x63, 0xaf, 0x36, 0x46, 0xe6, 0x6b, 0x63, 0xc4, 0x72, 0x60, 0xed, 0x42, 0xe0,
-	0xdf, 0xe6, 0x6f, 0x93, 0xc7, 0x91, 0x30, 0xef, 0xc0, 0xa2, 0xea, 0xa3, 0x0c, 0xa8, 0xe9, 0x2c,
-	0x24, 0x02, 0x1f, 0x7b, 0xe6, 0x6e, 0xf5, 0xfd, 0xc3, 0x22, 0x97, 0x7a, 0xa2, 0x33, 0xdf, 0x6b,
-	0xec, 0x36, 0x9d, 0xd5, 0xb8, 0x54, 0x3f, 0xf6, 0x84, 0xf5, 0x3b, 0x68, 0x57, 0x00, 0xcd, 0x55,
-	0x98, 0x2f, 0xb0, 0xe6, 0xa9, 0x67, 0x3e, 0x84, 0xad, 0x12, 0xa8, 0x4e, 0xc5, 0x29, 0x62, 0xcb,
-	0xb9, 0x5b, 0x08, 0xd4, 0xd8, 0x58, 0x58, 0x8f, 0x61, 0xf3, 0xb8, 0x6c, 0xfc, 0x82, 0xe8, 0x6b,
-	0x11, 0x1a, 0xf5, 0x41, 0xb9, 0x0d, 0xad, 0xe2, 0x91, 0xaf, 0xa3, 0x6f, 0x3a, 0xe5, 0x86, 0x15,
-	0xc0, 0xfa, 0x85, 0xc0, 0x67, 0x24, 0xf4, 0x4a, 0xb0, 0x29, 0x17, 0x70, 0x78, 0x15, 0x68, 0xe6,
-	0x47, 0x64, 0x69, 0x8e, 0xc1, 0xd6, 0x05, 0xf2, 0xa9, 0x87, 0x24, 0xe3, 0x67, 0x44, 0xaa, 0x34,
-	0x8e, 0x48, 0xde, 0x8e, 0x0e, 0x34, 0x7d, 0x2a, 0x64, 0x56, 0x59, 0x1f, 0x4e, 0xad, 0xac, 0x64,
-	0xcf, 0x9e, 0x06, 0x72, 0x84, 0x24, 0xca, 0x7a, 0x51, 0x63, 0x59, 0xbf, 0x84, 0x8d, 0x2f, 0x90,
-	0x8c, 0x39, 0xf1, 0x6a, 0x39, 0x5e, 0x87, 0x86, 0xca, 0x9f, 0xa1, 0xf3, 0xa7, 0x96, 0xd6, 0x9f,
-	0x0d, 0xe8, 0x9c, 0x90, 0xc9, 0x81, 0x10, 0x74, 0x14, 0x06, 0x24, 0x94, 0x8a, 0x62, 0x10, 0x26,
-	0x6a, 0x69, 0xbe, 0x0d, 0x2b, 0xc5, 0x48, 0xd3, 0x93, 0xcc, 0xd0, 0x93, 0x6c, 0x39, 0xdf, 0x54,
-	0xb5, 0x6b, 0x3e, 0x04, 0x88, 0x38, 0x49, 0x5c, 0xec, 0x5e, 0x92, 0x49, 0x76, 0x41, 0xdb, 0xd5,
-	0x09, 0x95, 0xfe, 0xba, 0xb1, 0x4f, 0xe3, 0xa1, 0x4f, 0xf1, 0x09, 0x99, 0x38, 0x4b, 0x4a, 0x7e,
-	0x70, 0x42, 0x26, 0xea, 0xc5, 0x11, 0xb1, 0xe7, 0x84, 0xeb, 0xb1, 0xd2, 0x70, 0xd2, 0x0f, 0xeb,
-	0x2f, 0x06, 0xdc, 0x2d, 0x22, 0xcd, 0x2b, 0xe1, 0x34, 0x1e, 0x2a, 0x8d, 0xd7, 0x64, 0xfc, 0x9a,
-	0xb7, 0xf3, 0x37, 0x78, 0xfb, 0x31, 0x2c, 0x17, 0xb5, 0xa7, 0xfc, 0x6d, 0xcc, 0xe0, 0x6f, 0x3b,
-	0xd7, 0x38, 0x21, 0x13, 0xeb, 0x8f, 0x15, 0xdf, 0x0e, 0x27, 0x15, 0x5a, 0xe1, 0xff, 0xc5, 0xb7,
-	0xc2, 0x6c, 0xd5, 0x37, 0x5c, 0xd5, 0xbf, 0x16, 0x40, 0xe3, 0x7a, 0x00, 0xd6, 0xdf, 0x0c, 0xd8,
-	0xac, 0x5a, 0x15, 0xe7, 0xec, 0x94, 0xc7, 0x21, 0x79, 0x9d, 0xf5, 0xb2, 0xb2, 0xe7, 0xab, 0x95,
-	0xfd, 0x04, 0x56, 0x6b, 0x4e, 0x89, 0xec, 0x36, 0x3e, 0x98, 0x89, 0xdc, 0x2a, 0xc4, 0xe5, 0xac,
-	0x54, 0xe3, 0x10, 0x87, 0x4f, 0xbe, 0x7b, 0xd9, 0x35, 0xbe, 0x7f, 0xd9, 0x35, 0xfe, 0xf9, 0xb2,
-	0x6b, 0x7c, 0xfd, 0xaa, 0x3b, 0xf7, 0xfd, 0xab, 0xee, 0xdc, 0x3f, 0x5e, 0x75, 0xe7, 0x7e, 0xff,
-	0xd1, 0x88, 0xca, 0x71, 0x3c, 0xb4, 0x31, 0x0b, 0xfa, 0xd9, 0x4f, 0xd7, 0xd2, 0xd6, 0xfb, 0xc5,
-	0xef, 0xfa, 0xe4, 0x41, 0xff, 0x45, 0xfd, 0x7f, 0x06, 0x39, 0x89, 0x88, 0x18, 0x2e, 0xea, 0x86,
-	0x7b, 0xf0, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x42, 0xfe, 0x8b, 0x98, 0x10, 0x00, 0x00,
+	// 1674 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x6f, 0x1b, 0xc7,
+	0x15, 0xd7, 0x8a, 0x94, 0x2c, 0x3e, 0xea, 0x9f, 0x57, 0x72, 0x4c, 0xb9, 0x2a, 0x45, 0x6f, 0x9a,
+	0x54, 0x45, 0x90, 0x65, 0x24, 0xa3, 0x40, 0x60, 0x34, 0x08, 0x24, 0xca, 0x89, 0x15, 0x35, 0xb1,
+	0xb2, 0x52, 0x65, 0xb4, 0x3d, 0x2c, 0x86, 0xb3, 0x63, 0x72, 0xa0, 0xdd, 0x9d, 0xf5, 0xcc, 0xec,
+	0xda, 0xbc, 0xf4, 0xdc, 0x63, 0x7a, 0x0b, 0xda, 0x4b, 0xda, 0x2f, 0xd0, 0xaf, 0x91, 0x63, 0x8e,
+	0x3d, 0x25, 0x85, 0x7d, 0xe8, 0xa1, 0x5f, 0xa2, 0x98, 0xd9, 0xbf, 0xa4, 0x44, 0x95, 0x46, 0x9b,
+	0xdb, 0xec, 0x9b, 0xf7, 0x7e, 0xef, 0xff, 0x7b, 0x43, 0xc2, 0x3e, 0x0d, 0x25, 0xe1, 0x78, 0x88,
+	0x68, 0xe8, 0x0a, 0x82, 0x63, 0x4e, 0xe5, 0xa8, 0x8b, 0x71, 0xd2, 0x8d, 0x38, 0x4b, 0xa8, 0x47,
+	0x78, 0x37, 0xd9, 0x2b, 0xce, 0x76, 0xc4, 0x99, 0x64, 0xe6, 0xdb, 0xd7, 0xc8, 0xd8, 0x18, 0x27,
+	0x76, 0xc1, 0x97, 0xec, 0xdd, 0xfb, 0x60, 0x1a, 0x70, 0xb2, 0xd7, 0x15, 0x43, 0xc4, 0x89, 0xe7,
+	0x62, 0x16, 0x8a, 0x38, 0xc8, 0x61, 0xef, 0xbd, 0x73, 0x83, 0xc4, 0x0b, 0xca, 0x49, 0xc6, 0xb6,
+	0x39, 0x60, 0x03, 0xa6, 0x8f, 0x5d, 0x75, 0xca, 0xa8, 0x3b, 0x03, 0xc6, 0x06, 0x3e, 0xe9, 0xea,
+	0xaf, 0x7e, 0xfc, 0xac, 0x2b, 0x69, 0x40, 0x84, 0x44, 0x41, 0x94, 0x31, 0xb4, 0x27, 0x19, 0xbc,
+	0x98, 0x23, 0x49, 0x59, 0x98, 0x03, 0xd0, 0x3e, 0xee, 0x62, 0xc6, 0x49, 0x17, 0xfb, 0x94, 0x84,
+	0x52, 0x69, 0x4d, 0x4f, 0x19, 0x43, 0x57, 0x31, 0xf8, 0x74, 0x30, 0x94, 0x29, 0x59, 0x74, 0x25,
+	0x09, 0x3d, 0xc2, 0x03, 0x9a, 0x32, 0x97, 0x5f, 0x99, 0xc0, 0x76, 0xe5, 0x1e, 0xf3, 0x51, 0x24,
+	0x59, 0xf7, 0x92, 0x8c, 0x44, 0x76, 0xfb, 0x2e, 0x66, 0x22, 0x60, 0xa2, 0x4b, 0x54, 0xc4, 0x42,
+	0x4c, 0xba, 0xc9, 0x5e, 0x9f, 0x48, 0xb4, 0x57, 0x10, 0x72, 0xbb, 0x33, 0xbe, 0x3e, 0x12, 0x25,
+	0x0f, 0x66, 0x34, 0xb3, 0xdb, 0xfa, 0x61, 0x11, 0x5a, 0xbd, 0x2c, 0x90, 0x07, 0x9e, 0x47, 0x95,
+	0x4b, 0xa7, 0x9c, 0x45, 0x4c, 0x20, 0xdf, 0xdc, 0x84, 0x05, 0x49, 0xa5, 0x4f, 0x5a, 0x46, 0xc7,
+	0xd8, 0x6d, 0x38, 0xe9, 0x87, 0xd9, 0x81, 0xa6, 0x47, 0x04, 0xe6, 0x34, 0x52, 0xcc, 0xad, 0x79,
+	0x7d, 0x57, 0x25, 0x99, 0x5b, 0xb0, 0x94, 0xe6, 0x81, 0x7a, 0xad, 0x9a, 0xbe, 0xbe, 0xa5, 0xbf,
+	0x8f, 0x3d, 0xf3, 0x53, 0x58, 0xa5, 0x21, 0x95, 0x14, 0xf9, 0xee, 0x90, 0xa8, 0x68, 0xb4, 0xea,
+	0x1d, 0x63, 0xb7, 0xb9, 0x7f, 0xcf, 0xa6, 0x7d, 0x6c, 0xab, 0x00, 0xda, 0x59, 0xd8, 0x92, 0x3d,
+	0xfb, 0xb1, 0xe6, 0x38, 0xac, 0x7f, 0xfb, 0xfd, 0xce, 0x9c, 0xb3, 0x92, 0xc9, 0xa5, 0x44, 0xf3,
+	0x3e, 0x2c, 0x0f, 0x48, 0x48, 0x04, 0x15, 0xee, 0x10, 0x89, 0x61, 0x6b, 0xa1, 0x63, 0xec, 0x2e,
+	0x3b, 0xcd, 0x8c, 0xf6, 0x18, 0x89, 0xa1, 0xb9, 0x03, 0xcd, 0x3e, 0x0d, 0x11, 0x1f, 0xa5, 0x1c,
+	0x8b, 0x9a, 0x03, 0x52, 0x92, 0x66, 0xe8, 0x01, 0x88, 0x08, 0xbd, 0x08, 0x5d, 0x95, 0xed, 0xd6,
+	0xad, 0xcc, 0x90, 0x34, 0xd3, 0x76, 0x9e, 0x69, 0xfb, 0x3c, 0x2f, 0x85, 0xc3, 0x25, 0x65, 0xc8,
+	0x57, 0x3f, 0xec, 0x18, 0x4e, 0x43, 0xcb, 0xa9, 0x1b, 0xf3, 0x0b, 0x58, 0x8f, 0xc3, 0x3e, 0x0b,
+	0x3d, 0x1a, 0x0e, 0xdc, 0x88, 0x70, 0xca, 0xbc, 0xd6, 0x92, 0x86, 0xda, 0xba, 0x02, 0x75, 0x94,
+	0x15, 0x4d, 0x8a, 0xf4, 0xb5, 0x42, 0x5a, 0x2b, 0x84, 0x4f, 0xb5, 0xac, 0xf9, 0x25, 0x98, 0x18,
+	0x27, 0xda, 0x24, 0x16, 0xcb, 0x1c, 0xb1, 0x31, 0x3b, 0xe2, 0x3a, 0xc6, 0xc9, 0x79, 0x2a, 0x9d,
+	0x41, 0xfe, 0x1e, 0xee, 0x4a, 0x8e, 0x42, 0xf1, 0x8c, 0xf0, 0x49, 0x5c, 0x98, 0x1d, 0xf7, 0x4e,
+	0x8e, 0x31, 0x0e, 0xfe, 0x18, 0x3a, 0x79, 0x27, 0xba, 0x9c, 0x78, 0x54, 0x48, 0x4e, 0xfb, 0xb1,
+	0x92, 0x75, 0x9f, 0x71, 0x84, 0x75, 0x8d, 0x34, 0x75, 0x11, 0xb4, 0x73, 0x3e, 0x67, 0x8c, 0xed,
+	0x93, 0x8c, 0xcb, 0x7c, 0x02, 0x3f, 0xeb, 0xfb, 0x0c, 0x5f, 0x0a, 0x65, 0x9c, 0x3b, 0x86, 0xa4,
+	0x55, 0x07, 0x54, 0x08, 0x85, 0xb6, 0xdc, 0x31, 0x76, 0x6b, 0xce, 0xfd, 0x94, 0xf7, 0x94, 0xf0,
+	0xa3, 0x0a, 0xe7, 0x79, 0x85, 0xd1, 0x7c, 0x1f, 0xcc, 0x21, 0x15, 0x92, 0x71, 0x8a, 0x91, 0xef,
+	0x92, 0x50, 0x72, 0x4a, 0x44, 0x6b, 0x45, 0x8b, 0xdf, 0x2e, 0x6f, 0x1e, 0xa5, 0x17, 0xe6, 0x67,
+	0x70, 0x7f, 0xaa, 0x52, 0x17, 0x0f, 0x51, 0x18, 0x12, 0xbf, 0xb5, 0xaa, 0x5d, 0xd9, 0xf1, 0xa6,
+	0xe8, 0xec, 0xa5, 0x6c, 0x0f, 0x97, 0xfe, 0xf8, 0xcd, 0xce, 0xdc, 0xd7, 0xdf, 0xec, 0xcc, 0x59,
+	0x7f, 0x37, 0xe0, 0x6e, 0xaf, 0x70, 0x3c, 0x60, 0x09, 0xf2, 0x7f, 0xcc, 0x06, 0x3b, 0x80, 0x86,
+	0x90, 0x2c, 0x4a, 0x4b, 0xba, 0xfe, 0x06, 0x25, 0xbd, 0xa4, 0xc4, 0xd4, 0x85, 0xf5, 0x17, 0x03,
+	0x36, 0x1f, 0x3d, 0x8f, 0x69, 0xc2, 0x30, 0xfa, 0xbf, 0xcc, 0x83, 0x13, 0x58, 0x21, 0x15, 0x3c,
+	0xd1, 0xaa, 0x75, 0x6a, 0xbb, 0xcd, 0xfd, 0x77, 0xec, 0x74, 0x38, 0xd9, 0xc5, 0xcc, 0xca, 0x06,
+	0x94, 0x5d, 0xd5, 0xee, 0x8c, 0xcb, 0x5a, 0xff, 0x36, 0x60, 0xfd, 0x53, 0x9f, 0xf5, 0x91, 0x7f,
+	0xe6, 0x23, 0x31, 0x54, 0xc9, 0x1b, 0x29, 0xaf, 0x39, 0xc9, 0xba, 0x46, 0x5b, 0x37, 0xb3, 0xd7,
+	0x4a, 0x4c, 0xf7, 0xf1, 0xc7, 0x70, 0xbb, 0xa8, 0xe3, 0x22, 0xb8, 0xda, 0x99, 0xc3, 0x8d, 0x57,
+	0xdf, 0xef, 0xac, 0xe5, 0x39, 0xec, 0xe9, 0x40, 0x1f, 0x39, 0x6b, 0x78, 0x8c, 0xe0, 0x99, 0x6d,
+	0x68, 0xd2, 0x3e, 0x76, 0x05, 0x79, 0xee, 0x86, 0x71, 0xa0, 0xf3, 0x52, 0x77, 0x1a, 0xb4, 0x8f,
+	0xcf, 0xc8, 0xf3, 0x2f, 0xe2, 0xc0, 0x7c, 0x00, 0x6f, 0xe5, 0x1b, 0xce, 0x4d, 0x90, 0xaf, 0xf7,
+	0x97, 0x8b, 0x3c, 0x8f, 0xeb, 0x34, 0x2d, 0x3b, 0x1b, 0xf9, 0xed, 0x05, 0xf2, 0x95, 0xb2, 0x03,
+	0xcf, 0xe3, 0xd6, 0xbf, 0x16, 0x60, 0xf1, 0x14, 0x71, 0x14, 0x08, 0xf3, 0x1c, 0xd6, 0x24, 0x09,
+	0x22, 0x1f, 0x49, 0xe2, 0xa6, 0x33, 0x32, 0xf3, 0xf4, 0x3d, 0x3d, 0x3b, 0xab, 0xbb, 0xc5, 0xae,
+	0x6c, 0x93, 0x64, 0xcf, 0xee, 0x69, 0xea, 0x99, 0x44, 0x92, 0x38, 0xab, 0x39, 0x46, 0x4a, 0x34,
+	0x3f, 0x84, 0x96, 0xe4, 0xb1, 0x90, 0xe5, 0xf4, 0x2a, 0xdb, 0x36, 0x4d, 0xe5, 0x5b, 0xf9, 0x7d,
+	0xda, 0xf0, 0x45, 0xbb, 0x5e, 0x3f, 0xa8, 0x6a, 0xff, 0xcb, 0xa0, 0x3a, 0x83, 0x0d, 0x35, 0xe5,
+	0x27, 0x31, 0xeb, 0xb3, 0x63, 0xde, 0x56, 0xf2, 0xe3, 0xa0, 0x5f, 0x82, 0x99, 0x08, 0x3c, 0x89,
+	0xb9, 0xf0, 0x06, 0x76, 0x26, 0x02, 0x8f, 0x43, 0x7a, 0xb0, 0x2d, 0x54, 0xf1, 0xb9, 0x01, 0x91,
+	0x7a, 0xec, 0x45, 0x3e, 0x09, 0xa9, 0x18, 0xe6, 0xe0, 0x8b, 0xb3, 0x83, 0x6f, 0x69, 0xa0, 0xcf,
+	0x15, 0x8e, 0x93, 0xc3, 0x64, 0x5a, 0x7a, 0xd0, 0xbe, 0x5e, 0x4b, 0x91, 0xa0, 0x5b, 0x3a, 0x41,
+	0x3f, 0xb9, 0x06, 0xa2, 0xc8, 0xd2, 0x3e, 0xdc, 0x09, 0xd0, 0x4b, 0x57, 0x0e, 0x39, 0x93, 0xd2,
+	0x27, 0x9e, 0x1b, 0x21, 0x7c, 0x49, 0xa4, 0xd0, 0x3b, 0xaa, 0xe6, 0x6c, 0x04, 0xe8, 0xe5, 0x79,
+	0x7e, 0x77, 0x9a, 0x5e, 0x99, 0x02, 0xde, 0xad, 0x8c, 0xf4, 0x17, 0x88, 0x7b, 0xae, 0x47, 0x42,
+	0x16, 0xb8, 0x9c, 0x0c, 0xd4, 0xdc, 0x43, 0xe9, 0x74, 0x27, 0xa4, 0x58, 0x4b, 0x59, 0x23, 0xab,
+	0x57, 0x46, 0xd1, 0xc4, 0x3d, 0x46, 0xc3, 0x6c, 0x77, 0x5b, 0xe5, 0xe4, 0x57, 0x68, 0x47, 0x0a,
+	0xcc, 0xa9, 0x60, 0x7d, 0x42, 0x88, 0xf5, 0x0b, 0x68, 0xe8, 0x86, 0x3e, 0xc0, 0x97, 0xc2, 0xdc,
+	0x86, 0x86, 0xea, 0x0c, 0x22, 0x04, 0x11, 0x2d, 0xa3, 0x53, 0xdb, 0x6d, 0x38, 0x25, 0xc1, 0x92,
+	0xb0, 0x35, 0xed, 0xcd, 0x22, 0xcc, 0xa7, 0x70, 0x2b, 0x22, 0x7a, 0xa1, 0x6a, 0xc1, 0xe6, 0xfe,
+	0x47, 0xf6, 0x0c, 0x0f, 0x4e, 0x7b, 0x1a, 0xa0, 0x93, 0xa3, 0x59, 0xbc, 0x7c, 0x29, 0x4d, 0xcc,
+	0x71, 0x61, 0x5e, 0x4c, 0x2a, 0xfd, 0xd5, 0x1b, 0x29, 0x9d, 0xc0, 0x2b, 0x75, 0xbe, 0x07, 0xcd,
+	0x83, 0xd4, 0xed, 0x5f, 0x53, 0x21, 0xaf, 0x86, 0x65, 0xb9, 0x1a, 0x96, 0xcf, 0x60, 0x35, 0x5b,
+	0x3f, 0xe7, 0x4c, 0x0f, 0x25, 0xf3, 0xa7, 0x00, 0xd9, 0xde, 0x52, 0xc3, 0x2c, 0x9d, 0xda, 0x8d,
+	0x8c, 0x72, 0xec, 0x8d, 0xad, 0x91, 0xf9, 0xb1, 0x35, 0x62, 0x39, 0xb0, 0x76, 0x21, 0xf0, 0x6f,
+	0xf2, 0xb7, 0xc9, 0x93, 0x48, 0x98, 0x77, 0x60, 0x51, 0xf5, 0x51, 0x06, 0x54, 0x77, 0x16, 0x12,
+	0x81, 0x8f, 0x3d, 0x73, 0xb7, 0xfa, 0xfe, 0x61, 0x91, 0x4b, 0x3d, 0xd1, 0x9a, 0xef, 0xd4, 0x76,
+	0xeb, 0xce, 0x6a, 0x5c, 0x8a, 0x1f, 0x7b, 0xc2, 0xfa, 0x2d, 0x34, 0x2b, 0x80, 0xe6, 0x2a, 0xcc,
+	0x17, 0x58, 0xf3, 0xd4, 0x33, 0x1f, 0xc2, 0x56, 0x09, 0x34, 0x3e, 0x8a, 0x53, 0xc4, 0x86, 0x73,
+	0xb7, 0x60, 0x18, 0x9b, 0xc6, 0xc2, 0x7a, 0x02, 0x9b, 0xc7, 0x65, 0xe3, 0x17, 0x83, 0x7e, 0xcc,
+	0x43, 0x63, 0x7c, 0x51, 0x6e, 0x43, 0xa3, 0x78, 0xe4, 0x6b, 0xef, 0xeb, 0x4e, 0x49, 0xb0, 0x02,
+	0x58, 0xbf, 0x10, 0xf8, 0x8c, 0x84, 0x5e, 0x09, 0x36, 0x25, 0x00, 0x87, 0x93, 0x40, 0x33, 0x3f,
+	0x22, 0x4b, 0x75, 0x0c, 0xb6, 0x2e, 0x90, 0x4f, 0x3d, 0x24, 0x19, 0x3f, 0x23, 0x52, 0xa5, 0x71,
+	0x40, 0xf2, 0x76, 0x74, 0xa0, 0xee, 0x53, 0x21, 0xb3, 0xca, 0xfa, 0x70, 0x6a, 0x65, 0x25, 0x7b,
+	0xf6, 0x34, 0x90, 0x23, 0x24, 0x51, 0xd6, 0x8b, 0x1a, 0xcb, 0xfa, 0x39, 0x6c, 0x7c, 0x8e, 0x64,
+	0xcc, 0x89, 0x37, 0x96, 0xe3, 0x75, 0xa8, 0xa9, 0xfc, 0x19, 0x3a, 0x7f, 0xea, 0x68, 0xfd, 0xcd,
+	0x80, 0xd6, 0xa3, 0x97, 0x11, 0xe3, 0x92, 0x78, 0x57, 0x22, 0x72, 0x43, 0x78, 0x2f, 0x61, 0x43,
+	0x05, 0x4b, 0x90, 0xd0, 0x73, 0x0b, 0x3f, 0xd3, 0x3c, 0x36, 0xf7, 0x7f, 0x39, 0x53, 0x77, 0x4c,
+	0xaa, 0xcb, 0x1c, 0xb8, 0x9d, 0x4c, 0xd0, 0x85, 0xf5, 0x27, 0x03, 0x5a, 0x27, 0x64, 0x74, 0x20,
+	0x04, 0x1d, 0x84, 0x01, 0x09, 0xa5, 0x9a, 0x83, 0x08, 0x13, 0x75, 0x34, 0xdf, 0x86, 0x95, 0x62,
+	0xef, 0xea, 0x75, 0x6b, 0xe8, 0x75, 0xbb, 0x9c, 0x13, 0x55, 0x83, 0x99, 0x0f, 0x01, 0x22, 0x4e,
+	0x12, 0x17, 0xbb, 0x97, 0x64, 0x94, 0x65, 0x71, 0xbb, 0xba, 0x46, 0xd3, 0x9f, 0x60, 0xf6, 0x69,
+	0xdc, 0xf7, 0x29, 0x3e, 0x21, 0x23, 0x67, 0x49, 0xf1, 0xf7, 0x4e, 0xc8, 0x48, 0x3d, 0x8b, 0x22,
+	0xf6, 0x82, 0x70, 0xbd, 0xfb, 0x6a, 0x4e, 0xfa, 0x61, 0xfd, 0xd9, 0x80, 0xbb, 0x45, 0x3a, 0xf2,
+	0x72, 0x3d, 0x8d, 0xfb, 0x4a, 0xe2, 0x86, 0xb8, 0x5d, 0xb1, 0x76, 0xfe, 0x1a, 0x6b, 0x3f, 0x86,
+	0xe5, 0xa2, 0x41, 0x94, 0xbd, 0xb5, 0x19, 0xec, 0x6d, 0xe6, 0x12, 0x27, 0x64, 0x64, 0xfd, 0xa1,
+	0x62, 0xdb, 0xe1, 0xa8, 0x32, 0xfb, 0xf8, 0x7f, 0xb1, 0xad, 0x50, 0x5b, 0xb5, 0x0d, 0x57, 0xe5,
+	0xaf, 0x38, 0x50, 0xbb, 0xea, 0x80, 0xf5, 0x57, 0x03, 0x36, 0xab, 0x5a, 0xc5, 0x39, 0x3b, 0xe5,
+	0x71, 0x48, 0x6e, 0xd2, 0x5e, 0xb6, 0xdf, 0x7c, 0xb5, 0xfd, 0x9e, 0xc2, 0xea, 0x98, 0x51, 0x22,
+	0x8b, 0xc6, 0x07, 0x33, 0xd5, 0x58, 0x65, 0xba, 0x3a, 0x2b, 0x55, 0x3f, 0xc4, 0xe1, 0xd3, 0x6f,
+	0x5f, 0xb5, 0x8d, 0xef, 0x5e, 0xb5, 0x8d, 0x7f, 0xbe, 0x6a, 0x1b, 0x5f, 0xbd, 0x6e, 0xcf, 0x7d,
+	0xf7, 0xba, 0x3d, 0xf7, 0x8f, 0xd7, 0xed, 0xb9, 0xdf, 0x7d, 0x34, 0xa0, 0x72, 0x18, 0xf7, 0x6d,
+	0xcc, 0x82, 0x6e, 0xf6, 0xfb, 0xba, 0xd4, 0xf5, 0x7e, 0xf1, 0xe7, 0x43, 0xf2, 0xa0, 0xfb, 0x72,
+	0xfc, 0xcf, 0x10, 0x39, 0x8a, 0x88, 0xe8, 0x2f, 0xea, 0xa9, 0xf0, 0xe0, 0x3f, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0xcb, 0x43, 0xd2, 0x10, 0x3d, 0x11, 0x00, 0x00,
 }
 
 func (m *ConsumerAdditionProposal) Marshal() (dAtA []byte, err error) {
@@ -2210,6 +2271,50 @@ func (m *MaturedUnbondingOps) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
+func (m *ExportedVscSendTimestamp) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *ExportedVscSendTimestamp) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ExportedVscSendTimestamp) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.VscSendTimestamps) > 0 {
+		for iNdEx := len(m.VscSendTimestamps) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.VscSendTimestamps[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintProvider(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0x12
+		}
+	}
+	if len(m.ChainId) > 0 {
+		i -= len(m.ChainId)
+		copy(dAtA[i:], m.ChainId)
+		i = encodeVarintProvider(dAtA, i, uint64(len(m.ChainId)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
 func (m *KeyAssignmentReplacement) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -2738,6 +2843,25 @@ func (m *MaturedUnbondingOps) Size() (n int) {
 	return n
 }
 
+func (m *ExportedVscSendTimestamp) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.ChainId)
+	if l > 0 {
+		n += 1 + l + sovProvider(uint64(l))
+	}
+	if len(m.VscSendTimestamps) > 0 {
+		for _, e := range m.VscSendTimestamps {
+			l = e.Size()
+			n += 1 + l + sovProvider(uint64(l))
+		}
+	}
+	return n
+}
+
 func (m *KeyAssignmentReplacement) Size() (n int) {
 	if m == nil {
 		return 0
@@ -5241,6 +5365,122 @@ func (m *MaturedUnbondingOps) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *ExportedVscSendTimestamp) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowProvider
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: ExportedVscSendTimestamp: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: ExportedVscSendTimestamp: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowProvider
+				}
+				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 ErrInvalidLengthProvider
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthProvider
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ChainId = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field VscSendTimestamps", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowProvider
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthProvider
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthProvider
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.VscSendTimestamps = append(m.VscSendTimestamps, VscSendTimestamp{})
+			if err := m.VscSendTimestamps[len(m.VscSendTimestamps)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipProvider(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthProvider
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func (m *KeyAssignmentReplacement) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/x/ccv/types/shared_consumer.pb.go b/x/ccv/types/shared_consumer.pb.go
index 522f34d0d5..cd39605bb7 100644
--- a/x/ccv/types/shared_consumer.pb.go
+++ b/x/ccv/types/shared_consumer.pb.go
@@ -11,6 +11,7 @@ import (
 	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
 	_ "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	_07_tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
+	types1 "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	_ "google.golang.org/protobuf/types/known/durationpb"
 	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
@@ -31,7 +32,7 @@ var _ = time.Kitchen
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
-// TODO: rename to ConsumerParams (make issue)
+// TODO: rename to ConsumerParams (or make issue)
 //
 // Params defines the parameters for CCV consumer module.
 //
@@ -222,7 +223,7 @@ type GenesisState struct {
 	// OutstandingDowntimes nil on new chain, filled  in on restart.
 	OutstandingDowntimeSlashing []OutstandingDowntime `protobuf:"bytes,10,rep,name=outstanding_downtime_slashing,json=outstandingDowntimeSlashing,proto3" json:"outstanding_downtime_slashing"`
 	// PendingConsumerPackets nil on new chain, filled in on restart.
-	PendingConsumerPackets ConsumerPacketDataList `protobuf:"bytes,11,opt,name=pending_consumer_packets,json=pendingConsumerPackets,proto3" json:"pending_consumer_packets"`
+	PendingConsumerPackets types1.ConsumerPacketDataList `protobuf:"bytes,11,opt,name=pending_consumer_packets,json=pendingConsumerPackets,proto3" json:"pending_consumer_packets"`
 	// LastTransmissionBlockHeight nil on new chain, filled in on restart.
 	LastTransmissionBlockHeight LastTransmissionBlockHeight `protobuf:"bytes,12,opt,name=last_transmission_block_height,json=lastTransmissionBlockHeight,proto3" json:"last_transmission_block_height"`
 	PreCCV                      bool                        `protobuf:"varint,13,opt,name=preCCV,proto3" json:"preCCV,omitempty"`
@@ -331,11 +332,11 @@ func (m *GenesisState) GetOutstandingDowntimeSlashing() []OutstandingDowntime {
 	return nil
 }
 
-func (m *GenesisState) GetPendingConsumerPackets() ConsumerPacketDataList {
+func (m *GenesisState) GetPendingConsumerPackets() types1.ConsumerPacketDataList {
 	if m != nil {
 		return m.PendingConsumerPackets
 	}
-	return ConsumerPacketDataList{}
+	return types1.ConsumerPacketDataList{}
 }
 
 func (m *GenesisState) GetLastTransmissionBlockHeight() LastTransmissionBlockHeight {
@@ -570,80 +571,81 @@ func init() {
 }
 
 var fileDescriptor_d0a8be0efc64dfbc = []byte{
-	// 1156 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcb, 0x6e, 0x1b, 0x37,
-	0x17, 0xb6, 0xe2, 0xc4, 0x91, 0x68, 0xfb, 0x8f, 0x43, 0x27, 0xfe, 0x27, 0x36, 0x2a, 0x2b, 0x6a,
-	0x0b, 0x08, 0x68, 0x33, 0x53, 0x3b, 0x29, 0x0a, 0x74, 0x51, 0x34, 0x96, 0x9a, 0xc6, 0x45, 0x1a,
-	0xbb, 0x63, 0xc7, 0x8b, 0x14, 0x28, 0x41, 0x91, 0xb4, 0x44, 0x64, 0x44, 0x0e, 0x48, 0xce, 0xb8,
-	0xde, 0x16, 0x7d, 0x80, 0x2c, 0xfb, 0x48, 0x59, 0x66, 0xd9, 0x55, 0x5b, 0x24, 0x2f, 0x52, 0xf0,
-	0x32, 0xb2, 0xe4, 0x8b, 0x9a, 0xdd, 0x90, 0xe7, 0xfb, 0xce, 0xfd, 0xf0, 0x0c, 0xf8, 0x82, 0x0b,
-	0xc3, 0x14, 0x19, 0x62, 0x2e, 0x90, 0x66, 0xa4, 0x50, 0xdc, 0x9c, 0x26, 0x84, 0x94, 0x49, 0xb9,
-	0x95, 0xe8, 0x21, 0x56, 0x8c, 0x22, 0x22, 0x85, 0x2e, 0x46, 0x4c, 0xc5, 0xb9, 0x92, 0x46, 0xc2,
-	0xf5, 0x4b, 0x18, 0x31, 0x21, 0x65, 0x5c, 0x6e, 0xad, 0x6f, 0x18, 0x26, 0x28, 0x53, 0x23, 0x2e,
-	0x4c, 0x82, 0xfb, 0x84, 0x27, 0xe6, 0x34, 0x67, 0xda, 0x13, 0xd7, 0x13, 0xde, 0x27, 0x49, 0xc6,
-	0x07, 0x43, 0x43, 0x32, 0xce, 0x84, 0xd1, 0xc9, 0x04, 0xba, 0xdc, 0x9a, 0x38, 0x05, 0xc2, 0x7d,
-	0x4b, 0x20, 0x52, 0xb1, 0x84, 0x0c, 0xb1, 0x10, 0x2c, 0xb3, 0xa8, 0xf0, 0x19, 0x20, 0xcd, 0x81,
-	0x94, 0x83, 0x8c, 0x25, 0xee, 0xd4, 0x2f, 0x8e, 0x13, 0x5a, 0x28, 0x6c, 0xb8, 0x14, 0x41, 0x7e,
-	0x67, 0x20, 0x07, 0xd2, 0x7d, 0x26, 0xf6, 0x2b, 0xdc, 0x7e, 0x3a, 0x23, 0xe8, 0x13, 0xae, 0x58,
-	0x80, 0x6d, 0x9e, 0x57, 0x6e, 0xf8, 0x88, 0x69, 0x83, 0x47, 0xb9, 0x07, 0xb4, 0x7f, 0x5f, 0x00,
-	0x0b, 0xfb, 0x58, 0xe1, 0x91, 0x86, 0x11, 0xb8, 0xc9, 0x04, 0xee, 0x67, 0x8c, 0x46, 0xb5, 0x56,
-	0xad, 0x53, 0x4f, 0xab, 0x23, 0xdc, 0x03, 0x9f, 0xf4, 0x33, 0x49, 0x5e, 0x69, 0x94, 0x33, 0x85,
-	0x28, 0xd7, 0x46, 0xf1, 0x7e, 0x61, 0x7d, 0x44, 0x46, 0x61, 0xa1, 0x47, 0x5c, 0x6b, 0x2e, 0x45,
-	0x74, 0xad, 0x55, 0xeb, 0xcc, 0xa7, 0xf7, 0x3d, 0x76, 0x9f, 0xa9, 0xde, 0x04, 0xf2, 0x70, 0x02,
-	0x08, 0x7f, 0x00, 0xf7, 0xaf, 0xd4, 0x82, 0x42, 0x7a, 0xa2, 0xf9, 0x56, 0xad, 0xd3, 0x48, 0x37,
-	0xe9, 0x15, 0x4a, 0xba, 0x1e, 0x06, 0xbf, 0x06, 0xeb, 0xb9, 0x92, 0x25, 0xa7, 0x4c, 0xa1, 0x63,
-	0xc6, 0x50, 0x2e, 0x65, 0x86, 0x30, 0xa5, 0x0a, 0x69, 0xa3, 0xa2, 0xeb, 0x4e, 0xc9, 0x5a, 0x85,
-	0x78, 0xc2, 0xd8, 0xbe, 0x94, 0xd9, 0x63, 0x4a, 0xd5, 0x81, 0x51, 0xf0, 0x27, 0x00, 0x09, 0x29,
-	0x91, 0x4d, 0x8a, 0x2c, 0x8c, 0x8d, 0x8e, 0x4b, 0x1a, 0xdd, 0x68, 0xd5, 0x3a, 0x8b, 0xdb, 0xf7,
-	0x62, 0x9f, 0xbb, 0xb8, 0xca, 0x5d, 0xdc, 0x0b, 0x85, 0xd9, 0xa9, 0xbf, 0xf9, 0x6b, 0x73, 0xee,
-	0x8f, 0xbf, 0x37, 0x6b, 0xe9, 0x0a, 0x21, 0xe5, 0xa1, 0x67, 0xef, 0x3b, 0x32, 0xfc, 0x19, 0xfc,
-	0xdf, 0x45, 0x73, 0xcc, 0xd4, 0x79, 0xbd, 0x0b, 0x1f, 0xae, 0xf7, 0x6e, 0xa5, 0x63, 0x5a, 0xf9,
-	0x53, 0xd0, 0xaa, 0x5a, 0x19, 0x29, 0x36, 0x95, 0xc2, 0x63, 0x85, 0x89, 0xfd, 0x88, 0x6e, 0xba,
-	0x88, 0x9b, 0x15, 0x2e, 0x9d, 0x82, 0x3d, 0x09, 0x28, 0xf8, 0x00, 0xc0, 0x21, 0xd7, 0x46, 0x2a,
-	0x4e, 0x70, 0x86, 0x98, 0x30, 0x8a, 0x33, 0x1d, 0xd5, 0x5d, 0x01, 0x6f, 0x9f, 0x49, 0xbe, 0xf3,
-	0x02, 0xf8, 0x1c, 0xac, 0x14, 0xa2, 0x2f, 0x05, 0xe5, 0x62, 0x50, 0x85, 0xd3, 0xf8, 0xf0, 0x70,
-	0x6e, 0x8d, 0xc9, 0x21, 0x90, 0x87, 0x60, 0x4d, 0xcb, 0x63, 0x83, 0x64, 0x6e, 0x90, 0xcd, 0x90,
-	0x19, 0x2a, 0xa6, 0x87, 0x32, 0xa3, 0x11, 0x70, 0xee, 0xaf, 0x5a, 0xe9, 0x5e, 0x6e, 0xf6, 0x0a,
-	0x73, 0x58, 0x89, 0xe0, 0xc7, 0x60, 0x59, 0xb1, 0x13, 0xac, 0x28, 0xa2, 0x4c, 0xc8, 0x91, 0x8e,
-	0x16, 0x5b, 0xf3, 0x9d, 0x46, 0xba, 0xe4, 0x2f, 0x7b, 0xee, 0x0e, 0x3e, 0x02, 0xe3, 0x62, 0xa3,
-	0x69, 0xf4, 0x92, 0x43, 0xdf, 0xa9, 0xa4, 0xe9, 0x04, 0xab, 0xfd, 0xa6, 0x0e, 0x96, 0xbe, 0x67,
-	0x82, 0x69, 0xae, 0x0f, 0x0c, 0x36, 0x0c, 0x7e, 0x0b, 0x16, 0x72, 0x37, 0x16, 0x6e, 0x16, 0x16,
-	0xb7, 0xdb, 0xf1, 0xd5, 0x6f, 0x46, 0xec, 0x07, 0x68, 0xe7, 0xba, 0x8d, 0x37, 0x0d, 0x3c, 0xf8,
-	0x39, 0x80, 0x63, 0x47, 0xfc, 0x6b, 0x81, 0x38, 0x75, 0x23, 0xd2, 0x48, 0x57, 0x2a, 0x49, 0xd7,
-	0x09, 0x76, 0x29, 0x8c, 0xc1, 0xea, 0x19, 0xda, 0x77, 0xb6, 0x85, 0xfb, 0x19, 0xb8, 0x3d, 0x86,
-	0x7b, 0xc9, 0x2e, 0x85, 0x1b, 0xa0, 0x21, 0xd8, 0x09, 0x72, 0xfe, 0xb8, 0x26, 0xaf, 0xa7, 0x75,
-	0xc1, 0x4e, 0xba, 0xf6, 0x0c, 0x11, 0xb8, 0x7b, 0xde, 0xb4, 0xb6, 0x51, 0x85, 0xce, 0xfe, 0x2c,
-	0xe6, 0x7d, 0x12, 0x4f, 0x3e, 0x63, 0xf1, 0xc4, 0xc3, 0x55, 0x6e, 0xc5, 0xde, 0x2b, 0x97, 0x88,
-	0x74, 0x75, 0xda, 0x55, 0x9f, 0x9d, 0x21, 0x88, 0xce, 0x0c, 0x48, 0xa1, 0x99, 0xd0, 0x85, 0x0e,
-	0x36, 0x7c, 0x97, 0xc7, 0xff, 0x69, 0xa3, 0xa2, 0x79, 0x33, 0xe3, 0xa2, 0x4d, 0xdf, 0xc3, 0x5f,
-	0xc0, 0xca, 0x08, 0x9b, 0x42, 0xb9, 0xbe, 0xc3, 0xe4, 0x15, 0x33, 0x3a, 0xba, 0xd9, 0x9a, 0xef,
-	0x2c, 0x6e, 0x3f, 0x98, 0x55, 0x91, 0x1f, 0x03, 0xe7, 0xe8, 0xa0, 0xbb, 0xef, 0x58, 0xa1, 0x38,
-	0xb7, 0x2a, 0x65, 0xfe, 0xd6, 0x36, 0xf6, 0x2d, 0x2e, 0xb8, 0xe1, 0x38, 0x43, 0x25, 0xce, 0x90,
-	0x66, 0x26, 0xaa, 0x3b, 0xf5, 0xad, 0x49, 0x7f, 0xed, 0x22, 0x88, 0x8f, 0x70, 0xc6, 0x29, 0x36,
-	0x52, 0xbd, 0xc8, 0x29, 0x36, 0x2c, 0x68, 0x5c, 0x0e, 0xf4, 0x23, 0x9c, 0x1d, 0x30, 0x03, 0x0d,
-	0x58, 0x1f, 0x32, 0x1b, 0x35, 0x32, 0xd2, 0x6a, 0xd4, 0xcc, 0xa0, 0xc2, 0xe1, 0x6d, 0x39, 0x1b,
-	0x4e, 0xf5, 0xf6, 0x2c, 0xcf, 0x9f, 0x3a, 0xf6, 0xa1, 0x3c, 0x72, 0x5c, 0x6f, 0x6a, 0xb7, 0x17,
-	0x8c, 0xad, 0x0d, 0x2f, 0x93, 0x52, 0x78, 0x0a, 0x3e, 0x92, 0x85, 0xd1, 0x06, 0xfb, 0x01, 0xa5,
-	0xf2, 0x44, 0xd8, 0xb7, 0x07, 0xe9, 0x0c, 0xeb, 0x21, 0x17, 0x83, 0x08, 0x38, 0xc3, 0xc9, 0x2c,
-	0xc3, 0x7b, 0x67, 0x0a, 0x7a, 0x81, 0x1f, 0xac, 0x6e, 0xc8, 0x8b, 0xa2, 0x83, 0xa0, 0x19, 0x2a,
-	0x10, 0xe5, 0xcc, 0x9b, 0x1d, 0x3f, 0x4d, 0x55, 0xa1, 0x16, 0x5d, 0x2b, 0xcc, 0x0c, 0xb7, 0x1b,
-	0x38, 0xbe, 0x1e, 0x3d, 0x6c, 0xf0, 0x33, 0xae, 0xab, 0x6a, 0xad, 0x05, 0xcd, 0xd3, 0x20, 0x0d,
-	0x7f, 0xab, 0x81, 0x66, 0x86, 0xb5, 0x99, 0xde, 0x1b, 0x6e, 0xed, 0x20, 0x9f, 0xa1, 0x68, 0xc9,
-	0x99, 0xfe, 0x6a, 0x96, 0xe9, 0x67, 0x58, 0x9b, 0xc9, 0x85, 0xb2, 0x63, 0xf9, 0x3e, 0xfd, 0x55,
-	0xe0, 0xd9, 0xd5, 0x10, 0xb8, 0x06, 0x16, 0x72, 0xc5, 0xba, 0xdd, 0xa3, 0x68, 0xd9, 0x8d, 0x5f,
-	0x38, 0xb5, 0x5f, 0x82, 0xb5, 0xcb, 0x6b, 0x68, 0x19, 0xc1, 0x3b, 0xfb, 0xa6, 0x5c, 0x4f, 0xc3,
-	0x09, 0x76, 0xc0, 0xca, 0x85, 0x4e, 0xb9, 0xe6, 0x10, 0xff, 0x2b, 0xa7, 0xea, 0xdc, 0x7e, 0x01,
-	0x56, 0x2f, 0x29, 0x13, 0xfc, 0x06, 0x6c, 0x94, 0x55, 0x73, 0x4e, 0xcc, 0xa3, 0x5d, 0x82, 0x4c,
-	0xfb, 0x17, 0xac, 0x91, 0xde, 0x1b, 0x43, 0xc6, 0x23, 0xf6, 0xd8, 0x03, 0xda, 0x5f, 0x82, 0x8d,
-	0x67, 0xb3, 0x23, 0x9d, 0xf0, 0x7b, 0xbe, 0xf2, 0xbb, 0x6d, 0xc0, 0xed, 0x0b, 0x73, 0x06, 0xef,
-	0x80, 0x1b, 0xa5, 0x26, 0xbb, 0x34, 0xc4, 0xe8, 0x0f, 0x70, 0x17, 0x2c, 0xfb, 0xc9, 0x33, 0xa7,
-	0x6e, 0x2b, 0xba, 0xf8, 0x16, 0xb7, 0xd7, 0x2f, 0x2c, 0x8f, 0xc3, 0xea, 0xff, 0xc4, 0x6f, 0x8f,
-	0xd7, 0x76, 0x7b, 0x2c, 0x55, 0x54, 0x2b, 0xdc, 0x79, 0xfe, 0xe6, 0x5d, 0xb3, 0xf6, 0xf6, 0x5d,
-	0xb3, 0xf6, 0xcf, 0xbb, 0x66, 0xed, 0xf5, 0xfb, 0xe6, 0xdc, 0xdb, 0xf7, 0xcd, 0xb9, 0x3f, 0xdf,
-	0x37, 0xe7, 0x5e, 0x3e, 0x1a, 0x70, 0x33, 0x2c, 0xfa, 0x31, 0x91, 0xa3, 0x84, 0x48, 0x3d, 0x92,
-	0x3a, 0x39, 0x2b, 0xff, 0x83, 0xf1, 0x5f, 0x52, 0xf9, 0x30, 0xf9, 0xd5, 0xfd, 0x2a, 0xb9, 0x3f,
-	0xbb, 0xfe, 0x82, 0xb3, 0xfd, 0xf0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x04, 0x66, 0x9a, 0xcf,
-	0x47, 0x0a, 0x00, 0x00,
+	// 1171 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x4d, 0x6f, 0x1c, 0x35,
+	0x18, 0xce, 0x36, 0x6d, 0xba, 0xeb, 0x24, 0x34, 0x75, 0xda, 0x30, 0x4d, 0xc4, 0x66, 0xbb, 0x80,
+	0xb4, 0x12, 0x74, 0x86, 0xa4, 0x45, 0x48, 0x20, 0x21, 0x9a, 0x84, 0xd2, 0xa0, 0xd2, 0x84, 0x49,
+	0x9a, 0x43, 0x91, 0xb0, 0xbc, 0xb6, 0xb3, 0x63, 0x75, 0xd6, 0x1e, 0xd9, 0x9e, 0x09, 0x11, 0x37,
+	0xc4, 0x0f, 0xe8, 0x91, 0x9f, 0xd4, 0x63, 0xb9, 0x71, 0x02, 0xd4, 0xfe, 0x11, 0xe4, 0x8f, 0xd9,
+	0xec, 0xe6, 0x8b, 0xde, 0xc6, 0x7e, 0x9f, 0xe7, 0xfd, 0x7e, 0xfd, 0x0e, 0xf8, 0x8c, 0x0b, 0xc3,
+	0x14, 0xc9, 0x30, 0x17, 0x48, 0x33, 0x52, 0x2a, 0x6e, 0x8e, 0x13, 0x42, 0xaa, 0xa4, 0x5a, 0x4b,
+	0x74, 0x86, 0x15, 0xa3, 0x88, 0x48, 0xa1, 0xcb, 0x21, 0x53, 0x71, 0xa1, 0xa4, 0x91, 0x70, 0xf9,
+	0x1c, 0x46, 0x4c, 0x48, 0x15, 0x57, 0x6b, 0xcb, 0x2b, 0x86, 0x09, 0xca, 0xd4, 0x90, 0x0b, 0x93,
+	0xe0, 0x3e, 0xe1, 0x89, 0x39, 0x2e, 0x98, 0xf6, 0xc4, 0xe5, 0x84, 0xf7, 0x49, 0x92, 0xf3, 0x41,
+	0x66, 0x48, 0xce, 0x99, 0x30, 0x3a, 0x19, 0x43, 0x57, 0x6b, 0x63, 0xa7, 0x40, 0xb8, 0x6b, 0x09,
+	0x44, 0x2a, 0x96, 0x90, 0x0c, 0x0b, 0xc1, 0x72, 0x8b, 0x0a, 0x9f, 0x01, 0xd2, 0x1e, 0x48, 0x39,
+	0xc8, 0x59, 0xe2, 0x4e, 0xfd, 0xf2, 0x30, 0xa1, 0xa5, 0xc2, 0x86, 0x4b, 0x11, 0xe4, 0xb7, 0x06,
+	0x72, 0x20, 0xdd, 0x67, 0x62, 0xbf, 0xc2, 0xed, 0xc7, 0x97, 0x04, 0x7d, 0xc4, 0x15, 0x0b, 0xb0,
+	0xd5, 0xd3, 0xca, 0x0d, 0x1f, 0x32, 0x6d, 0xf0, 0xb0, 0x08, 0x80, 0xf5, 0x8b, 0xf4, 0xd4, 0x29,
+	0x73, 0x0e, 0x4f, 0xa4, 0xaf, 0xfb, 0xfb, 0x0c, 0x98, 0xd9, 0xc5, 0x0a, 0x0f, 0x35, 0x8c, 0xc0,
+	0x75, 0x26, 0x70, 0x3f, 0x67, 0x34, 0x6a, 0x74, 0x1a, 0xbd, 0x66, 0x5a, 0x1f, 0xe1, 0x0e, 0xf8,
+	0xa8, 0x9f, 0x4b, 0xf2, 0x42, 0xa3, 0x82, 0x29, 0x44, 0xb9, 0x36, 0x8a, 0xf7, 0x4b, 0x1b, 0x17,
+	0x32, 0x0a, 0x0b, 0x3d, 0xe4, 0x5a, 0x73, 0x29, 0xa2, 0x2b, 0x9d, 0x46, 0x6f, 0x3a, 0xbd, 0xeb,
+	0xb1, 0xbb, 0x4c, 0x6d, 0x8d, 0x21, 0xf7, 0xc7, 0x80, 0xf0, 0x7b, 0x70, 0xf7, 0x42, 0x2d, 0x28,
+	0xa4, 0x34, 0x9a, 0xee, 0x34, 0x7a, 0xad, 0x74, 0x95, 0x5e, 0xa0, 0x64, 0xd3, 0xc3, 0xe0, 0x97,
+	0x60, 0xb9, 0x50, 0xb2, 0xe2, 0x94, 0x29, 0x74, 0xc8, 0x18, 0x2a, 0xa4, 0xcc, 0x11, 0xa6, 0x54,
+	0x21, 0x6d, 0x54, 0x74, 0xd5, 0x29, 0x59, 0xaa, 0x11, 0x8f, 0x18, 0xdb, 0x95, 0x32, 0x7f, 0x48,
+	0xa9, 0xda, 0x33, 0x0a, 0xfe, 0x08, 0x20, 0x21, 0x15, 0xb2, 0x89, 0x94, 0xa5, 0xb1, 0xd1, 0x71,
+	0x49, 0xa3, 0x6b, 0x9d, 0x46, 0x6f, 0x76, 0xfd, 0x4e, 0xec, 0xf3, 0x1d, 0xd7, 0xf9, 0x8e, 0xb7,
+	0x42, 0x31, 0x37, 0x9a, 0xaf, 0xfe, 0x5e, 0x9d, 0xfa, 0xe3, 0x9f, 0xd5, 0x46, 0xba, 0x40, 0x48,
+	0xb5, 0xef, 0xd9, 0xbb, 0x8e, 0x0c, 0x7f, 0x02, 0xef, 0xbb, 0x68, 0x0e, 0x99, 0x3a, 0xad, 0x77,
+	0xe6, 0xdd, 0xf5, 0xde, 0xae, 0x75, 0x4c, 0x2a, 0x7f, 0x0c, 0x3a, 0x75, 0xfd, 0x90, 0x62, 0x13,
+	0x29, 0x3c, 0x54, 0x98, 0xd8, 0x8f, 0xe8, 0xba, 0x8b, 0xb8, 0x5d, 0xe3, 0xd2, 0x09, 0xd8, 0xa3,
+	0x80, 0x82, 0xf7, 0x00, 0xcc, 0xb8, 0x36, 0x52, 0x71, 0x82, 0x73, 0xc4, 0x84, 0x51, 0x9c, 0xe9,
+	0xa8, 0xe9, 0x0a, 0x78, 0xf3, 0x44, 0xf2, 0xad, 0x17, 0xc0, 0xa7, 0x60, 0xa1, 0x14, 0x7d, 0x29,
+	0x28, 0x17, 0x83, 0x3a, 0x9c, 0xd6, 0xbb, 0x87, 0x73, 0x63, 0x44, 0x0e, 0x81, 0xdc, 0x07, 0x4b,
+	0x5a, 0x1e, 0x1a, 0x24, 0x0b, 0x83, 0x6c, 0x86, 0x4c, 0xa6, 0x98, 0xce, 0x64, 0x4e, 0x23, 0xe0,
+	0xdc, 0x5f, 0xb4, 0xd2, 0x9d, 0xc2, 0xec, 0x94, 0x66, 0xbf, 0x16, 0xc1, 0x0f, 0xc1, 0xbc, 0x62,
+	0x47, 0x58, 0x51, 0x44, 0x99, 0x90, 0x43, 0x1d, 0xcd, 0x76, 0xa6, 0x7b, 0xad, 0x74, 0xce, 0x5f,
+	0x6e, 0xb9, 0x3b, 0xf8, 0x00, 0x8c, 0x8a, 0x8d, 0x26, 0xd1, 0x73, 0x0e, 0x7d, 0xab, 0x96, 0xa6,
+	0x63, 0xac, 0xee, 0x9f, 0x4d, 0x30, 0xf7, 0x1d, 0x13, 0x4c, 0x73, 0xbd, 0x67, 0xb0, 0x61, 0xf0,
+	0x1b, 0x30, 0x53, 0xb8, 0xb1, 0x70, 0xb3, 0x30, 0xbb, 0xde, 0x8d, 0x2f, 0x7e, 0x67, 0x62, 0x3f,
+	0x40, 0x1b, 0x57, 0x6d, 0xbc, 0x69, 0xe0, 0xc1, 0x4f, 0x01, 0x1c, 0x39, 0xe2, 0x5f, 0x18, 0xc4,
+	0xa9, 0x1b, 0x91, 0x56, 0xba, 0x50, 0x4b, 0x36, 0x9d, 0x60, 0x9b, 0xc2, 0x18, 0x2c, 0x9e, 0xa0,
+	0x7d, 0x67, 0x5b, 0xb8, 0x9f, 0x81, 0x9b, 0x23, 0xb8, 0x97, 0x6c, 0x53, 0xb8, 0x02, 0x5a, 0x82,
+	0x1d, 0x21, 0xe7, 0x8f, 0x6b, 0xf2, 0x66, 0xda, 0x14, 0xec, 0x68, 0xd3, 0x9e, 0x21, 0x02, 0xb7,
+	0x4f, 0x9b, 0xd6, 0x36, 0xaa, 0xd0, 0xd9, 0x9f, 0xc4, 0xbc, 0x4f, 0xe2, 0xf1, 0xa7, 0x2f, 0x1e,
+	0x7b, 0xec, 0xaa, 0xb5, 0xd8, 0x7b, 0xe5, 0x12, 0x91, 0x2e, 0x4e, 0xba, 0xea, 0xb3, 0x93, 0x81,
+	0xe8, 0xc4, 0x80, 0x14, 0x9a, 0x09, 0x5d, 0xea, 0x60, 0xc3, 0x77, 0x79, 0xfc, 0xbf, 0x36, 0x6a,
+	0x9a, 0x37, 0x33, 0x2a, 0xda, 0xe4, 0x3d, 0xfc, 0x19, 0x2c, 0x0c, 0xb1, 0x29, 0x95, 0xeb, 0x3b,
+	0x4c, 0x5e, 0x30, 0xa3, 0xa3, 0xeb, 0x9d, 0xe9, 0xde, 0xec, 0xfa, 0xbd, 0xcb, 0x2a, 0xf2, 0x43,
+	0xe0, 0x1c, 0xec, 0x6d, 0xee, 0x3a, 0x56, 0x28, 0xce, 0x8d, 0x5a, 0x99, 0xbf, 0xb5, 0x8d, 0x7d,
+	0x83, 0x0b, 0x6e, 0x38, 0xce, 0x51, 0x85, 0x73, 0xa4, 0x99, 0x89, 0x9a, 0x4e, 0x7d, 0x67, 0xdc,
+	0x5f, 0xbb, 0x3c, 0xe2, 0x03, 0x9c, 0x73, 0x8a, 0x8d, 0x54, 0xcf, 0x0a, 0x8a, 0x0d, 0x0b, 0x1a,
+	0xe7, 0x03, 0xfd, 0x00, 0xe7, 0x7b, 0xcc, 0x40, 0x03, 0x96, 0x33, 0x66, 0xa3, 0x46, 0x46, 0x5a,
+	0x8d, 0x9a, 0x19, 0x54, 0x3a, 0xbc, 0x2d, 0x67, 0xcb, 0xa9, 0x5e, 0xbf, 0xcc, 0xf3, 0xc7, 0x8e,
+	0xbd, 0x2f, 0x0f, 0x1c, 0xd7, 0x9b, 0xda, 0xde, 0x0a, 0xc6, 0x96, 0xb2, 0xf3, 0xa4, 0x14, 0x1e,
+	0x83, 0x0f, 0x64, 0x69, 0xb4, 0xc1, 0x7e, 0x40, 0xa9, 0x3c, 0x12, 0xf6, 0xed, 0x41, 0x3a, 0xc7,
+	0x3a, 0xe3, 0x62, 0x10, 0x01, 0x67, 0x38, 0xb9, 0xcc, 0xf0, 0xce, 0x89, 0x82, 0xad, 0xc0, 0x0f,
+	0x56, 0x57, 0xe4, 0x59, 0xd1, 0x5e, 0xd0, 0x0c, 0x7f, 0x05, 0x51, 0xc1, 0xbc, 0xd9, 0xd1, 0xd3,
+	0x54, 0x17, 0x6a, 0xd6, 0xb5, 0xc2, 0x57, 0x17, 0x5a, 0x1d, 0xed, 0xa2, 0xd0, 0x0f, 0xf6, 0xdb,
+	0x17, 0x66, 0x0b, 0x1b, 0xfc, 0x84, 0xeb, 0xba, 0x6c, 0x4b, 0xc1, 0xc4, 0x24, 0x48, 0xc3, 0xdf,
+	0x1a, 0xa0, 0x9d, 0x63, 0x6d, 0x26, 0x17, 0x88, 0xdb, 0x3f, 0xc8, 0xa7, 0x2a, 0x9a, 0x73, 0x3e,
+	0x7c, 0x71, 0x59, 0xe4, 0x4f, 0xb0, 0x36, 0xe3, 0x9b, 0x65, 0xc3, 0xf2, 0x7d, 0x1d, 0xea, 0x0c,
+	0xe4, 0x17, 0x43, 0xe0, 0x12, 0x98, 0x29, 0x14, 0xdb, 0xdc, 0x3c, 0x88, 0xe6, 0xdd, 0x1c, 0x86,
+	0x53, 0xf7, 0x39, 0x58, 0x3a, 0xbf, 0x98, 0x96, 0x11, 0xbc, 0xb3, 0x8f, 0xcb, 0xd5, 0x34, 0x9c,
+	0x60, 0x0f, 0x2c, 0x9c, 0x69, 0x99, 0x2b, 0x0e, 0xf1, 0x5e, 0x35, 0x51, 0xf0, 0xee, 0x33, 0xb0,
+	0x78, 0x4e, 0xbd, 0xe0, 0xd7, 0x60, 0xa5, 0xaa, 0xbb, 0x74, 0x6c, 0x30, 0xed, 0x36, 0x64, 0xda,
+	0x3f, 0x65, 0xad, 0xf4, 0xce, 0x08, 0x32, 0x9a, 0xb5, 0x87, 0x1e, 0xd0, 0xfd, 0x1c, 0xac, 0x3c,
+	0xb9, 0x3c, 0xd2, 0x31, 0xbf, 0xa7, 0x6b, 0xbf, 0xbb, 0x06, 0xdc, 0x3c, 0x33, 0x70, 0xf0, 0x16,
+	0xb8, 0x56, 0x69, 0xb2, 0x4d, 0x43, 0x8c, 0xfe, 0x00, 0xb7, 0xc1, 0xbc, 0x1f, 0x41, 0x73, 0xec,
+	0xd6, 0xa3, 0x8b, 0x6f, 0x76, 0x7d, 0xf9, 0xcc, 0x16, 0xd9, 0xaf, 0x7f, 0x6e, 0xfc, 0x1a, 0x79,
+	0x69, 0xd7, 0xc8, 0x5c, 0x4d, 0xb5, 0xc2, 0x8d, 0xa7, 0xaf, 0xde, 0xb4, 0x1b, 0xaf, 0xdf, 0xb4,
+	0x1b, 0xff, 0xbe, 0x69, 0x37, 0x5e, 0xbe, 0x6d, 0x4f, 0xbd, 0x7e, 0xdb, 0x9e, 0xfa, 0xeb, 0x6d,
+	0x7b, 0xea, 0xf9, 0x83, 0x01, 0x37, 0x59, 0xd9, 0x8f, 0x89, 0x1c, 0x26, 0x44, 0xea, 0xa1, 0xd4,
+	0xc9, 0x49, 0xf9, 0xef, 0x8d, 0x7e, 0x8d, 0xaa, 0xfb, 0xc9, 0x2f, 0xee, 0xff, 0xc8, 0xfd, 0x16,
+	0xf6, 0x67, 0x9c, 0xed, 0xfb, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x82, 0xc7, 0x84, 0x84,
+	0x0a, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/ccv/types/wire.pb.go b/x/ccv/types/wire.pb.go
index c3beeb2e54..77f7b7454d 100644
--- a/x/ccv/types/wire.pb.go
+++ b/x/ccv/types/wire.pb.go
@@ -57,6 +57,40 @@ func (ConsumerPacketDataType) EnumDescriptor() ([]byte, []int) {
 	return fileDescriptor_8fd0dc67df6b10ed, []int{0}
 }
 
+// InfractionType indicates the infraction type a validator commited.
+// NOTE: ccv.InfractionType to maintain compatibility between ICS versions
+// using different versions of the cosmos-sdk and ibc-go modules.
+type InfractionType int32
+
+const (
+	// UNSPECIFIED defines an empty infraction type.
+	InfractionEmpty InfractionType = 0
+	// DOUBLE_SIGN defines a validator that double-signs a block.
+	DoubleSign InfractionType = 1
+	// DOWNTIME defines a validator that missed signing too many blocks.
+	Downtime InfractionType = 2
+)
+
+var InfractionType_name = map[int32]string{
+	0: "INFRACTION_TYPE_UNSPECIFIED",
+	1: "INFRACTION_TYPE_DOUBLE_SIGN",
+	2: "INFRACTION_TYPE_DOWNTIME",
+}
+
+var InfractionType_value = map[string]int32{
+	"INFRACTION_TYPE_UNSPECIFIED": 0,
+	"INFRACTION_TYPE_DOUBLE_SIGN": 1,
+	"INFRACTION_TYPE_DOWNTIME":    2,
+}
+
+func (x InfractionType) String() string {
+	return proto.EnumName(InfractionType_name, int32(x))
+}
+
+func (InfractionType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_8fd0dc67df6b10ed, []int{1}
+}
+
 // This packet is sent from provider chain to consumer chain if the validator
 // set for consumer chain changes (due to new bonding/unbonding messages or
 // slashing events) A VSCMatured packet from consumer chain will be sent
@@ -330,24 +364,24 @@ func (*ConsumerPacketData) XXX_OneofWrappers() []interface{} {
 	}
 }
 
-// TODO: to be removed altogether in https://github.com/cosmos/interchain-security/pull/1037
-// ConsumerPacketDataList is a list of consumer packet data packets.
-type ConsumerPacketDataList struct {
-	List []ConsumerPacketData `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
+// Note this type is used during IBC handshake methods for both the consumer and provider
+type HandshakeMetadata struct {
+	ProviderFeePoolAddr string `protobuf:"bytes,1,opt,name=provider_fee_pool_addr,json=providerFeePoolAddr,proto3" json:"provider_fee_pool_addr,omitempty"`
+	Version             string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
 }
 
-func (m *ConsumerPacketDataList) Reset()         { *m = ConsumerPacketDataList{} }
-func (m *ConsumerPacketDataList) String() string { return proto.CompactTextString(m) }
-func (*ConsumerPacketDataList) ProtoMessage()    {}
-func (*ConsumerPacketDataList) Descriptor() ([]byte, []int) {
+func (m *HandshakeMetadata) Reset()         { *m = HandshakeMetadata{} }
+func (m *HandshakeMetadata) String() string { return proto.CompactTextString(m) }
+func (*HandshakeMetadata) ProtoMessage()    {}
+func (*HandshakeMetadata) Descriptor() ([]byte, []int) {
 	return fileDescriptor_8fd0dc67df6b10ed, []int{4}
 }
-func (m *ConsumerPacketDataList) XXX_Unmarshal(b []byte) error {
+func (m *HandshakeMetadata) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *ConsumerPacketDataList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *HandshakeMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_ConsumerPacketDataList.Marshal(b, m, deterministic)
+		return xxx_messageInfo_HandshakeMetadata.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -357,43 +391,54 @@ func (m *ConsumerPacketDataList) XXX_Marshal(b []byte, deterministic bool) ([]by
 		return b[:n], nil
 	}
 }
-func (m *ConsumerPacketDataList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConsumerPacketDataList.Merge(m, src)
+func (m *HandshakeMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HandshakeMetadata.Merge(m, src)
 }
-func (m *ConsumerPacketDataList) XXX_Size() int {
+func (m *HandshakeMetadata) XXX_Size() int {
 	return m.Size()
 }
-func (m *ConsumerPacketDataList) XXX_DiscardUnknown() {
-	xxx_messageInfo_ConsumerPacketDataList.DiscardUnknown(m)
+func (m *HandshakeMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_HandshakeMetadata.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_ConsumerPacketDataList proto.InternalMessageInfo
+var xxx_messageInfo_HandshakeMetadata proto.InternalMessageInfo
 
-func (m *ConsumerPacketDataList) GetList() []ConsumerPacketData {
+func (m *HandshakeMetadata) GetProviderFeePoolAddr() string {
 	if m != nil {
-		return m.List
+		return m.ProviderFeePoolAddr
 	}
-	return nil
+	return ""
 }
 
-// Note this type is used during IBC handshake methods for both the consumer and provider
-type HandshakeMetadata struct {
-	ProviderFeePoolAddr string `protobuf:"bytes,1,opt,name=provider_fee_pool_addr,json=providerFeePoolAddr,proto3" json:"provider_fee_pool_addr,omitempty"`
-	Version             string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
+func (m *HandshakeMetadata) GetVersion() string {
+	if m != nil {
+		return m.Version
+	}
+	return ""
 }
 
-func (m *HandshakeMetadata) Reset()         { *m = HandshakeMetadata{} }
-func (m *HandshakeMetadata) String() string { return proto.CompactTextString(m) }
-func (*HandshakeMetadata) ProtoMessage()    {}
-func (*HandshakeMetadata) Descriptor() ([]byte, []int) {
+// ConsumerPacketData contains a consumer packet data and a type tag
+// that is compatible with ICS v1 and v2 over the wire. It is not used for internal storage.
+type ConsumerPacketDataV1 struct {
+	Type ConsumerPacketDataType `protobuf:"varint,1,opt,name=type,proto3,enum=interchain_security.ccv.v1.ConsumerPacketDataType" json:"type,omitempty"`
+	// Types that are valid to be assigned to Data:
+	//	*ConsumerPacketDataV1_SlashPacketData
+	//	*ConsumerPacketDataV1_VscMaturedPacketData
+	Data isConsumerPacketDataV1_Data `protobuf_oneof:"data"`
+}
+
+func (m *ConsumerPacketDataV1) Reset()         { *m = ConsumerPacketDataV1{} }
+func (m *ConsumerPacketDataV1) String() string { return proto.CompactTextString(m) }
+func (*ConsumerPacketDataV1) ProtoMessage()    {}
+func (*ConsumerPacketDataV1) Descriptor() ([]byte, []int) {
 	return fileDescriptor_8fd0dc67df6b10ed, []int{5}
 }
-func (m *HandshakeMetadata) XXX_Unmarshal(b []byte) error {
+func (m *ConsumerPacketDataV1) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *HandshakeMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *ConsumerPacketDataV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_HandshakeMetadata.Marshal(b, m, deterministic)
+		return xxx_messageInfo_ConsumerPacketDataV1.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -403,40 +448,144 @@ func (m *HandshakeMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, e
 		return b[:n], nil
 	}
 }
-func (m *HandshakeMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HandshakeMetadata.Merge(m, src)
+func (m *ConsumerPacketDataV1) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConsumerPacketDataV1.Merge(m, src)
 }
-func (m *HandshakeMetadata) XXX_Size() int {
+func (m *ConsumerPacketDataV1) XXX_Size() int {
 	return m.Size()
 }
-func (m *HandshakeMetadata) XXX_DiscardUnknown() {
-	xxx_messageInfo_HandshakeMetadata.DiscardUnknown(m)
+func (m *ConsumerPacketDataV1) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConsumerPacketDataV1.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_HandshakeMetadata proto.InternalMessageInfo
+var xxx_messageInfo_ConsumerPacketDataV1 proto.InternalMessageInfo
 
-func (m *HandshakeMetadata) GetProviderFeePoolAddr() string {
+type isConsumerPacketDataV1_Data interface {
+	isConsumerPacketDataV1_Data()
+	MarshalTo([]byte) (int, error)
+	Size() int
+}
+
+type ConsumerPacketDataV1_SlashPacketData struct {
+	SlashPacketData *SlashPacketDataV1 `protobuf:"bytes,2,opt,name=slashPacketData,proto3,oneof" json:"slashPacketData,omitempty"`
+}
+type ConsumerPacketDataV1_VscMaturedPacketData struct {
+	VscMaturedPacketData *VSCMaturedPacketData `protobuf:"bytes,3,opt,name=vscMaturedPacketData,proto3,oneof" json:"vscMaturedPacketData,omitempty"`
+}
+
+func (*ConsumerPacketDataV1_SlashPacketData) isConsumerPacketDataV1_Data()      {}
+func (*ConsumerPacketDataV1_VscMaturedPacketData) isConsumerPacketDataV1_Data() {}
+
+func (m *ConsumerPacketDataV1) GetData() isConsumerPacketDataV1_Data {
 	if m != nil {
-		return m.ProviderFeePoolAddr
+		return m.Data
 	}
-	return ""
+	return nil
 }
 
-func (m *HandshakeMetadata) GetVersion() string {
+func (m *ConsumerPacketDataV1) GetType() ConsumerPacketDataType {
 	if m != nil {
-		return m.Version
+		return m.Type
 	}
-	return ""
+	return UnspecifiedPacket
+}
+
+func (m *ConsumerPacketDataV1) GetSlashPacketData() *SlashPacketDataV1 {
+	if x, ok := m.GetData().(*ConsumerPacketDataV1_SlashPacketData); ok {
+		return x.SlashPacketData
+	}
+	return nil
+}
+
+func (m *ConsumerPacketDataV1) GetVscMaturedPacketData() *VSCMaturedPacketData {
+	if x, ok := m.GetData().(*ConsumerPacketDataV1_VscMaturedPacketData); ok {
+		return x.VscMaturedPacketData
+	}
+	return nil
+}
+
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ConsumerPacketDataV1) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
+		(*ConsumerPacketDataV1_SlashPacketData)(nil),
+		(*ConsumerPacketDataV1_VscMaturedPacketData)(nil),
+	}
+}
+
+// This packet is sent from the consumer chain to the provider chain
+// It is backward compatible with the ICS v1 and v2 version of the packet.
+type SlashPacketDataV1 struct {
+	Validator types.Validator `protobuf:"bytes,1,opt,name=validator,proto3" json:"validator" yaml:"validator"`
+	// map to the infraction block height on the provider
+	ValsetUpdateId uint64 `protobuf:"varint,2,opt,name=valset_update_id,json=valsetUpdateId,proto3" json:"valset_update_id,omitempty"`
+	// tell if the slashing is for a downtime or a double-signing infraction
+	Infraction InfractionType `protobuf:"varint,3,opt,name=infraction,proto3,enum=interchain_security.ccv.v1.InfractionType" json:"infraction,omitempty"`
+}
+
+func (m *SlashPacketDataV1) Reset()         { *m = SlashPacketDataV1{} }
+func (m *SlashPacketDataV1) String() string { return proto.CompactTextString(m) }
+func (*SlashPacketDataV1) ProtoMessage()    {}
+func (*SlashPacketDataV1) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8fd0dc67df6b10ed, []int{6}
+}
+func (m *SlashPacketDataV1) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *SlashPacketDataV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_SlashPacketDataV1.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *SlashPacketDataV1) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SlashPacketDataV1.Merge(m, src)
+}
+func (m *SlashPacketDataV1) XXX_Size() int {
+	return m.Size()
+}
+func (m *SlashPacketDataV1) XXX_DiscardUnknown() {
+	xxx_messageInfo_SlashPacketDataV1.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SlashPacketDataV1 proto.InternalMessageInfo
+
+func (m *SlashPacketDataV1) GetValidator() types.Validator {
+	if m != nil {
+		return m.Validator
+	}
+	return types.Validator{}
+}
+
+func (m *SlashPacketDataV1) GetValsetUpdateId() uint64 {
+	if m != nil {
+		return m.ValsetUpdateId
+	}
+	return 0
+}
+
+func (m *SlashPacketDataV1) GetInfraction() InfractionType {
+	if m != nil {
+		return m.Infraction
+	}
+	return InfractionEmpty
 }
 
 func init() {
 	proto.RegisterEnum("interchain_security.ccv.v1.ConsumerPacketDataType", ConsumerPacketDataType_name, ConsumerPacketDataType_value)
+	proto.RegisterEnum("interchain_security.ccv.v1.InfractionType", InfractionType_name, InfractionType_value)
 	proto.RegisterType((*ValidatorSetChangePacketData)(nil), "interchain_security.ccv.v1.ValidatorSetChangePacketData")
 	proto.RegisterType((*VSCMaturedPacketData)(nil), "interchain_security.ccv.v1.VSCMaturedPacketData")
 	proto.RegisterType((*SlashPacketData)(nil), "interchain_security.ccv.v1.SlashPacketData")
 	proto.RegisterType((*ConsumerPacketData)(nil), "interchain_security.ccv.v1.ConsumerPacketData")
-	proto.RegisterType((*ConsumerPacketDataList)(nil), "interchain_security.ccv.v1.ConsumerPacketDataList")
 	proto.RegisterType((*HandshakeMetadata)(nil), "interchain_security.ccv.v1.HandshakeMetadata")
+	proto.RegisterType((*ConsumerPacketDataV1)(nil), "interchain_security.ccv.v1.ConsumerPacketDataV1")
+	proto.RegisterType((*SlashPacketDataV1)(nil), "interchain_security.ccv.v1.SlashPacketDataV1")
 }
 
 func init() {
@@ -444,52 +593,60 @@ func init() {
 }
 
 var fileDescriptor_8fd0dc67df6b10ed = []byte{
-	// 717 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6e, 0xda, 0x4c,
-	0x14, 0xb5, 0x01, 0xe5, 0x13, 0x83, 0x94, 0x10, 0x7f, 0x34, 0xa2, 0x6e, 0x4b, 0x2c, 0xab, 0x95,
-	0x50, 0xab, 0xda, 0x05, 0xba, 0x6a, 0x37, 0x05, 0x42, 0x04, 0x6a, 0x92, 0x22, 0x3b, 0xa4, 0x6a,
-	0x37, 0xd6, 0x30, 0x1e, 0x60, 0x04, 0x78, 0x2c, 0xcf, 0xe0, 0x96, 0x37, 0xa8, 0xb2, 0xea, 0x0b,
-	0x64, 0x55, 0xf5, 0x41, 0xba, 0xcb, 0x32, 0x52, 0x37, 0x59, 0x45, 0x55, 0xf2, 0x06, 0x7d, 0x82,
-	0xca, 0xe6, 0x27, 0x04, 0x9c, 0x48, 0xd9, 0x79, 0xee, 0xdc, 0x73, 0x86, 0x73, 0xee, 0xe1, 0x82,
-	0x67, 0xc4, 0xe1, 0xd8, 0x43, 0x3d, 0x48, 0x1c, 0x8b, 0x61, 0x34, 0xf2, 0x08, 0x1f, 0xeb, 0x08,
-	0xf9, 0xba, 0x5f, 0xd0, 0xbf, 0x10, 0x0f, 0x6b, 0xae, 0x47, 0x39, 0x95, 0xe4, 0x88, 0x36, 0x0d,
-	0x21, 0x5f, 0xf3, 0x0b, 0xf2, 0x53, 0x44, 0xd9, 0x90, 0x32, 0x9d, 0x71, 0xd8, 0x27, 0x4e, 0x57,
-	0xf7, 0x0b, 0x6d, 0xcc, 0x61, 0x61, 0x76, 0x9e, 0x30, 0xc8, 0x99, 0x2e, 0xed, 0xd2, 0xf0, 0x53,
-	0x0f, 0xbe, 0xa6, 0xd5, 0x47, 0x1c, 0x3b, 0x36, 0xf6, 0x86, 0xc4, 0xe1, 0x3a, 0x6c, 0x23, 0xa2,
-	0xf3, 0xb1, 0x8b, 0xd9, 0xe4, 0x52, 0x3d, 0x17, 0xc1, 0xe3, 0x23, 0x38, 0x20, 0x36, 0xe4, 0xd4,
-	0x33, 0x31, 0xaf, 0xf6, 0xa0, 0xd3, 0xc5, 0x4d, 0x88, 0xfa, 0x98, 0xef, 0x40, 0x0e, 0x25, 0x0a,
-	0x36, 0xfd, 0xd9, 0xbd, 0x35, 0x72, 0x6d, 0xc8, 0x31, 0xcb, 0x8a, 0x4a, 0x3c, 0x9f, 0x2a, 0x2a,
-	0xda, 0x35, 0xb3, 0x16, 0x30, 0x6b, 0x73, 0xa6, 0x56, 0xd8, 0x58, 0x51, 0x4e, 0x2f, 0xb6, 0x85,
-	0xbf, 0x17, 0xdb, 0xd9, 0x31, 0x1c, 0x0e, 0xde, 0xa8, 0x2b, 0x44, 0xaa, 0x91, 0xf6, 0x6f, 0x42,
-	0x98, 0x94, 0x07, 0x41, 0x8d, 0x61, 0x3e, 0x6d, 0xb2, 0x88, 0x9d, 0x8d, 0x29, 0x62, 0x3e, 0x61,
-	0xac, 0x4f, 0xea, 0x93, 0xc6, 0x86, 0x2d, 0x3d, 0x01, 0x80, 0x0d, 0x20, 0xeb, 0x59, 0x10, 0xf5,
-	0x59, 0x36, 0xae, 0xc4, 0xf3, 0x49, 0x23, 0x19, 0x56, 0xca, 0xa8, 0xcf, 0xd4, 0x77, 0x20, 0x73,
-	0x64, 0x56, 0xf7, 0x21, 0x1f, 0x79, 0xd8, 0x5e, 0x50, 0x14, 0xf5, 0x80, 0x18, 0xf5, 0x80, 0xfa,
-	0x5b, 0x04, 0x1b, 0x66, 0xc0, 0xb7, 0x80, 0x36, 0x40, 0x72, 0xfe, 0x93, 0x43, 0x58, 0xaa, 0x28,
-	0xdf, 0xee, 0x43, 0x25, 0x3b, 0x75, 0x20, 0xbd, 0xe4, 0x80, 0x6a, 0x5c, 0xd3, 0xdc, 0x43, 0x72,
-	0x05, 0x00, 0xe2, 0x74, 0x3c, 0x88, 0x38, 0xa1, 0x4e, 0x36, 0xae, 0x88, 0xf9, 0xf5, 0xa2, 0xaa,
-	0x4d, 0xc2, 0xa1, 0xcd, 0xc2, 0x30, 0x0d, 0x87, 0xd6, 0x98, 0x77, 0x1a, 0x0b, 0x28, 0xf5, 0x67,
-	0x0c, 0x48, 0x55, 0xea, 0xb0, 0xd1, 0x10, 0x7b, 0x0b, 0xc2, 0x76, 0x41, 0x22, 0x08, 0x46, 0xa8,
-	0x69, 0xbd, 0x58, 0xd4, 0x6e, 0x4f, 0xa3, 0xb6, 0x8a, 0x3e, 0x1c, 0xbb, 0xd8, 0x08, 0xf1, 0xd2,
-	0x47, 0xb0, 0xc1, 0x6e, 0x7a, 0x16, 0x6a, 0x49, 0x15, 0x5f, 0xdc, 0x45, 0xb9, 0x64, 0x73, 0x5d,
-	0x30, 0x96, 0x59, 0xa4, 0x0e, 0xc8, 0xf8, 0x0c, 0xad, 0xcc, 0x33, 0x74, 0x21, 0x55, 0x7c, 0x75,
-	0x17, 0x7b, 0x54, 0x0e, 0xea, 0x82, 0x11, 0xc9, 0x57, 0x59, 0x03, 0x09, 0x1b, 0x72, 0xa8, 0xb6,
-	0xc1, 0xd6, 0xaa, 0xd0, 0x3d, 0xc2, 0xb8, 0x54, 0x07, 0x89, 0x01, 0x61, 0x7c, 0xfa, 0x37, 0xd0,
-	0xee, 0x67, 0x55, 0x25, 0x11, 0x44, 0xc2, 0x08, 0x19, 0xd4, 0x36, 0xd8, 0xac, 0x43, 0xc7, 0x66,
-	0x3d, 0xd8, 0xc7, 0xfb, 0x98, 0xc3, 0xe0, 0x61, 0xa9, 0x04, 0xb6, 0x5c, 0x8f, 0xfa, 0xc4, 0xc6,
-	0x9e, 0xd5, 0xc1, 0xd8, 0x72, 0x29, 0x1d, 0x58, 0xd0, 0xb6, 0x27, 0x79, 0x4b, 0x1a, 0xff, 0xcf,
-	0x6e, 0x77, 0x31, 0x6e, 0x52, 0x3a, 0x28, 0xdb, 0xb6, 0x27, 0x65, 0xc1, 0x7f, 0x3e, 0xf6, 0x58,
-	0x10, 0x8b, 0x58, 0xd8, 0x35, 0x3b, 0x3e, 0xff, 0x25, 0x46, 0x09, 0x09, 0x26, 0x26, 0xbd, 0x05,
-	0x4a, 0xf5, 0xc3, 0x81, 0xd9, 0xda, 0xaf, 0x19, 0x56, 0xb3, 0x5c, 0x7d, 0x5f, 0x3b, 0xb4, 0x0e,
-	0x3f, 0x35, 0x6b, 0x56, 0xeb, 0xc0, 0x6c, 0xd6, 0xaa, 0x8d, 0xdd, 0x46, 0x6d, 0x27, 0x2d, 0xc8,
-	0x0f, 0x8e, 0x4f, 0x94, 0xcd, 0x96, 0xc3, 0x5c, 0x8c, 0x48, 0x87, 0xcc, 0xbc, 0x92, 0x74, 0x20,
-	0x47, 0x82, 0xcd, 0xbd, 0xb2, 0x59, 0x4f, 0x8b, 0xf2, 0xc6, 0xf1, 0x89, 0x92, 0x5a, 0x98, 0xab,
-	0x54, 0x02, 0x0f, 0x23, 0x01, 0xc1, 0x74, 0xd2, 0x31, 0x39, 0x73, 0x7c, 0xa2, 0xa4, 0x8f, 0x96,
-	0x26, 0x22, 0x27, 0xbe, 0xfd, 0xc8, 0x09, 0x95, 0x83, 0xd3, 0xcb, 0x9c, 0x78, 0x76, 0x99, 0x13,
-	0xff, 0x5c, 0xe6, 0xc4, 0xef, 0x57, 0x39, 0xe1, 0xec, 0x2a, 0x27, 0x9c, 0x5f, 0xe5, 0x84, 0xcf,
-	0xaf, 0xbb, 0x84, 0xf7, 0x46, 0x6d, 0x0d, 0xd1, 0xa1, 0x3e, 0x5d, 0x92, 0xd7, 0xe3, 0x78, 0x39,
-	0x5f, 0xb7, 0x7e, 0x49, 0xff, 0x1a, 0xee, 0xdc, 0x70, 0xf9, 0xb5, 0xd7, 0xc2, 0xed, 0x57, 0xfa,
-	0x17, 0x00, 0x00, 0xff, 0xff, 0x75, 0x9e, 0x8c, 0x87, 0x9b, 0x05, 0x00, 0x00,
+	// 833 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xcd, 0x6e, 0xe3, 0x54,
+	0x14, 0xb6, 0xd3, 0x6a, 0xa0, 0x37, 0x28, 0x75, 0x3d, 0x61, 0x64, 0x3c, 0x90, 0xb1, 0x2c, 0x90,
+	0xa2, 0xa2, 0xb1, 0x49, 0x3a, 0x2b, 0xd8, 0x90, 0x1f, 0x97, 0x1a, 0xa6, 0x69, 0x64, 0x27, 0x19,
+	0x0d, 0x1b, 0xeb, 0xc6, 0xbe, 0x4d, 0xae, 0x92, 0xf8, 0x5a, 0xbe, 0x37, 0x1e, 0xf2, 0x06, 0x28,
+	0x2b, 0x5e, 0x20, 0x2b, 0xc4, 0x62, 0x1e, 0x83, 0xdd, 0x2c, 0x47, 0x62, 0x33, 0x1b, 0x46, 0xa8,
+	0x7d, 0x03, 0x9e, 0x00, 0xd9, 0xf9, 0x6d, 0xe2, 0x56, 0xaa, 0x84, 0x04, 0x3b, 0xfb, 0xdc, 0xf3,
+	0x7d, 0xf7, 0x9c, 0xef, 0x3b, 0x57, 0x07, 0x7c, 0x81, 0x7d, 0x86, 0x42, 0xb7, 0x0f, 0xb1, 0xef,
+	0x50, 0xe4, 0x8e, 0x43, 0xcc, 0x26, 0xba, 0xeb, 0x46, 0x7a, 0x54, 0xd2, 0x5f, 0xe1, 0x10, 0x69,
+	0x41, 0x48, 0x18, 0x11, 0xe5, 0x94, 0x34, 0xcd, 0x75, 0x23, 0x2d, 0x2a, 0xc9, 0x9f, 0xbb, 0x84,
+	0x8e, 0x08, 0xd5, 0x29, 0x83, 0x03, 0xec, 0xf7, 0xf4, 0xa8, 0xd4, 0x45, 0x0c, 0x96, 0x96, 0xff,
+	0x73, 0x06, 0x39, 0xdf, 0x23, 0x3d, 0x92, 0x7c, 0xea, 0xf1, 0xd7, 0x22, 0xfa, 0x98, 0x21, 0xdf,
+	0x43, 0xe1, 0x08, 0xfb, 0x4c, 0x87, 0x5d, 0x17, 0xeb, 0x6c, 0x12, 0x20, 0x3a, 0x3f, 0x54, 0xdf,
+	0xf1, 0xe0, 0xd3, 0x0e, 0x1c, 0x62, 0x0f, 0x32, 0x12, 0xda, 0x88, 0xd5, 0xfa, 0xd0, 0xef, 0xa1,
+	0x26, 0x74, 0x07, 0x88, 0xd5, 0x21, 0x83, 0x22, 0x01, 0x47, 0xd1, 0xf2, 0xdc, 0x19, 0x07, 0x1e,
+	0x64, 0x88, 0x4a, 0xbc, 0xb2, 0x57, 0xcc, 0x96, 0x15, 0x6d, 0xcd, 0xac, 0xc5, 0xcc, 0xda, 0x8a,
+	0xa9, 0x9d, 0x24, 0x56, 0x95, 0x37, 0xef, 0x9f, 0x70, 0x7f, 0xbf, 0x7f, 0x22, 0x4d, 0xe0, 0x68,
+	0xf8, 0xb5, 0xba, 0x43, 0xa4, 0x5a, 0x42, 0x74, 0x13, 0x42, 0xc5, 0x22, 0x88, 0x63, 0x14, 0xb1,
+	0x45, 0x92, 0x83, 0x3d, 0x29, 0xa3, 0xf0, 0xc5, 0x7d, 0x2b, 0x37, 0x8f, 0xcf, 0x13, 0x4d, 0x4f,
+	0xfc, 0x0c, 0x00, 0x3a, 0x84, 0xb4, 0xef, 0x40, 0x77, 0x40, 0xa5, 0x3d, 0x65, 0xaf, 0x78, 0x60,
+	0x1d, 0x24, 0x91, 0x8a, 0x3b, 0xa0, 0xea, 0xb7, 0x20, 0xdf, 0xb1, 0x6b, 0xe7, 0x90, 0x8d, 0x43,
+	0xe4, 0x6d, 0x74, 0x94, 0x76, 0x01, 0x9f, 0x76, 0x81, 0xfa, 0x07, 0x0f, 0x0e, 0xed, 0x98, 0x6f,
+	0x03, 0x6d, 0x81, 0x83, 0x55, 0xc9, 0x09, 0x2c, 0x5b, 0x96, 0x6f, 0xd7, 0xa1, 0x2a, 0x2d, 0x14,
+	0x10, 0xb6, 0x14, 0x50, 0xad, 0x35, 0xcd, 0x3d, 0x5a, 0xae, 0x02, 0x80, 0xfd, 0xcb, 0x10, 0xba,
+	0x0c, 0x13, 0x5f, 0xda, 0x53, 0xf8, 0x62, 0xae, 0xac, 0x6a, 0xf3, 0xe1, 0xd0, 0x96, 0xc3, 0xb0,
+	0x18, 0x0e, 0xcd, 0x5c, 0x65, 0x5a, 0x1b, 0x28, 0xf5, 0xb7, 0x0c, 0x10, 0x6b, 0xc4, 0xa7, 0xe3,
+	0x11, 0x0a, 0x37, 0x1a, 0x3b, 0x05, 0xfb, 0xf1, 0x60, 0x24, 0x3d, 0xe5, 0xca, 0x65, 0xed, 0xf6,
+	0x69, 0xd4, 0x76, 0xd1, 0xad, 0x49, 0x80, 0xac, 0x04, 0x2f, 0xbe, 0x00, 0x87, 0xf4, 0xa6, 0x66,
+	0x49, 0x2f, 0xd9, 0xf2, 0x97, 0x77, 0x51, 0x6e, 0xc9, 0x7c, 0xc6, 0x59, 0xdb, 0x2c, 0xe2, 0x25,
+	0xc8, 0x47, 0xd4, 0xdd, 0xf1, 0x33, 0x51, 0x21, 0x5b, 0xfe, 0xea, 0x2e, 0xf6, 0xb4, 0x39, 0x38,
+	0xe3, 0xac, 0x54, 0xbe, 0xea, 0x03, 0xb0, 0xef, 0x41, 0x06, 0xd5, 0x2e, 0x38, 0x3a, 0x83, 0xbe,
+	0x47, 0xfb, 0x70, 0x80, 0xce, 0x11, 0x83, 0x71, 0x50, 0x3c, 0x01, 0x8f, 0x82, 0x90, 0x44, 0xd8,
+	0x43, 0xa1, 0x73, 0x89, 0x90, 0x13, 0x10, 0x32, 0x74, 0xa0, 0xe7, 0xcd, 0x67, 0xe1, 0xc0, 0x7a,
+	0xb8, 0x3c, 0x3d, 0x45, 0xa8, 0x49, 0xc8, 0xb0, 0xe2, 0x79, 0xa1, 0x28, 0x81, 0x0f, 0x22, 0x14,
+	0xd2, 0xd8, 0xb2, 0x4c, 0x92, 0xb5, 0xfc, 0x55, 0x5f, 0x67, 0x40, 0x7e, 0x57, 0xcd, 0x4e, 0xe9,
+	0x5f, 0x73, 0xe3, 0xe5, 0x6d, 0x6e, 0x3c, 0xbd, 0x87, 0x1b, 0x9d, 0xd2, 0xff, 0xc1, 0x8f, 0x3f,
+	0x79, 0x70, 0xb4, 0x53, 0xd8, 0x7f, 0xfc, 0x1e, 0xbf, 0x4f, 0x79, 0x8f, 0xc7, 0x77, 0x75, 0xbe,
+	0x7e, 0x93, 0x89, 0x49, 0x1b, 0xe8, 0xe3, 0xdf, 0x79, 0xf0, 0x28, 0xdd, 0x4b, 0xf1, 0x1b, 0xa0,
+	0xd4, 0x2e, 0x1a, 0x76, 0xfb, 0xdc, 0xb0, 0x9c, 0x66, 0xa5, 0xf6, 0x83, 0xd1, 0x72, 0x5a, 0x2f,
+	0x9b, 0x86, 0xd3, 0x6e, 0xd8, 0x4d, 0xa3, 0x66, 0x9e, 0x9a, 0x46, 0x5d, 0xe0, 0xe4, 0x8f, 0xa7,
+	0x33, 0xe5, 0xa8, 0xed, 0xd3, 0x00, 0xb9, 0xf8, 0x12, 0x2f, 0x35, 0x14, 0x75, 0x20, 0xa7, 0x82,
+	0xed, 0xe7, 0x15, 0xfb, 0x4c, 0xe0, 0xe5, 0xc3, 0xe9, 0x4c, 0xc9, 0x6e, 0x08, 0x2b, 0x9e, 0x80,
+	0x4f, 0x52, 0x01, 0xb1, 0x6b, 0x42, 0x46, 0xce, 0x4f, 0x67, 0x8a, 0xd0, 0xd9, 0x72, 0x4a, 0xde,
+	0xff, 0xf9, 0xd7, 0x02, 0x77, 0xfc, 0x9a, 0x07, 0xb9, 0x9b, 0x2d, 0x8a, 0xcf, 0xc0, 0x63, 0xb3,
+	0x71, 0x6a, 0x55, 0x6a, 0x2d, 0xf3, 0xa2, 0x91, 0x56, 0xf6, 0xc3, 0xe9, 0x4c, 0x39, 0x5c, 0x83,
+	0x8c, 0x51, 0xc0, 0x26, 0xa2, 0xbe, 0x8b, 0xaa, 0x5f, 0xb4, 0xab, 0xcf, 0x0d, 0xc7, 0x36, 0xbf,
+	0x6b, 0x08, 0xbc, 0x9c, 0x9b, 0xce, 0x14, 0x50, 0x27, 0xe3, 0xee, 0x10, 0xd9, 0xb8, 0xe7, 0x8b,
+	0xc7, 0x40, 0xda, 0x05, 0xbc, 0x68, 0xb4, 0xcc, 0x73, 0x43, 0xc8, 0xc8, 0x1f, 0x4d, 0x67, 0xca,
+	0x87, 0x75, 0xf2, 0xca, 0x67, 0x78, 0x84, 0xe6, 0xb5, 0x56, 0x1b, 0x6f, 0xae, 0x0a, 0xfc, 0xdb,
+	0xab, 0x02, 0xff, 0xd7, 0x55, 0x81, 0xff, 0xe5, 0xba, 0xc0, 0xbd, 0xbd, 0x2e, 0x70, 0xef, 0xae,
+	0x0b, 0xdc, 0x8f, 0xcf, 0x7a, 0x98, 0xf5, 0xc7, 0x5d, 0xcd, 0x25, 0x23, 0x7d, 0xb1, 0x78, 0xd7,
+	0x96, 0x3e, 0x5d, 0xad, 0xf0, 0xe8, 0x44, 0xff, 0x29, 0xd9, 0xe3, 0xc9, 0x42, 0xed, 0x3e, 0x48,
+	0x36, 0xea, 0xc9, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x17, 0x85, 0x90, 0x57, 0xef, 0x07, 0x00,
+	0x00,
 }
 
 func (m *ValidatorSetChangePacketData) Marshal() (dAtA []byte, err error) {
@@ -693,7 +850,7 @@ func (m *ConsumerPacketData_VscMaturedPacketData) MarshalToSizedBuffer(dAtA []by
 	}
 	return len(dAtA) - i, nil
 }
-func (m *ConsumerPacketDataList) Marshal() (dAtA []byte, err error) {
+func (m *HandshakeMetadata) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -703,34 +860,113 @@ func (m *ConsumerPacketDataList) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *ConsumerPacketDataList) MarshalTo(dAtA []byte) (int, error) {
+func (m *HandshakeMetadata) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *ConsumerPacketDataList) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *HandshakeMetadata) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
 	_ = l
-	if len(m.List) > 0 {
-		for iNdEx := len(m.List) - 1; iNdEx >= 0; iNdEx-- {
-			{
-				size, err := m.List[iNdEx].MarshalToSizedBuffer(dAtA[:i])
-				if err != nil {
-					return 0, err
-				}
-				i -= size
-				i = encodeVarintWire(dAtA, i, uint64(size))
+	if len(m.Version) > 0 {
+		i -= len(m.Version)
+		copy(dAtA[i:], m.Version)
+		i = encodeVarintWire(dAtA, i, uint64(len(m.Version)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.ProviderFeePoolAddr) > 0 {
+		i -= len(m.ProviderFeePoolAddr)
+		copy(dAtA[i:], m.ProviderFeePoolAddr)
+		i = encodeVarintWire(dAtA, i, uint64(len(m.ProviderFeePoolAddr)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *ConsumerPacketDataV1) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *ConsumerPacketDataV1) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ConsumerPacketDataV1) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.Data != nil {
+		{
+			size := m.Data.Size()
+			i -= size
+			if _, err := m.Data.MarshalTo(dAtA[i:]); err != nil {
+				return 0, err
 			}
-			i--
-			dAtA[i] = 0xa
 		}
 	}
+	if m.Type != 0 {
+		i = encodeVarintWire(dAtA, i, uint64(m.Type))
+		i--
+		dAtA[i] = 0x8
+	}
 	return len(dAtA) - i, nil
 }
 
-func (m *HandshakeMetadata) Marshal() (dAtA []byte, err error) {
+func (m *ConsumerPacketDataV1_SlashPacketData) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ConsumerPacketDataV1_SlashPacketData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	if m.SlashPacketData != nil {
+		{
+			size, err := m.SlashPacketData.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintWire(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x12
+	}
+	return len(dAtA) - i, nil
+}
+func (m *ConsumerPacketDataV1_VscMaturedPacketData) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ConsumerPacketDataV1_VscMaturedPacketData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	if m.VscMaturedPacketData != nil {
+		{
+			size, err := m.VscMaturedPacketData.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintWire(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x1a
+	}
+	return len(dAtA) - i, nil
+}
+func (m *SlashPacketDataV1) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -740,30 +976,36 @@ func (m *HandshakeMetadata) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *HandshakeMetadata) MarshalTo(dAtA []byte) (int, error) {
+func (m *SlashPacketDataV1) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *HandshakeMetadata) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *SlashPacketDataV1) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
 	_ = l
-	if len(m.Version) > 0 {
-		i -= len(m.Version)
-		copy(dAtA[i:], m.Version)
-		i = encodeVarintWire(dAtA, i, uint64(len(m.Version)))
+	if m.Infraction != 0 {
+		i = encodeVarintWire(dAtA, i, uint64(m.Infraction))
 		i--
-		dAtA[i] = 0x12
+		dAtA[i] = 0x18
 	}
-	if len(m.ProviderFeePoolAddr) > 0 {
-		i -= len(m.ProviderFeePoolAddr)
-		copy(dAtA[i:], m.ProviderFeePoolAddr)
-		i = encodeVarintWire(dAtA, i, uint64(len(m.ProviderFeePoolAddr)))
+	if m.ValsetUpdateId != 0 {
+		i = encodeVarintWire(dAtA, i, uint64(m.ValsetUpdateId))
 		i--
-		dAtA[i] = 0xa
+		dAtA[i] = 0x10
 	}
+	{
+		size, err := m.Validator.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintWire(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0xa
 	return len(dAtA) - i, nil
 }
 
@@ -825,13 +1067,69 @@ func (m *SlashPacketData) Size() (n int) {
 	if m.ValsetUpdateId != 0 {
 		n += 1 + sovWire(uint64(m.ValsetUpdateId))
 	}
-	if m.Infraction != 0 {
-		n += 1 + sovWire(uint64(m.Infraction))
+	if m.Infraction != 0 {
+		n += 1 + sovWire(uint64(m.Infraction))
+	}
+	return n
+}
+
+func (m *ConsumerPacketData) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Type != 0 {
+		n += 1 + sovWire(uint64(m.Type))
+	}
+	if m.Data != nil {
+		n += m.Data.Size()
+	}
+	return n
+}
+
+func (m *ConsumerPacketData_SlashPacketData) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.SlashPacketData != nil {
+		l = m.SlashPacketData.Size()
+		n += 1 + l + sovWire(uint64(l))
+	}
+	return n
+}
+func (m *ConsumerPacketData_VscMaturedPacketData) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.VscMaturedPacketData != nil {
+		l = m.VscMaturedPacketData.Size()
+		n += 1 + l + sovWire(uint64(l))
+	}
+	return n
+}
+func (m *HandshakeMetadata) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.ProviderFeePoolAddr)
+	if l > 0 {
+		n += 1 + l + sovWire(uint64(l))
+	}
+	l = len(m.Version)
+	if l > 0 {
+		n += 1 + l + sovWire(uint64(l))
 	}
 	return n
 }
 
-func (m *ConsumerPacketData) Size() (n int) {
+func (m *ConsumerPacketDataV1) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -846,7 +1144,7 @@ func (m *ConsumerPacketData) Size() (n int) {
 	return n
 }
 
-func (m *ConsumerPacketData_SlashPacketData) Size() (n int) {
+func (m *ConsumerPacketDataV1_SlashPacketData) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -858,7 +1156,7 @@ func (m *ConsumerPacketData_SlashPacketData) Size() (n int) {
 	}
 	return n
 }
-func (m *ConsumerPacketData_VscMaturedPacketData) Size() (n int) {
+func (m *ConsumerPacketDataV1_VscMaturedPacketData) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -870,34 +1168,19 @@ func (m *ConsumerPacketData_VscMaturedPacketData) Size() (n int) {
 	}
 	return n
 }
-func (m *ConsumerPacketDataList) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if len(m.List) > 0 {
-		for _, e := range m.List {
-			l = e.Size()
-			n += 1 + l + sovWire(uint64(l))
-		}
-	}
-	return n
-}
-
-func (m *HandshakeMetadata) Size() (n int) {
+func (m *SlashPacketDataV1) Size() (n int) {
 	if m == nil {
 		return 0
 	}
 	var l int
 	_ = l
-	l = len(m.ProviderFeePoolAddr)
-	if l > 0 {
-		n += 1 + l + sovWire(uint64(l))
+	l = m.Validator.Size()
+	n += 1 + l + sovWire(uint64(l))
+	if m.ValsetUpdateId != 0 {
+		n += 1 + sovWire(uint64(m.ValsetUpdateId))
 	}
-	l = len(m.Version)
-	if l > 0 {
-		n += 1 + l + sovWire(uint64(l))
+	if m.Infraction != 0 {
+		n += 1 + sovWire(uint64(m.Infraction))
 	}
 	return n
 }
@@ -1372,7 +1655,7 @@ func (m *ConsumerPacketData) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error {
+func (m *HandshakeMetadata) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1395,17 +1678,17 @@ func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: ConsumerPacketDataList: wiretype end group for non-group")
+			return fmt.Errorf("proto: HandshakeMetadata: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: ConsumerPacketDataList: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: HandshakeMetadata: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field List", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ProviderFeePoolAddr", wireType)
 			}
-			var msglen int
+			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowWire
@@ -1415,25 +1698,55 @@ func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				msglen |= int(b&0x7F) << shift
+				stringLen |= uint64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			if msglen < 0 {
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
 				return ErrInvalidLengthWire
 			}
-			postIndex := iNdEx + msglen
+			postIndex := iNdEx + intStringLen
 			if postIndex < 0 {
 				return ErrInvalidLengthWire
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.List = append(m.List, ConsumerPacketData{})
-			if err := m.List[len(m.List)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
+			m.ProviderFeePoolAddr = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowWire
+				}
+				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 ErrInvalidLengthWire
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthWire
 			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Version = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
@@ -1456,7 +1769,7 @@ func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *HandshakeMetadata) Unmarshal(dAtA []byte) error {
+func (m *ConsumerPacketDataV1) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1479,17 +1792,36 @@ func (m *HandshakeMetadata) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: HandshakeMetadata: wiretype end group for non-group")
+			return fmt.Errorf("proto: ConsumerPacketDataV1: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: HandshakeMetadata: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: ConsumerPacketDataV1: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType)
+			}
+			m.Type = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowWire
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Type |= ConsumerPacketDataType(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 2:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ProviderFeePoolAddr", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field SlashPacketData", wireType)
 			}
-			var stringLen uint64
+			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowWire
@@ -1499,29 +1831,32 @@ func (m *HandshakeMetadata) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
+				msglen |= int(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
+			if msglen < 0 {
 				return ErrInvalidLengthWire
 			}
-			postIndex := iNdEx + intStringLen
+			postIndex := iNdEx + msglen
 			if postIndex < 0 {
 				return ErrInvalidLengthWire
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.ProviderFeePoolAddr = string(dAtA[iNdEx:postIndex])
+			v := &SlashPacketDataV1{}
+			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			m.Data = &ConsumerPacketDataV1_SlashPacketData{v}
 			iNdEx = postIndex
-		case 2:
+		case 3:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field VscMaturedPacketData", wireType)
 			}
-			var stringLen uint64
+			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowWire
@@ -1531,24 +1866,148 @@ func (m *HandshakeMetadata) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
+				msglen |= int(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
+			if msglen < 0 {
 				return ErrInvalidLengthWire
 			}
-			postIndex := iNdEx + intStringLen
+			postIndex := iNdEx + msglen
 			if postIndex < 0 {
 				return ErrInvalidLengthWire
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Version = string(dAtA[iNdEx:postIndex])
+			v := &VSCMaturedPacketData{}
+			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			m.Data = &ConsumerPacketDataV1_VscMaturedPacketData{v}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipWire(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthWire
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *SlashPacketDataV1) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowWire
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: SlashPacketDataV1: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: SlashPacketDataV1: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Validator", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowWire
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthWire
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthWire
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Validator.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
 			iNdEx = postIndex
+		case 2:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ValsetUpdateId", wireType)
+			}
+			m.ValsetUpdateId = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowWire
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.ValsetUpdateId |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 3:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Infraction", wireType)
+			}
+			m.Infraction = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowWire
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Infraction |= InfractionType(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipWire(dAtA[iNdEx:])

From 4a5a56130376e12430b9b81d2a619bc98e8c7a73 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Mon, 14 Aug 2023 13:11:10 -0700
Subject: [PATCH 11/21] progress save

---
 .../ccv/consumer/v1/consumer.proto            |   8 -
 .../ccv/v1/shared_consumer.proto              |  12 +-
 testutil/keeper/unit_test_helpers.go          |  10 +-
 x/ccv/consumer/ibc_module.go                  |   3 +-
 x/ccv/consumer/ibc_module_test.go             |   5 +-
 x/ccv/consumer/keeper/distribution.go         |   8 +-
 x/ccv/consumer/keeper/distribution_test.go    |   5 +-
 x/ccv/consumer/keeper/genesis.go              |  15 +-
 x/ccv/consumer/keeper/genesis_test.go         |  52 +--
 x/ccv/consumer/keeper/keeper.go               |  24 +-
 x/ccv/consumer/keeper/keeper_test.go          |  12 +-
 x/ccv/consumer/keeper/params.go               |   5 +-
 x/ccv/consumer/keeper/params_test.go          |  17 +-
 x/ccv/consumer/keeper/relay_test.go           |  11 +-
 x/ccv/consumer/keeper/soft_opt_out_test.go    |   4 +-
 x/ccv/consumer/module.go                      |   7 +-
 x/ccv/consumer/types/genesis_test.go          |  67 ++--
 x/ccv/consumer/types/params_test.go           |  36 +-
 x/ccv/provider/ibc_module.go                  |   2 +-
 x/ccv/provider/ibc_module_test.go             |   2 +-
 x/ccv/provider/keeper/genesis.go              |   2 +-
 x/ccv/provider/keeper/genesis_test.go         |   9 +-
 x/ccv/provider/keeper/keeper.go               |  17 +-
 x/ccv/provider/keeper/proposal.go             |   7 +-
 x/ccv/provider/keeper/proposal_test.go        |   3 +-
 x/ccv/provider/types/consumer.go              |   3 +-
 x/ccv/provider/types/genesis.go               |   2 +-
 x/ccv/provider/types/genesis_test.go          |   9 +-
 x/ccv/provider/types/params.go                |   5 +-
 x/ccv/{consumer => }/types/genesis.go         |  44 ++-
 x/ccv/{consumer => }/types/params.go          |  40 +-
 x/ccv/types/shared_consumer.pb.go             | 345 ++++++++++++++----
 32 files changed, 484 insertions(+), 307 deletions(-)
 rename x/ccv/{consumer => }/types/genesis.go (67%)
 rename x/ccv/{consumer => }/types/params.go (83%)

diff --git a/proto/interchain_security/ccv/consumer/v1/consumer.proto b/proto/interchain_security/ccv/consumer/v1/consumer.proto
index 90700513cc..39d6eb29de 100644
--- a/proto/interchain_security/ccv/consumer/v1/consumer.proto
+++ b/proto/interchain_security/ccv/consumer/v1/consumer.proto
@@ -32,14 +32,6 @@ message CrossChainValidator {
   ];
 }
 
-// ConsumerPacketDataList is a list of consumer packet data packets.
-//
-// Note this type is is only used internally to the consumer CCV module 
-// for exporting / importing state in InitGenesis and ExportGenesis. 
-message ConsumerPacketDataList {
-  repeated interchain_security.ccv.v1.ConsumerPacketData list = 1 [ (gogoproto.nullable) = false ];
-}
-
 // A record storing the state of a slash packet sent to the provider chain
 // which may bounce back and forth until handled by the provider.
 // 
diff --git a/proto/interchain_security/ccv/v1/shared_consumer.proto b/proto/interchain_security/ccv/v1/shared_consumer.proto
index 3f5a218f03..d00c416a12 100644
--- a/proto/interchain_security/ccv/v1/shared_consumer.proto
+++ b/proto/interchain_security/ccv/v1/shared_consumer.proto
@@ -110,7 +110,7 @@ message GenesisState {
     repeated OutstandingDowntime outstanding_downtime_slashing = 10
         [ (gogoproto.nullable) = false ];
     // PendingConsumerPackets nil on new chain, filled in on restart.
-    interchain_security.ccv.consumer.v1.ConsumerPacketDataList pending_consumer_packets =
+    ConsumerPacketDataList pending_consumer_packets =
         11 [ (gogoproto.nullable) = false ];
     // LastTransmissionBlockHeight nil on new chain, filled in on restart.
     LastTransmissionBlockHeight
@@ -145,3 +145,13 @@ message MaturingVSCPacket {
     google.protobuf.Timestamp maturity_time = 2
         [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ];
 }
+
+// ConsumerPacketDataList is a list of consumer packet data packets.
+//
+// Note this type is is used internally to the consumer CCV module 
+// for exporting / importing state in InitGenesis and ExportGenesis,
+// AND included in the consumer genesis type (reffed by provider and consumer modules), 
+// hence this is a shared type.
+message ConsumerPacketDataList {
+    repeated interchain_security.ccv.v1.ConsumerPacketData list = 1 [ (gogoproto.nullable) = false ];
+}
diff --git a/testutil/keeper/unit_test_helpers.go b/testutil/keeper/unit_test_helpers.go
index b8e69a4045..010a3995eb 100644
--- a/testutil/keeper/unit_test_helpers.go
+++ b/testutil/keeper/unit_test_helpers.go
@@ -235,13 +235,13 @@ func GetTestConsumerAdditionProp() *providertypes.ConsumerAdditionProposal {
 		[]byte("gen_hash"),
 		[]byte("bin_hash"),
 		time.Now(),
-		consumertypes.DefaultConsumerRedistributeFrac,
-		consumertypes.DefaultBlocksPerDistributionTransmission,
+		types.DefaultConsumerRedistributeFrac,
+		types.DefaultBlocksPerDistributionTransmission,
 		"",
-		consumertypes.DefaultHistoricalEntries,
+		types.DefaultHistoricalEntries,
 		types.DefaultCCVTimeoutPeriod,
-		consumertypes.DefaultTransferTimeoutPeriod,
-		consumertypes.DefaultConsumerUnbondingPeriod,
+		types.DefaultTransferTimeoutPeriod,
+		types.DefaultConsumerUnbondingPeriod,
 	).(*providertypes.ConsumerAdditionProposal)
 
 	return prop
diff --git a/x/ccv/consumer/ibc_module.go b/x/ccv/consumer/ibc_module.go
index 74c4cff27c..93b8096092 100644
--- a/x/ccv/consumer/ibc_module.go
+++ b/x/ccv/consumer/ibc_module.go
@@ -18,7 +18,6 @@ import (
 
 	"github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
 	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
-	providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
 	"github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
@@ -127,7 +126,7 @@ func (am AppModule) OnChanOpenAck(
 			"provider channel: %s already established", providerChannel)
 	}
 
-	var md providertypes.HandshakeMetadata
+	var md types.HandshakeMetadata
 	if err := (&md).Unmarshal([]byte(counterpartyMetadata)); err != nil {
 		return errorsmod.Wrapf(types.ErrInvalidHandshakeMetadata,
 			"error unmarshalling ibc-ack metadata: \n%v; \nmetadata: %v", err, counterpartyMetadata)
diff --git a/x/ccv/consumer/ibc_module_test.go b/x/ccv/consumer/ibc_module_test.go
index a451625230..25cbac58a2 100644
--- a/x/ccv/consumer/ibc_module_test.go
+++ b/x/ccv/consumer/ibc_module_test.go
@@ -16,7 +16,6 @@ import (
 	testkeeper "github.com/cosmos/interchain-security/v3/testutil/keeper"
 	"github.com/cosmos/interchain-security/v3/x/ccv/consumer"
 	consumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
-	providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
 	ccv "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
@@ -262,7 +261,7 @@ func TestOnChanOpenAck(t *testing.T) {
 		{
 			"invalid: mismatched serialized version",
 			func(keeper *consumerkeeper.Keeper, params *params, mocks testkeeper.MockedKeepers) {
-				md := providertypes.HandshakeMetadata{
+				md := ccv.HandshakeMetadata{
 					ProviderFeePoolAddr: "", // dummy address used
 					Version:             "bunkVersion",
 				}
@@ -288,7 +287,7 @@ func TestOnChanOpenAck(t *testing.T) {
 			counterpartyChannelID: "providerCCVChannelID",
 		}
 
-		metadata := providertypes.HandshakeMetadata{
+		metadata := ccv.HandshakeMetadata{
 			ProviderFeePoolAddr: "someAcct",
 			Version:             ccv.Version,
 		}
diff --git a/x/ccv/consumer/keeper/distribution.go b/x/ccv/consumer/keeper/distribution.go
index 48f1c5a1eb..5fe416ea2b 100644
--- a/x/ccv/consumer/keeper/distribution.go
+++ b/x/ccv/consumer/keeper/distribution.go
@@ -42,7 +42,7 @@ func (k Keeper) EndBlockRD(ctx sdk.Context) {
 	}
 
 	// Update LastTransmissionBlockHeight
-	newLtbh := types.LastTransmissionBlockHeight{
+	newLtbh := ccv.LastTransmissionBlockHeight{
 		Height: ctx.BlockHeight(),
 	}
 	k.SetLastTransmissionBlockHeight(ctx, newLtbh)
@@ -190,10 +190,10 @@ func (k Keeper) AllowedRewardDenoms(ctx sdk.Context) []string {
 	return rewardDenoms
 }
 
-func (k Keeper) GetLastTransmissionBlockHeight(ctx sdk.Context) types.LastTransmissionBlockHeight {
+func (k Keeper) GetLastTransmissionBlockHeight(ctx sdk.Context) ccv.LastTransmissionBlockHeight {
 	store := ctx.KVStore(k.storeKey)
 	bz := store.Get(types.LastDistributionTransmissionKey())
-	ltbh := types.LastTransmissionBlockHeight{}
+	ltbh := ccv.LastTransmissionBlockHeight{}
 	if bz != nil {
 		if err := ltbh.Unmarshal(bz); err != nil {
 			panic(fmt.Errorf("failed to unmarshal LastTransmissionBlockHeight: %w", err))
@@ -202,7 +202,7 @@ func (k Keeper) GetLastTransmissionBlockHeight(ctx sdk.Context) types.LastTransm
 	return ltbh
 }
 
-func (k Keeper) SetLastTransmissionBlockHeight(ctx sdk.Context, ltbh types.LastTransmissionBlockHeight) {
+func (k Keeper) SetLastTransmissionBlockHeight(ctx sdk.Context, ltbh ccv.LastTransmissionBlockHeight) {
 	store := ctx.KVStore(k.storeKey)
 	bz, err := ltbh.Marshal()
 	if err != nil {
diff --git a/x/ccv/consumer/keeper/distribution_test.go b/x/ccv/consumer/keeper/distribution_test.go
index 71df5fd93d..4a611f2d1e 100644
--- a/x/ccv/consumer/keeper/distribution_test.go
+++ b/x/ccv/consumer/keeper/distribution_test.go
@@ -12,6 +12,7 @@ import (
 
 	testkeeper "github.com/cosmos/interchain-security/v3/testutil/keeper"
 	"github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
+	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 // TestGetEstimatedNextFeeDistribution tests next fee distribution parameters.
@@ -25,7 +26,7 @@ func TestGetEstimatedNextFeeDistribution(t *testing.T) {
 	mockAccountKeeper := mocks.MockAccountKeeper
 	mockBankKeeper := mocks.MockBankKeeper
 	consumerKeeper := testkeeper.NewInMemConsumerKeeper(keeperParams, mocks)
-	consumerKeeper.SetParams(ctx, types.DefaultParams())
+	consumerKeeper.SetParams(ctx, ccvtypes.DefaultParams())
 
 	// Setup mock account balance
 	fracParam := consumerKeeper.GetConsumerRedistributionFrac(ctx)
@@ -76,7 +77,7 @@ func TestAllowedRewardDenoms(t *testing.T) {
 	defer ctrl.Finish()
 	mocks := testkeeper.NewMockedKeepers(ctrl)
 	consumerKeeper := testkeeper.NewInMemConsumerKeeper(keeperParams, mocks)
-	params := types.DefaultParams()
+	params := ccvtypes.DefaultParams()
 	params.RewardDenoms = []string{"ustake"}
 	params.ProviderRewardDenoms = []string{"uatom"}
 	consumerKeeper.SetParams(ctx, params)
diff --git a/x/ccv/consumer/keeper/genesis.go b/x/ccv/consumer/keeper/genesis.go
index a55184fd27..2ac38f650c 100644
--- a/x/ccv/consumer/keeper/genesis.go
+++ b/x/ccv/consumer/keeper/genesis.go
@@ -7,7 +7,6 @@ import (
 
 	abci "github.com/cometbft/cometbft/abci/types"
 
-	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	ccv "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
@@ -17,7 +16,7 @@ import (
 //  1. A client to the provider was never created, i.e. a new consumer chain is started for the first time.
 //  2. A consumer chain restarts after a client to the provider was created, but the CCV channel handshake is still in progress
 //  3. A consumer chain restarts after the CCV channel handshake was completed.
-func (k Keeper) InitGenesis(ctx sdk.Context, state *consumertypes.GenesisState) []abci.ValidatorUpdate {
+func (k Keeper) InitGenesis(ctx sdk.Context, state *ccv.GenesisState) []abci.ValidatorUpdate {
 	// PreCCV is true during the process of a standalone to consumer changeover.
 	// At the PreCCV point in the process, the standalone chain has just been upgraded to include
 	// the consumer ccv module, but the standalone staking keeper is still managing the validator set.
@@ -116,10 +115,10 @@ func (k Keeper) InitGenesis(ctx sdk.Context, state *consumertypes.GenesisState)
 }
 
 // ExportGenesis returns the CCV consumer module's exported genesis
-func (k Keeper) ExportGenesis(ctx sdk.Context) (genesis *consumertypes.GenesisState) {
+func (k Keeper) ExportGenesis(ctx sdk.Context) (genesis *ccv.GenesisState) {
 	params := k.GetConsumerParams(ctx)
 	if !params.Enabled {
-		return consumertypes.DefaultGenesisState()
+		return ccv.DefaultGenesisState()
 	}
 
 	// export the current validator set
@@ -138,7 +137,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) (genesis *consumertypes.GenesisSt
 			panic("provider client does not exist although provider channel does exist")
 		}
 
-		genesis = consumertypes.NewRestartGenesisState(
+		genesis = ccv.NewRestartGenesisState(
 			clientID,
 			channelID,
 			k.GetAllPacketMaturityTimes(ctx),
@@ -154,11 +153,11 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) (genesis *consumertypes.GenesisSt
 		// if provider clientID and channelID don't exist on the consumer chain,
 		// then CCV protocol is disabled for this chain return a default genesis state
 		if !ok {
-			return consumertypes.DefaultGenesisState()
+			return ccv.DefaultGenesisState()
 		}
 
 		// export client states and pending slashing requests into a new chain genesis
-		genesis = consumertypes.NewRestartGenesisState(
+		genesis = ccv.NewRestartGenesisState(
 			clientID,
 			"",
 			nil,
@@ -166,7 +165,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) (genesis *consumertypes.GenesisSt
 			k.GetAllHeightToValsetUpdateIDs(ctx),
 			pendingPacketsDepreciated,
 			nil,
-			consumertypes.LastTransmissionBlockHeight{},
+			ccv.LastTransmissionBlockHeight{},
 			params,
 		)
 	}
diff --git a/x/ccv/consumer/keeper/genesis_test.go b/x/ccv/consumer/keeper/genesis_test.go
index 649505da0c..9cb489b3c0 100644
--- a/x/ccv/consumer/keeper/genesis_test.go
+++ b/x/ccv/consumer/keeper/genesis_test.go
@@ -61,7 +61,7 @@ func TestInitGenesis(t *testing.T) {
 		[]string{"upgrade", "upgradedIBCState"},
 	)
 
-	matPackets := []consumertypes.MaturingVSCPacket{
+	matPackets := []ccv.MaturingVSCPacket{
 		{
 			VscId:        1,
 			MaturityTime: time.Now().UTC(),
@@ -84,15 +84,15 @@ func TestInitGenesis(t *testing.T) {
 		},
 	}
 	// mock height to valset update ID values
-	defaultHeightValsetUpdateIDs := []consumertypes.HeightToValsetUpdateID{
+	defaultHeightValsetUpdateIDs := []ccv.HeightToValsetUpdateID{
 		{ValsetUpdateId: vscID, Height: blockHeight},
 	}
 	updatedHeightValsetUpdateIDs := append(defaultHeightValsetUpdateIDs,
-		consumertypes.HeightToValsetUpdateID{ValsetUpdateId: vscID + 1, Height: blockHeight + 1},
+		ccv.HeightToValsetUpdateID{ValsetUpdateId: vscID + 1, Height: blockHeight + 1},
 	)
 
 	// create default parameters for a new chain
-	params := consumertypes.DefaultParams()
+	params := ccv.DefaultParams()
 	params.Enabled = true
 
 	// define three test cases which respectively create a genesis struct, use it to call InitGenesis
@@ -100,8 +100,8 @@ func TestInitGenesis(t *testing.T) {
 	testCases := []struct {
 		name         string
 		malleate     func(sdk.Context, testkeeper.MockedKeepers)
-		genesis      *consumertypes.GenesisState
-		assertStates func(sdk.Context, consumerkeeper.Keeper, *consumertypes.GenesisState)
+		genesis      *ccv.GenesisState
+		assertStates func(sdk.Context, consumerkeeper.Keeper, *ccv.GenesisState)
 	}{
 		{
 			"start a new chain",
@@ -112,13 +112,13 @@ func TestInitGenesis(t *testing.T) {
 					testkeeper.ExpectGetCapabilityMock(ctx, mocks, 1),
 				)
 			},
-			consumertypes.NewInitialGenesisState(
+			ccv.NewInitialGenesisState(
 				provClientState,
 				provConsState,
 				valset,
 				params,
 			),
-			func(ctx sdk.Context, ck consumerkeeper.Keeper, gs *consumertypes.GenesisState) {
+			func(ctx sdk.Context, ck consumerkeeper.Keeper, gs *ccv.GenesisState) {
 				assertConsumerPortIsBound(t, ctx, &ck)
 
 				assertProviderClientID(t, ctx, &ck, provClientID)
@@ -134,7 +134,7 @@ func TestInitGenesis(t *testing.T) {
 					testkeeper.ExpectGetCapabilityMock(ctx, mocks, 2),
 				)
 			},
-			consumertypes.NewRestartGenesisState(
+			ccv.NewRestartGenesisState(
 				provClientID,
 				"",
 				matPackets,
@@ -142,10 +142,10 @@ func TestInitGenesis(t *testing.T) {
 				defaultHeightValsetUpdateIDs,
 				pendingDataPackets,
 				nil,
-				consumertypes.LastTransmissionBlockHeight{},
+				ccv.LastTransmissionBlockHeight{},
 				params,
 			),
-			func(ctx sdk.Context, ck consumerkeeper.Keeper, gs *consumertypes.GenesisState) {
+			func(ctx sdk.Context, ck consumerkeeper.Keeper, gs *ccv.GenesisState) {
 				assertConsumerPortIsBound(t, ctx, &ck)
 
 				obtainedPendingPackets := ck.GetPendingPackets(ctx)
@@ -170,20 +170,20 @@ func TestInitGenesis(t *testing.T) {
 				)
 			},
 			// create a genesis for a restarted chain
-			consumertypes.NewRestartGenesisState(
+			ccv.NewRestartGenesisState(
 				provClientID,
 				provChannelID,
 				matPackets,
 				valset,
 				updatedHeightValsetUpdateIDs,
 				pendingDataPackets,
-				[]consumertypes.OutstandingDowntime{
+				[]ccv.OutstandingDowntime{
 					{ValidatorConsensusAddress: sdk.ConsAddress(validator.Bytes()).String()},
 				},
-				consumertypes.LastTransmissionBlockHeight{Height: int64(100)},
+				ccv.LastTransmissionBlockHeight{Height: int64(100)},
 				params,
 			),
-			func(ctx sdk.Context, ck consumerkeeper.Keeper, gs *consumertypes.GenesisState) {
+			func(ctx sdk.Context, ck consumerkeeper.Keeper, gs *ccv.GenesisState) {
 				assertConsumerPortIsBound(t, ctx, &ck)
 
 				gotChannelID, ok := ck.GetProviderChannel(ctx)
@@ -239,7 +239,7 @@ func TestExportGenesis(t *testing.T) {
 	vscID := uint64(0)
 	blockHeight := uint64(0)
 
-	matPackets := []consumertypes.MaturingVSCPacket{
+	matPackets := []ccv.MaturingVSCPacket{
 		{
 			VscId:        1,
 			MaturityTime: time.Now().UTC(),
@@ -272,15 +272,15 @@ func TestExportGenesis(t *testing.T) {
 		},
 	}
 	// mock height to valset update ID values
-	defaultHeightValsetUpdateIDs := []consumertypes.HeightToValsetUpdateID{
+	defaultHeightValsetUpdateIDs := []ccv.HeightToValsetUpdateID{
 		{ValsetUpdateId: vscID, Height: blockHeight},
 	}
 	updatedHeightValsetUpdateIDs := append(defaultHeightValsetUpdateIDs,
-		consumertypes.HeightToValsetUpdateID{ValsetUpdateId: vscID + 1, Height: blockHeight + 1},
+		ccv.HeightToValsetUpdateID{ValsetUpdateId: vscID + 1, Height: blockHeight + 1},
 	)
-	ltbh := consumertypes.LastTransmissionBlockHeight{Height: int64(1000)}
+	ltbh := ccv.LastTransmissionBlockHeight{Height: int64(1000)}
 	// create default parameters for a new chain
-	params := consumertypes.DefaultParams()
+	params := ccv.DefaultParams()
 	params.Enabled = true
 
 	// define two test cases which respectively populate the consumer chain store
@@ -289,7 +289,7 @@ func TestExportGenesis(t *testing.T) {
 	testCases := []struct {
 		name       string
 		malleate   func(sdk.Context, consumerkeeper.Keeper, testkeeper.MockedKeepers)
-		expGenesis *consumertypes.GenesisState
+		expGenesis *ccv.GenesisState
 	}{
 		{
 			"export a chain without an established CCV channel",
@@ -307,7 +307,7 @@ func TestExportGenesis(t *testing.T) {
 
 				ck.SetHeightValsetUpdateID(ctx, defaultHeightValsetUpdateIDs[0].Height, defaultHeightValsetUpdateIDs[0].ValsetUpdateId)
 			},
-			consumertypes.NewRestartGenesisState(
+			ccv.NewRestartGenesisState(
 				provClientID,
 				"",
 				nil,
@@ -315,7 +315,7 @@ func TestExportGenesis(t *testing.T) {
 				defaultHeightValsetUpdateIDs,
 				consPackets,
 				nil,
-				consumertypes.LastTransmissionBlockHeight{},
+				ccv.LastTransmissionBlockHeight{},
 				params,
 			),
 		},
@@ -343,14 +343,14 @@ func TestExportGenesis(t *testing.T) {
 				ck.SetOutstandingDowntime(ctx, sdk.ConsAddress(validator.Address.Bytes()))
 				ck.SetLastTransmissionBlockHeight(ctx, ltbh)
 			},
-			consumertypes.NewRestartGenesisState(
+			ccv.NewRestartGenesisState(
 				provClientID,
 				provChannelID,
 				matPackets,
 				valset,
 				updatedHeightValsetUpdateIDs,
 				consPackets,
-				[]consumertypes.OutstandingDowntime{
+				[]ccv.OutstandingDowntime{
 					{ValidatorConsensusAddress: sdk.ConsAddress(validator.Address.Bytes()).String()},
 				},
 				ltbh,
@@ -394,7 +394,7 @@ func assertProviderClientID(t *testing.T, ctx sdk.Context, ck *consumerkeeper.Ke
 }
 
 // assert that the given input match the height to valset update ID mappings in the store
-func assertHeightValsetUpdateIDs(t *testing.T, ctx sdk.Context, ck *consumerkeeper.Keeper, heighValsetUpdateIDs []consumertypes.HeightToValsetUpdateID) {
+func assertHeightValsetUpdateIDs(t *testing.T, ctx sdk.Context, ck *consumerkeeper.Keeper, heighValsetUpdateIDs []ccv.HeightToValsetUpdateID) {
 	t.Helper()
 	ctr := 0
 
diff --git a/x/ccv/consumer/keeper/keeper.go b/x/ccv/consumer/keeper/keeper.go
index 94d5c790fd..2d3e78e0f8 100644
--- a/x/ccv/consumer/keeper/keeper.go
+++ b/x/ccv/consumer/keeper/keeper.go
@@ -64,7 +64,7 @@ func NewKeeper(
 ) Keeper {
 	// set KeyTable if it has not already been set
 	if !paramSpace.HasKeyTable() {
-		paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable())
+		paramSpace = paramSpace.WithKeyTable(ccv.ParamKeyTable())
 	}
 
 	k := Keeper{
@@ -309,7 +309,7 @@ func (k Keeper) DeletePreCCV(ctx sdk.Context) {
 
 func (k Keeper) SetInitialValSet(ctx sdk.Context, initialValSet []tmtypes.ValidatorUpdate) {
 	store := ctx.KVStore(k.storeKey)
-	initialValSetState := types.GenesisState{
+	initialValSetState := ccv.GenesisState{
 		InitialValSet: initialValSet,
 	}
 	bz := k.cdc.MustMarshal(&initialValSetState)
@@ -318,7 +318,7 @@ func (k Keeper) SetInitialValSet(ctx sdk.Context, initialValSet []tmtypes.Valida
 
 func (k Keeper) GetInitialValSet(ctx sdk.Context) []tmtypes.ValidatorUpdate {
 	store := ctx.KVStore(k.storeKey)
-	initialValSet := types.GenesisState{}
+	initialValSet := ccv.GenesisState{}
 	bz := store.Get(types.InitialValSetKey())
 	if bz != nil {
 		k.cdc.MustUnmarshal(bz, &initialValSet)
@@ -336,14 +336,14 @@ func (k Keeper) GetLastStandaloneValidators(ctx sdk.Context) []stakingtypes.Vali
 
 // GetElapsedPacketMaturityTimes returns a slice of already elapsed PacketMaturityTimes, sorted by maturity times,
 // i.e., the slice contains the IDs of the matured VSCPackets.
-func (k Keeper) GetElapsedPacketMaturityTimes(ctx sdk.Context) (maturingVSCPackets []types.MaturingVSCPacket) {
+func (k Keeper) GetElapsedPacketMaturityTimes(ctx sdk.Context) (maturingVSCPackets []ccv.MaturingVSCPacket) {
 	store := ctx.KVStore(k.storeKey)
 	iterator := sdk.KVStorePrefixIterator(store, []byte{types.PacketMaturityTimeBytePrefix})
 
 	defer iterator.Close()
 
 	for ; iterator.Valid(); iterator.Next() {
-		var maturingVSCPacket types.MaturingVSCPacket
+		var maturingVSCPacket ccv.MaturingVSCPacket
 		if err := maturingVSCPacket.Unmarshal(iterator.Value()); err != nil {
 			// An error here would indicate something is very wrong,
 			// the MaturingVSCPackets are assumed to be correctly serialized in SetPacketMaturityTime.
@@ -368,13 +368,13 @@ func (k Keeper) GetElapsedPacketMaturityTimes(ctx sdk.Context) (maturingVSCPacke
 // PacketMaturityTimeBytePrefix | maturityTime.UnixNano() | vscID
 // Thus, the returned array is in ascending order of maturityTimes.
 // If two entries have the same maturityTime, then they are ordered by vscID.
-func (k Keeper) GetAllPacketMaturityTimes(ctx sdk.Context) (maturingVSCPackets []types.MaturingVSCPacket) {
+func (k Keeper) GetAllPacketMaturityTimes(ctx sdk.Context) (maturingVSCPackets []ccv.MaturingVSCPacket) {
 	store := ctx.KVStore(k.storeKey)
 	iterator := sdk.KVStorePrefixIterator(store, []byte{types.PacketMaturityTimeBytePrefix})
 
 	defer iterator.Close()
 	for ; iterator.Valid(); iterator.Next() {
-		var maturingVSCPacket types.MaturingVSCPacket
+		var maturingVSCPacket ccv.MaturingVSCPacket
 		if err := maturingVSCPacket.Unmarshal(iterator.Value()); err != nil {
 			// An error here would indicate something is very wrong,
 			// the MaturingVSCPackets are assumed to be correctly serialized in SetPacketMaturityTime.
@@ -389,7 +389,7 @@ func (k Keeper) GetAllPacketMaturityTimes(ctx sdk.Context) (maturingVSCPackets [
 // SetPacketMaturityTime sets the maturity time for a given received VSC packet id
 func (k Keeper) SetPacketMaturityTime(ctx sdk.Context, vscId uint64, maturityTime time.Time) {
 	store := ctx.KVStore(k.storeKey)
-	maturingVSCPacket := types.MaturingVSCPacket{
+	maturingVSCPacket := ccv.MaturingVSCPacket{
 		VscId:        vscId,
 		MaturityTime: maturityTime,
 	}
@@ -469,7 +469,7 @@ func (k Keeper) DeleteHeightValsetUpdateID(ctx sdk.Context, height uint64) {
 // Note that the block height to vscID mapping is stored under keys with the following format:
 // HeightValsetUpdateIDBytePrefix | height
 // Thus, the returned array is in ascending order of heights.
-func (k Keeper) GetAllHeightToValsetUpdateIDs(ctx sdk.Context) (heightToValsetUpdateIDs []types.HeightToValsetUpdateID) {
+func (k Keeper) GetAllHeightToValsetUpdateIDs(ctx sdk.Context) (heightToValsetUpdateIDs []ccv.HeightToValsetUpdateID) {
 	store := ctx.KVStore(k.storeKey)
 	iterator := sdk.KVStorePrefixIterator(store, []byte{types.HeightValsetUpdateIDBytePrefix})
 
@@ -478,7 +478,7 @@ func (k Keeper) GetAllHeightToValsetUpdateIDs(ctx sdk.Context) (heightToValsetUp
 		height := binary.BigEndian.Uint64(iterator.Key()[1:])
 		vscID := binary.BigEndian.Uint64(iterator.Value())
 
-		heightToValsetUpdateIDs = append(heightToValsetUpdateIDs, types.HeightToValsetUpdateID{
+		heightToValsetUpdateIDs = append(heightToValsetUpdateIDs, ccv.HeightToValsetUpdateID{
 			Height:         height,
 			ValsetUpdateId: vscID,
 		})
@@ -515,7 +515,7 @@ func (k Keeper) DeleteOutstandingDowntime(ctx sdk.Context, consAddress string) {
 // Note that the outstanding downtime flags are stored under keys with the following format:
 // OutstandingDowntimeBytePrefix | consAddress
 // Thus, the returned array is in ascending order of consAddresses.
-func (k Keeper) GetAllOutstandingDowntimes(ctx sdk.Context) (downtimes []types.OutstandingDowntime) {
+func (k Keeper) GetAllOutstandingDowntimes(ctx sdk.Context) (downtimes []ccv.OutstandingDowntime) {
 	store := ctx.KVStore(k.storeKey)
 	iterator := sdk.KVStorePrefixIterator(store, []byte{types.OutstandingDowntimeBytePrefix})
 
@@ -524,7 +524,7 @@ func (k Keeper) GetAllOutstandingDowntimes(ctx sdk.Context) (downtimes []types.O
 		addrBytes := iterator.Key()[1:]
 		addr := sdk.ConsAddress(addrBytes).String()
 
-		downtimes = append(downtimes, types.OutstandingDowntime{
+		downtimes = append(downtimes, ccv.OutstandingDowntime{
 			ValidatorConsensusAddress: addr,
 		})
 	}
diff --git a/x/ccv/consumer/keeper/keeper_test.go b/x/ccv/consumer/keeper/keeper_test.go
index 06fdeae082..4b536a071a 100644
--- a/x/ccv/consumer/keeper/keeper_test.go
+++ b/x/ccv/consumer/keeper/keeper_test.go
@@ -201,7 +201,7 @@ func TestPacketMaturityTime(t *testing.T) {
 	defer ctrl.Finish()
 
 	now := time.Now().UTC()
-	packets := []types.MaturingVSCPacket{
+	packets := []ccv.MaturingVSCPacket{
 		{
 			VscId:        2,
 			MaturityTime: now,
@@ -220,9 +220,9 @@ func TestPacketMaturityTime(t *testing.T) {
 		},
 	}
 	// sort by MaturityTime and not by VscId
-	expectedGetAllOrder := []types.MaturingVSCPacket{packets[2], packets[1], packets[0], packets[3]}
+	expectedGetAllOrder := []ccv.MaturingVSCPacket{packets[2], packets[1], packets[0], packets[3]}
 	// only packets with MaturityTime before or equal to now
-	expectedGetElapsedOrder := []types.MaturingVSCPacket{packets[2], packets[1], packets[0]}
+	expectedGetElapsedOrder := []ccv.MaturingVSCPacket{packets[2], packets[1], packets[0]}
 
 	// test SetPacketMaturityTime
 	for _, packet := range packets {
@@ -502,7 +502,7 @@ func TestGetAllHeightToValsetUpdateIDs(t *testing.T) {
 	ck, ctx, ctrl, _ := testkeeper.GetConsumerKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
 
-	cases := []types.HeightToValsetUpdateID{
+	cases := []ccv.HeightToValsetUpdateID{
 		{
 			ValsetUpdateId: 2,
 			Height:         22,
@@ -549,9 +549,9 @@ func TestGetAllOutstandingDowntimes(t *testing.T) {
 		sdk.ConsAddress([]byte("consAddress4")),
 		sdk.ConsAddress([]byte("consAddress3")),
 	}
-	expectedGetAllOrder := []types.OutstandingDowntime{}
+	expectedGetAllOrder := []ccv.OutstandingDowntime{}
 	for _, addr := range addresses {
-		expectedGetAllOrder = append(expectedGetAllOrder, types.OutstandingDowntime{ValidatorConsensusAddress: addr.String()})
+		expectedGetAllOrder = append(expectedGetAllOrder, ccv.OutstandingDowntime{ValidatorConsensusAddress: addr.String()})
 	}
 	// sorting by ConsAddress
 	sort.Slice(expectedGetAllOrder, func(i, j int) bool {
diff --git a/x/ccv/consumer/keeper/params.go b/x/ccv/consumer/keeper/params.go
index ccffd96ee5..1c0842d76b 100644
--- a/x/ccv/consumer/keeper/params.go
+++ b/x/ccv/consumer/keeper/params.go
@@ -6,8 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
-	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
+	types "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 // GetParams returns the params for the consumer ccv module
@@ -82,7 +81,7 @@ func (k Keeper) SetProviderFeePoolAddrStr(ctx sdk.Context, addr string) {
 // GetCCVTimeoutPeriod returns the timeout period for sent ccv related ibc packets
 func (k Keeper) GetCCVTimeoutPeriod(ctx sdk.Context) time.Duration {
 	var p time.Duration
-	k.paramStore.Get(ctx, ccvtypes.KeyCCVTimeoutPeriod, &p)
+	k.paramStore.Get(ctx, types.KeyCCVTimeoutPeriod, &p)
 	return p
 }
 
diff --git a/x/ccv/consumer/keeper/params_test.go b/x/ccv/consumer/keeper/params_test.go
index ac6b112aa8..49b1816520 100644
--- a/x/ccv/consumer/keeper/params_test.go
+++ b/x/ccv/consumer/keeper/params_test.go
@@ -7,7 +7,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	testkeeper "github.com/cosmos/interchain-security/v3/testutil/keeper"
-	"github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	ccv "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
@@ -15,21 +14,21 @@ import (
 func TestParams(t *testing.T) {
 	consumerKeeper, ctx, ctrl, _ := testkeeper.GetConsumerKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
-	consumerKeeper.SetParams(ctx, types.DefaultParams())
+	consumerKeeper.SetParams(ctx, ccv.DefaultParams())
 
 	var rewardDenoms []string
 	var provideRewardDenoms []string
-	expParams := types.NewParams(
+	expParams := ccv.NewParams(
 		false,
 		1000,
 		"",
 		"",
 		ccv.DefaultCCVTimeoutPeriod,
-		types.DefaultTransferTimeoutPeriod,
-		types.DefaultConsumerRedistributeFrac,
-		types.DefaultHistoricalEntries,
-		types.DefaultConsumerUnbondingPeriod,
-		types.DefaultSoftOptOutThreshold,
+		ccv.DefaultTransferTimeoutPeriod,
+		ccv.DefaultConsumerRedistributeFrac,
+		ccv.DefaultHistoricalEntries,
+		ccv.DefaultConsumerUnbondingPeriod,
+		ccv.DefaultSoftOptOutThreshold,
 		rewardDenoms,
 		provideRewardDenoms,
 	) // these are the default params, IBC suite independently sets enabled=true
@@ -37,7 +36,7 @@ func TestParams(t *testing.T) {
 	params := consumerKeeper.GetConsumerParams(ctx)
 	require.Equal(t, expParams, params)
 
-	newParams := types.NewParams(false, 1000,
+	newParams := ccv.NewParams(false, 1000,
 		"channel-2", "cosmos19pe9pg5dv9k5fzgzmsrgnw9rl9asf7ddwhu7lm",
 		7*24*time.Hour, 25*time.Hour, "0.5", 500, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"})
 	consumerKeeper.SetParams(ctx, newParams)
diff --git a/x/ccv/consumer/keeper/relay_test.go b/x/ccv/consumer/keeper/relay_test.go
index 09cf987fc0..466ba0743e 100644
--- a/x/ccv/consumer/keeper/relay_test.go
+++ b/x/ccv/consumer/keeper/relay_test.go
@@ -26,6 +26,7 @@ import (
 	consumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
 	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	"github.com/cosmos/interchain-security/v3/x/ccv/types"
+	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 // TestOnRecvVSCPacket tests the behavior of OnRecvVSCPacket over various packet scenarios
@@ -123,7 +124,7 @@ func TestOnRecvVSCPacket(t *testing.T) {
 	consumerKeeper.SetProviderChannel(ctx, consumerCCVChannelID)
 
 	// Set module params with custom unbonding period
-	moduleParams := consumertypes.DefaultParams()
+	moduleParams := ccvtypes.DefaultParams()
 	moduleParams.UnbondingPeriod = 100 * time.Hour
 	consumerKeeper.SetParams(ctx, moduleParams)
 
@@ -172,7 +173,7 @@ func TestOnRecvVSCPacketDuplicateUpdates(t *testing.T) {
 	consumerKeeper, ctx, ctrl, _ := testkeeper.GetConsumerKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
 	consumerKeeper.SetProviderChannel(ctx, consumerCCVChannelID)
-	consumerKeeper.SetParams(ctx, consumertypes.DefaultParams())
+	consumerKeeper.SetParams(ctx, ccvtypes.DefaultParams())
 
 	// Construct packet/data with duplicate val updates for the same pub key
 	cId := crypto.NewCryptoIdentityFromIntSeed(43278947)
@@ -218,7 +219,7 @@ func TestSendPacketsFailure(t *testing.T) {
 	consumerKeeper, ctx, ctrl, mocks := testkeeper.GetConsumerKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
 	consumerKeeper.SetProviderChannel(ctx, "consumerCCVChannelID")
-	consumerKeeper.SetParams(ctx, consumertypes.DefaultParams())
+	consumerKeeper.SetParams(ctx, ccvtypes.DefaultParams())
 
 	// Set some pending packets
 	consumerKeeper.AppendPendingPacket(ctx, types.VscMaturedPacket, &types.ConsumerPacketData_VscMaturedPacketData{})
@@ -240,7 +241,7 @@ func TestSendPackets(t *testing.T) {
 	// Keeper setup
 	consumerKeeper, ctx, ctrl, mocks := testkeeper.GetConsumerKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	consumerKeeper.SetProviderChannel(ctx, "consumerCCVChannelID")
-	consumerKeeper.SetParams(ctx, consumertypes.DefaultParams())
+	consumerKeeper.SetParams(ctx, ccvtypes.DefaultParams())
 
 	// No slash record should exist
 	_, found := consumerKeeper.GetSlashRecord(ctx)
@@ -471,7 +472,7 @@ func TestSendPacketsDeletion(t *testing.T) {
 	consumerKeeper, ctx, ctrl, mocks := testkeeper.GetConsumerKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
 	consumerKeeper.SetProviderChannel(ctx, "consumerCCVChannelID")
-	consumerKeeper.SetParams(ctx, consumertypes.DefaultParams())
+	consumerKeeper.SetParams(ctx, ccvtypes.DefaultParams())
 
 	// Queue two pending packets, vsc matured first
 	consumerKeeper.AppendPendingPacket(ctx, types.VscMaturedPacket, &types.ConsumerPacketData_VscMaturedPacketData{
diff --git a/x/ccv/consumer/keeper/soft_opt_out_test.go b/x/ccv/consumer/keeper/soft_opt_out_test.go
index c99d418ca6..6f2ee8ad4f 100644
--- a/x/ccv/consumer/keeper/soft_opt_out_test.go
+++ b/x/ccv/consumer/keeper/soft_opt_out_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/cosmos/interchain-security/v3/testutil/crypto"
 	testkeeper "github.com/cosmos/interchain-security/v3/testutil/keeper"
-	"github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
+	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 // Tests that UpdateSmallestNonOptOutPower updates the smallest validator power that cannot soft opt out.
@@ -102,7 +102,7 @@ func TestUpdateSmallestNonOptOutPower(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			consumerKeeper, ctx, ctrl, _ := testkeeper.GetConsumerKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
-			moduleParams := types.DefaultParams()
+			moduleParams := ccvtypes.DefaultParams()
 			moduleParams.SoftOptOutThreshold = tc.optOutThresh
 			consumerKeeper.SetParams(ctx, moduleParams)
 			defer ctrl.Finish()
diff --git a/x/ccv/consumer/module.go b/x/ccv/consumer/module.go
index fe9b18a945..a9f4a4fc7e 100644
--- a/x/ccv/consumer/module.go
+++ b/x/ccv/consumer/module.go
@@ -22,6 +22,7 @@ import (
 	"github.com/cosmos/interchain-security/v3/x/ccv/consumer/client/cli"
 	"github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
 	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
+	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 var (
@@ -51,12 +52,12 @@ func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry)
 // DefaultGenesis returns default genesis state as raw bytes for the ibc
 // consumer module.
 func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage {
-	return cdc.MustMarshalJSON(consumertypes.DefaultGenesisState())
+	return cdc.MustMarshalJSON(ccvtypes.DefaultGenesisState())
 }
 
 // ValidateGenesis performs genesis state validation for the ibc consumer module.
 func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncodingConfig, bz json.RawMessage) error {
-	var data consumertypes.GenesisState
+	var data ccvtypes.GenesisState
 	if err := cdc.UnmarshalJSON(bz, &data); err != nil {
 		return fmt.Errorf("failed to unmarshal %s genesis state: %w", consumertypes.ModuleName, err)
 	}
@@ -111,7 +112,7 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 // InitGenesis performs genesis initialization for the consumer module. It returns
 // no validator updates.
 func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) []abci.ValidatorUpdate {
-	var genesisState consumertypes.GenesisState
+	var genesisState ccvtypes.GenesisState
 	cdc.MustUnmarshalJSON(data, &genesisState)
 	return am.keeper.InitGenesis(ctx, &genesisState)
 }
diff --git a/x/ccv/consumer/types/genesis_test.go b/x/ccv/consumer/types/genesis_test.go
index 2f4b2fa504..d75a01610b 100644
--- a/x/ccv/consumer/types/genesis_test.go
+++ b/x/ccv/consumer/types/genesis_test.go
@@ -16,8 +16,7 @@ import (
 	tmtypes "github.com/cometbft/cometbft/types"
 
 	"github.com/cosmos/interchain-security/v3/testutil/crypto"
-	"github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
-	ccv "github.com/cosmos/interchain-security/v3/x/ccv/types"
+	types "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 const (
@@ -96,7 +95,7 @@ func TestValidateInitialGenesisState(t *testing.T) {
 				valUpdates,
 				nil,
 				nil,
-				ccv.ConsumerPacketDataList{},
+				types.ConsumerPacketDataList{},
 				types.LastTransmissionBlockHeight{},
 				false,
 			},
@@ -115,7 +114,7 @@ func TestValidateInitialGenesisState(t *testing.T) {
 				valUpdates,
 				nil,
 				nil,
-				ccv.ConsumerPacketDataList{},
+				types.ConsumerPacketDataList{},
 				types.LastTransmissionBlockHeight{},
 				false,
 			},
@@ -134,7 +133,7 @@ func TestValidateInitialGenesisState(t *testing.T) {
 				valUpdates,
 				nil,
 				nil,
-				ccv.ConsumerPacketDataList{},
+				types.ConsumerPacketDataList{},
 				types.LastTransmissionBlockHeight{},
 				false,
 			},
@@ -153,7 +152,7 @@ func TestValidateInitialGenesisState(t *testing.T) {
 				valUpdates,
 				nil,
 				nil,
-				ccv.ConsumerPacketDataList{},
+				types.ConsumerPacketDataList{},
 				types.LastTransmissionBlockHeight{Height: 1},
 				false,
 			},
@@ -172,7 +171,7 @@ func TestValidateInitialGenesisState(t *testing.T) {
 				valUpdates,
 				nil,
 				nil,
-				ccv.ConsumerPacketDataList{List: []ccv.ConsumerPacketData{{}}},
+				types.ConsumerPacketDataList{List: []types.ConsumerPacketData{{}}},
 				types.LastTransmissionBlockHeight{},
 				false,
 			},
@@ -234,7 +233,7 @@ func TestValidateInitialGenesisState(t *testing.T) {
 					types.DefaultBlocksPerDistributionTransmission,
 					"badchannel/",
 					"",
-					ccv.DefaultCCVTimeoutPeriod,
+					types.DefaultCCVTimeoutPeriod,
 					types.DefaultTransferTimeoutPeriod,
 					types.DefaultConsumerRedistributeFrac,
 					types.DefaultHistoricalEntries,
@@ -270,17 +269,17 @@ func TestValidateRestartGenesisState(t *testing.T) {
 	valHash := valSet.Hash()
 	valUpdates := tmtypes.TM2PB.ValidatorUpdates(valSet)
 
-	matConsumerPacket := ccv.ConsumerPacketData{
-		Type: ccv.VscMaturedPacket,
-		Data: &ccv.ConsumerPacketData_VscMaturedPacketData{
-			VscMaturedPacketData: ccv.NewVSCMaturedPacketData(1),
+	matConsumerPacket := types.ConsumerPacketData{
+		Type: types.VscMaturedPacket,
+		Data: &types.ConsumerPacketData_VscMaturedPacketData{
+			VscMaturedPacketData: types.NewVSCMaturedPacketData(1),
 		},
 	}
 
-	slashConsumerPacket := ccv.ConsumerPacketData{
-		Type: ccv.SlashPacket,
-		Data: &ccv.ConsumerPacketData_SlashPacketData{
-			SlashPacketData: ccv.NewSlashPacketData(
+	slashConsumerPacket := types.ConsumerPacketData{
+		Type: types.SlashPacket,
+		Data: &types.ConsumerPacketData_SlashPacketData{
+			SlashPacketData: types.NewSlashPacketData(
 				abci.Validator{Address: pubKey.Address(), Power: int64(1)},
 				1,
 				stakingtypes.Infraction_INFRACTION_DOWNTIME),
@@ -306,14 +305,14 @@ func TestValidateRestartGenesisState(t *testing.T) {
 		{
 			"valid restart consumer genesis state: empty maturing packets",
 			types.NewRestartGenesisState("ccvclient", "ccvchannel", nil, valUpdates, heightToValsetUpdateID,
-				ccv.ConsumerPacketDataList{List: []ccv.ConsumerPacketData{matConsumerPacket, slashConsumerPacket}},
+				types.ConsumerPacketDataList{List: []types.ConsumerPacketData{matConsumerPacket, slashConsumerPacket}},
 				nil, types.LastTransmissionBlockHeight{Height: 100}, params),
 			false,
 		},
 		{
 			"valid restart consumer genesis state: handshake in progress ",
 			types.NewRestartGenesisState("ccvclient", "", nil, valUpdates, heightToValsetUpdateID,
-				ccv.ConsumerPacketDataList{List: []ccv.ConsumerPacketData{slashConsumerPacket}}, nil, types.LastTransmissionBlockHeight{}, params),
+				types.ConsumerPacketDataList{List: []types.ConsumerPacketData{slashConsumerPacket}}, nil, types.LastTransmissionBlockHeight{}, params),
 			false,
 		},
 		{
@@ -322,28 +321,28 @@ func TestValidateRestartGenesisState(t *testing.T) {
 				{1, time.Now().UTC()},
 				{3, time.Now().UTC()},
 				{5, time.Now().UTC()},
-			}, valUpdates, heightToValsetUpdateID, ccv.ConsumerPacketDataList{},
+			}, valUpdates, heightToValsetUpdateID, types.ConsumerPacketDataList{},
 				[]types.OutstandingDowntime{{ValidatorConsensusAddress: sdk.ConsAddress(validator.Address.Bytes()).String()}},
 				types.LastTransmissionBlockHeight{}, params),
 			false,
 		},
 		{
 			"invalid restart consumer genesis state: provider id is empty",
-			types.NewRestartGenesisState("", "ccvchannel", nil, valUpdates, heightToValsetUpdateID, ccv.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
+			types.NewRestartGenesisState("", "ccvchannel", nil, valUpdates, heightToValsetUpdateID, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
 		{
 			"invalid restart consumer genesis state: maturing packet vscId is invalid",
 			types.NewRestartGenesisState("ccvclient", "ccvchannel", []types.MaturingVSCPacket{
 				{0, time.Now().UTC()},
-			}, valUpdates, nil, ccv.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
+			}, valUpdates, nil, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
 		{
 			"invalid restart consumer genesis state: maturing packet time is invalid",
 			types.NewRestartGenesisState("ccvclient", "ccvchannel", []types.MaturingVSCPacket{
 				{1, time.Time{}},
-			}, valUpdates, nil, ccv.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
+			}, valUpdates, nil, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
 		{
@@ -359,7 +358,7 @@ func TestValidateRestartGenesisState(t *testing.T) {
 				valUpdates,
 				nil,
 				nil,
-				ccv.ConsumerPacketDataList{},
+				types.ConsumerPacketDataList{},
 				types.LastTransmissionBlockHeight{},
 				false,
 			},
@@ -378,7 +377,7 @@ func TestValidateRestartGenesisState(t *testing.T) {
 				valUpdates,
 				nil,
 				nil,
-				ccv.ConsumerPacketDataList{},
+				types.ConsumerPacketDataList{},
 				types.LastTransmissionBlockHeight{},
 				false,
 			},
@@ -386,42 +385,42 @@ func TestValidateRestartGenesisState(t *testing.T) {
 		},
 		{
 			"invalid restart consumer genesis state: nil initial validator set",
-			types.NewRestartGenesisState("ccvclient", "ccvchannel", nil, nil, nil, ccv.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
+			types.NewRestartGenesisState("ccvclient", "ccvchannel", nil, nil, nil, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
 		{
 			"invalid restart consumer genesis state: nil height to validator set id mapping",
 			types.NewRestartGenesisState("ccvclient", "",
-				[]types.MaturingVSCPacket{{1, time.Time{}}}, valUpdates, nil, ccv.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
+				[]types.MaturingVSCPacket{{1, time.Time{}}}, valUpdates, nil, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
 		{
 			"invalid restart consumer genesis state: maturing packet defined when handshake is still in progress",
 			types.NewRestartGenesisState("ccvclient", "",
-				[]types.MaturingVSCPacket{{1, time.Time{}}}, valUpdates, heightToValsetUpdateID, ccv.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
+				[]types.MaturingVSCPacket{{1, time.Time{}}}, valUpdates, heightToValsetUpdateID, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
 		{
 			"invalid restart consumer genesis state: outstanding downtime defined when handshake is still in progress",
 			types.NewRestartGenesisState("ccvclient", "",
-				nil, valUpdates, heightToValsetUpdateID, ccv.ConsumerPacketDataList{}, []types.OutstandingDowntime{{ValidatorConsensusAddress: "cosmosvalconsxxx"}},
+				nil, valUpdates, heightToValsetUpdateID, types.ConsumerPacketDataList{}, []types.OutstandingDowntime{{ValidatorConsensusAddress: "cosmosvalconsxxx"}},
 				types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
 		{
 			"invalid restart consumer genesis state: last transmission block height defined when handshake is still in progress",
 			types.NewRestartGenesisState("ccvclient", "",
-				nil, valUpdates, heightToValsetUpdateID, ccv.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{Height: int64(1)}, params),
+				nil, valUpdates, heightToValsetUpdateID, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{Height: int64(1)}, params),
 			true,
 		},
 		{
 			"invalid restart consumer genesis state: pending maturing packets defined when handshake is still in progress",
 			types.NewRestartGenesisState("ccvclient", "",
-				nil, valUpdates, heightToValsetUpdateID, ccv.ConsumerPacketDataList{
-					List: []ccv.ConsumerPacketData{
+				nil, valUpdates, heightToValsetUpdateID, types.ConsumerPacketDataList{
+					List: []types.ConsumerPacketData{
 						{
-							Type: ccv.VscMaturedPacket,
-							Data: &ccv.ConsumerPacketData_VscMaturedPacketData{VscMaturedPacketData: ccv.NewVSCMaturedPacketData(1)},
+							Type: types.VscMaturedPacket,
+							Data: &types.ConsumerPacketData_VscMaturedPacketData{VscMaturedPacketData: types.NewVSCMaturedPacketData(1)},
 						},
 					},
 				}, nil, types.LastTransmissionBlockHeight{Height: int64(1)}, params),
@@ -429,7 +428,7 @@ func TestValidateRestartGenesisState(t *testing.T) {
 		},
 		{
 			"invalid restart consumer genesis state: invalid params",
-			types.NewRestartGenesisState("ccvclient", "ccvchannel", nil, valUpdates, nil, ccv.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{},
+			types.NewRestartGenesisState("ccvclient", "ccvchannel", nil, valUpdates, nil, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{},
 				types.NewParams(
 					true,
 					types.DefaultBlocksPerDistributionTransmission,
diff --git a/x/ccv/consumer/types/params_test.go b/x/ccv/consumer/types/params_test.go
index 531f7e39f2..1690fc9f81 100644
--- a/x/ccv/consumer/types/params_test.go
+++ b/x/ccv/consumer/types/params_test.go
@@ -6,76 +6,76 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
+	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 // Tests the validation of consumer params that happens at genesis
 func TestValidateParams(t *testing.T) {
 	testCases := []struct {
 		name    string
-		params  consumertypes.Params
+		params  ccvtypes.Params
 		expPass bool
 	}{
-		{"default params", consumertypes.DefaultParams(), true},
+		{"default params", ccvtypes.DefaultParams(), true},
 		{
 			"custom valid params",
-			consumertypes.NewParams(true, 5, "", "", 1004, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), true,
+			ccvtypes.NewParams(true, 5, "", "", 1004, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), true,
 		},
 		{
 			"custom invalid params, block per dist transmission",
-			consumertypes.NewParams(true, -5, "", "", 5, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
+			ccvtypes.NewParams(true, -5, "", "", 5, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
 		},
 		{
 			"custom invalid params, dist transmission channel",
-			consumertypes.NewParams(true, 5, "badchannel/", "", 5, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
+			ccvtypes.NewParams(true, 5, "badchannel/", "", 5, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
 		},
 		{
 			"custom invalid params, provider fee pool addr string",
-			consumertypes.NewParams(true, 5, "", "imabadaddress", 5, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
+			ccvtypes.NewParams(true, 5, "", "imabadaddress", 5, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
 		},
 		{
 			"custom invalid params, ccv timeout",
-			consumertypes.NewParams(true, 5, "", "", -5, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
+			ccvtypes.NewParams(true, 5, "", "", -5, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
 		},
 		{
 			"custom invalid params, transfer timeout",
-			consumertypes.NewParams(true, 5, "", "", 1004, -7, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
+			ccvtypes.NewParams(true, 5, "", "", 1004, -7, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
 		},
 		{
 			"custom invalid params, consumer redist fraction is negative",
-			consumertypes.NewParams(true, 5, "", "", 5, 1005, "-0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
+			ccvtypes.NewParams(true, 5, "", "", 5, 1005, "-0.5", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
 		},
 		{
 			"custom invalid params, consumer redist fraction is over 1",
-			consumertypes.NewParams(true, 5, "", "", 5, 1005, "1.2", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
+			ccvtypes.NewParams(true, 5, "", "", 5, 1005, "1.2", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
 		},
 		{
 			"custom invalid params, bad consumer redist fraction ",
-			consumertypes.NewParams(true, 5, "", "", 5, 1005, "notFrac", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
+			ccvtypes.NewParams(true, 5, "", "", 5, 1005, "notFrac", 1000, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
 		},
 		{
 			"custom invalid params, negative num historical entries",
-			consumertypes.NewParams(true, 5, "", "", 5, 1005, "0.5", -100, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
+			ccvtypes.NewParams(true, 5, "", "", 5, 1005, "0.5", -100, 24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
 		},
 		{
 			"custom invalid params, negative unbonding period",
-			consumertypes.NewParams(true, 5, "", "", 5, 1005, "0.5", 1000, -24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
+			ccvtypes.NewParams(true, 5, "", "", 5, 1005, "0.5", 1000, -24*21*time.Hour, "0.05", []string{"untrn"}, []string{"uatom"}), false,
 		},
 		{
 			"custom invalid params, invalid soft opt out threshold",
-			consumertypes.NewParams(true, 5, "", "", 5, 1005, "0.5", 1000, 24*21*time.Hour, "-0.05", []string{"u"}, []string{}), false,
+			ccvtypes.NewParams(true, 5, "", "", 5, 1005, "0.5", 1000, 24*21*time.Hour, "-0.05", []string{"u"}, []string{}), false,
 		},
 		{
 			"custom invalid params, invalid soft opt out threshold",
-			consumertypes.NewParams(true, 5, "", "", 5, 1005, "0.5", 1000, 24*21*time.Hour, "0.5", []string{"u"}, []string{}), false,
+			ccvtypes.NewParams(true, 5, "", "", 5, 1005, "0.5", 1000, 24*21*time.Hour, "0.5", []string{"u"}, []string{}), false,
 		},
 		{
 			"custom invalid params, invalid reward denom",
-			consumertypes.NewParams(true, 5, "", "", 5, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"u"}, []string{}), false,
+			ccvtypes.NewParams(true, 5, "", "", 5, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{"u"}, []string{}), false,
 		},
 		{
 			"custom invalid params, invalid provider reward denom",
-			consumertypes.NewParams(true, 5, "", "", 5, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{}, []string{"a"}), false,
+			ccvtypes.NewParams(true, 5, "", "", 5, 1005, "0.5", 1000, 24*21*time.Hour, "0.05", []string{}, []string{"a"}), false,
 		},
 	}
 
diff --git a/x/ccv/provider/ibc_module.go b/x/ccv/provider/ibc_module.go
index efe113f895..a19fd7e5bb 100644
--- a/x/ccv/provider/ibc_module.go
+++ b/x/ccv/provider/ibc_module.go
@@ -83,7 +83,7 @@ func (am AppModule) OnChanOpenTry(
 		return "", err
 	}
 
-	md := providertypes.HandshakeMetadata{
+	md := ccv.HandshakeMetadata{
 		// NOTE that the fee pool collector address string provided to the
 		// the consumer chain must be excluded from the blocked addresses
 		// blacklist or all all ibc-transfers from the consumer chain to the
diff --git a/x/ccv/provider/ibc_module_test.go b/x/ccv/provider/ibc_module_test.go
index 8b7c3f985c..571bed0471 100644
--- a/x/ccv/provider/ibc_module_test.go
+++ b/x/ccv/provider/ibc_module_test.go
@@ -168,7 +168,7 @@ func TestOnChanOpenTry(t *testing.T) {
 
 		if tc.expPass {
 			require.NoError(t, err)
-			md := &providertypes.HandshakeMetadata{}
+			md := &ccv.HandshakeMetadata{}
 			err = md.Unmarshal([]byte(metadata))
 			require.NoError(t, err)
 			require.Equal(t, moduleAcct.BaseAccount.Address, md.ProviderFeePoolAddr,
diff --git a/x/ccv/provider/keeper/genesis.go b/x/ccv/provider/keeper/genesis.go
index f201e6de50..e86035170c 100644
--- a/x/ccv/provider/keeper/genesis.go
+++ b/x/ccv/provider/keeper/genesis.go
@@ -158,7 +158,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 		k.GetAllValsetUpdateBlockHeights(ctx),
 		consumerStates,
 		k.GetAllUnbondingOps(ctx),
-		&ccv.MaturedUnbondingOps{Ids: k.GetMaturedUnbondingOps(ctx)},
+		&types.MaturedUnbondingOps{Ids: k.GetMaturedUnbondingOps(ctx)},
 		k.GetAllPendingConsumerAdditionProps(ctx),
 		k.GetAllPendingConsumerRemovalProps(ctx),
 		params,
diff --git a/x/ccv/provider/keeper/genesis_test.go b/x/ccv/provider/keeper/genesis_test.go
index 01a3845651..8b101a1ce9 100644
--- a/x/ccv/provider/keeper/genesis_test.go
+++ b/x/ccv/provider/keeper/genesis_test.go
@@ -13,7 +13,6 @@ import (
 
 	"github.com/cosmos/interchain-security/v3/testutil/crypto"
 	testkeeper "github.com/cosmos/interchain-security/v3/testutil/keeper"
-	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	"github.com/cosmos/interchain-security/v3/x/ccv/provider/keeper"
 	providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
 	ccv "github.com/cosmos/interchain-security/v3/x/ccv/types"
@@ -72,7 +71,7 @@ func TestInitAndExportGenesis(t *testing.T) {
 				expClientID,
 				"channel",
 				initHeight,
-				*consumertypes.DefaultGenesisState(),
+				*ccv.DefaultGenesisState(),
 				[]providertypes.VscUnbondingOps{
 					{VscId: vscID, UnbondingOpIds: ubdIndex},
 				},
@@ -84,7 +83,7 @@ func TestInitAndExportGenesis(t *testing.T) {
 				expClientID,
 				"",
 				0,
-				*consumertypes.DefaultGenesisState(),
+				*ccv.DefaultGenesisState(),
 				nil,
 				[]ccv.ValidatorSetChangePacketData{{ValsetUpdateId: vscID}},
 				nil,
@@ -94,7 +93,7 @@ func TestInitAndExportGenesis(t *testing.T) {
 			Id:                      vscID,
 			UnbondingConsumerChains: []string{cChainIDs[0]},
 		}},
-		&ccv.MaturedUnbondingOps{Ids: ubdIndex},
+		&providertypes.MaturedUnbondingOps{Ids: ubdIndex},
 		[]providertypes.ConsumerAdditionProposal{{
 			ChainId:   cChainIDs[0],
 			SpawnTime: oneHourFromNow,
@@ -219,7 +218,7 @@ func assertConsumerChainStates(t *testing.T, ctx sdk.Context, pk keeper.Keeper,
 		chainID := cs.ChainId
 		gen, found := pk.GetConsumerGenesis(ctx, chainID)
 		require.True(t, found)
-		require.Equal(t, *consumertypes.DefaultGenesisState(), gen)
+		require.Equal(t, *ccv.DefaultGenesisState(), gen)
 
 		clientID, found := pk.GetConsumerClientId(ctx, chainID)
 		require.True(t, found)
diff --git a/x/ccv/provider/keeper/keeper.go b/x/ccv/provider/keeper/keeper.go
index 73785f1c17..b7fa7a00ff 100644
--- a/x/ccv/provider/keeper/keeper.go
+++ b/x/ccv/provider/keeper/keeper.go
@@ -25,6 +25,7 @@ import (
 
 	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	"github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
+	providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
 	ccv "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
@@ -251,7 +252,7 @@ func (k Keeper) GetAllChannelToChains(ctx sdk.Context) (channels []types.Channel
 	return channels
 }
 
-func (k Keeper) SetConsumerGenesis(ctx sdk.Context, chainID string, gen consumertypes.GenesisState) error {
+func (k Keeper) SetConsumerGenesis(ctx sdk.Context, chainID string, gen ccv.GenesisState) error {
 	store := ctx.KVStore(k.storeKey)
 	bz, err := gen.Marshal()
 	if err != nil {
@@ -262,14 +263,14 @@ func (k Keeper) SetConsumerGenesis(ctx sdk.Context, chainID string, gen consumer
 	return nil
 }
 
-func (k Keeper) GetConsumerGenesis(ctx sdk.Context, chainID string) (consumertypes.GenesisState, bool) {
+func (k Keeper) GetConsumerGenesis(ctx sdk.Context, chainID string) (ccv.GenesisState, bool) {
 	store := ctx.KVStore(k.storeKey)
 	bz := store.Get(types.ConsumerGenesisKey(chainID))
 	if bz == nil {
-		return consumertypes.GenesisState{}, false
+		return ccv.GenesisState{}, false
 	}
 
-	var data consumertypes.GenesisState
+	var data ccv.GenesisState
 	if err := data.Unmarshal(bz); err != nil {
 		// An error here would indicate something is very wrong,
 		// the ConsumerGenesis is assumed to be correctly serialized in SetConsumerGenesis.
@@ -575,7 +576,7 @@ func (k Keeper) GetMaturedUnbondingOps(ctx sdk.Context) (ids []uint64) {
 		return nil
 	}
 
-	var ops ccv.MaturedUnbondingOps
+	var ops providertypes.MaturedUnbondingOps
 	if err := ops.Unmarshal(bz); err != nil {
 		// An error here would indicate something is very wrong,
 		// the MaturedUnbondingOps are assumed to be correctly serialized in AppendMaturedUnbondingOps.
@@ -590,7 +591,7 @@ func (k Keeper) AppendMaturedUnbondingOps(ctx sdk.Context, ids []uint64) {
 		return
 	}
 	existingIds := k.GetMaturedUnbondingOps(ctx)
-	maturedOps := ccv.MaturedUnbondingOps{
+	maturedOps := providertypes.MaturedUnbondingOps{
 		Ids: append(existingIds, ids...),
 	}
 
@@ -814,7 +815,7 @@ func (k Keeper) DeleteInitChainHeight(ctx sdk.Context, chainID string) {
 
 // GetPendingVSCPackets returns the list of pending ValidatorSetChange packets stored under chain ID
 func (k Keeper) GetPendingVSCPackets(ctx sdk.Context, chainID string) []ccv.ValidatorSetChangePacketData {
-	var packets ccv.ValidatorSetChangePackets
+	var packets providertypes.ValidatorSetChangePackets
 
 	store := ctx.KVStore(k.storeKey)
 	bz := store.Get(types.PendingVSCsKey(chainID))
@@ -835,7 +836,7 @@ func (k Keeper) AppendPendingVSCPackets(ctx sdk.Context, chainID string, newPack
 	pds := append(k.GetPendingVSCPackets(ctx, chainID), newPackets...)
 
 	store := ctx.KVStore(k.storeKey)
-	packets := ccv.ValidatorSetChangePackets{List: pds}
+	packets := providertypes.ValidatorSetChangePackets{List: pds}
 	buf, err := packets.Marshal()
 	if err != nil {
 		// An error here would indicate something is very wrong,
diff --git a/x/ccv/provider/keeper/proposal.go b/x/ccv/provider/keeper/proposal.go
index 11909ad685..7e4eb557f7 100644
--- a/x/ccv/provider/keeper/proposal.go
+++ b/x/ccv/provider/keeper/proposal.go
@@ -19,7 +19,6 @@ import (
 	abci "github.com/cometbft/cometbft/abci/types"
 	tmtypes "github.com/cometbft/cometbft/types"
 
-	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	"github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
 	ccv "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
@@ -239,7 +238,7 @@ func (k Keeper) StopConsumerChain(ctx sdk.Context, chainID string, closeChan boo
 func (k Keeper) MakeConsumerGenesis(
 	ctx sdk.Context,
 	prop *types.ConsumerAdditionProposal,
-) (gen consumertypes.GenesisState, nextValidatorsHash []byte, err error) {
+) (gen ccv.GenesisState, nextValidatorsHash []byte, err error) {
 	chainID := prop.ChainId
 	providerUnbondingPeriod := k.stakingKeeper.UnbondingTime(ctx)
 	height := clienttypes.GetSelfHeight(ctx)
@@ -302,7 +301,7 @@ func (k Keeper) MakeConsumerGenesis(
 	}
 	hash := tmtypes.NewValidatorSet(updatesAsValSet).Hash()
 
-	consumerGenesisParams := consumertypes.NewParams(
+	consumerGenesisParams := ccv.NewParams(
 		true,
 		prop.BlocksPerDistributionTransmission,
 		prop.DistributionTransmissionChannel,
@@ -317,7 +316,7 @@ func (k Keeper) MakeConsumerGenesis(
 		[]string{},
 	)
 
-	gen = *consumertypes.NewInitialGenesisState(
+	gen = *ccv.NewInitialGenesisState(
 		clientState,
 		consState.(*ibctmtypes.ConsensusState),
 		initialUpdatesWithConsumerKeys,
diff --git a/x/ccv/provider/keeper/proposal_test.go b/x/ccv/provider/keeper/proposal_test.go
index c84369e815..7cdcfcee43 100644
--- a/x/ccv/provider/keeper/proposal_test.go
+++ b/x/ccv/provider/keeper/proposal_test.go
@@ -20,7 +20,6 @@ import (
 
 	cryptoutil "github.com/cosmos/interchain-security/v3/testutil/crypto"
 	testkeeper "github.com/cosmos/interchain-security/v3/testutil/keeper"
-	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	providerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/provider/keeper"
 	providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
 	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
@@ -935,7 +934,7 @@ func TestMakeConsumerGenesis(t *testing.T) {
 		]
 	}`
 
-	var expectedGenesis consumertypes.GenesisState
+	var expectedGenesis ccvtypes.GenesisState
 	err = json.Unmarshal([]byte(jsonString), &expectedGenesis) // ignores tabs, newlines and spaces
 	require.NoError(t, err)
 
diff --git a/x/ccv/provider/types/consumer.go b/x/ccv/provider/types/consumer.go
index 1a13123e88..b9eefc3b45 100644
--- a/x/ccv/provider/types/consumer.go
+++ b/x/ccv/provider/types/consumer.go
@@ -1,7 +1,6 @@
 package types
 
 import (
-	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	ccv "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
@@ -10,7 +9,7 @@ func NewConsumerStates(
 	clientID,
 	channelID string,
 	initialHeight uint64,
-	genesis consumertypes.GenesisState,
+	genesis ccv.GenesisState,
 	unbondingOpsIndexes []VscUnbondingOps,
 	pendingValsetChanges []ccv.ValidatorSetChangePacketData,
 	slashDowntimeAck []string,
diff --git a/x/ccv/provider/types/genesis.go b/x/ccv/provider/types/genesis.go
index 2118f3143e..4718de40c1 100644
--- a/x/ccv/provider/types/genesis.go
+++ b/x/ccv/provider/types/genesis.go
@@ -17,7 +17,7 @@ func NewGenesisState(
 	vscIdToHeights []ValsetUpdateIdToHeight,
 	consumerStates []ConsumerState,
 	unbondingOps []UnbondingOp,
-	matureUbdOps *ccv.MaturedUnbondingOps,
+	matureUbdOps *MaturedUnbondingOps,
 	additionProposals []ConsumerAdditionProposal,
 	removalProposals []ConsumerRemovalProposal,
 	params Params,
diff --git a/x/ccv/provider/types/genesis_test.go b/x/ccv/provider/types/genesis_test.go
index c4b5002f07..aba1a72e0e 100644
--- a/x/ccv/provider/types/genesis_test.go
+++ b/x/ccv/provider/types/genesis_test.go
@@ -15,7 +15,6 @@ import (
 	tmtypes "github.com/cometbft/cometbft/types"
 
 	"github.com/cosmos/interchain-security/v3/testutil/crypto"
-	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	"github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
 	ccv "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
@@ -453,7 +452,7 @@ func TestValidateGenesisState(t *testing.T) {
 				nil,
 				[]types.ConsumerState{{
 					ChainId: "chainid", ChannelId: "channel-0", ClientId: "client-id",
-					ConsumerGenesis: consumertypes.GenesisState{},
+					ConsumerGenesis: ccv.GenesisState{},
 				}},
 				nil,
 				nil,
@@ -758,7 +757,7 @@ func TestValidateGenesisState(t *testing.T) {
 	}
 }
 
-func getInitialConsumerGenesis(t *testing.T, chainID string) consumertypes.GenesisState {
+func getInitialConsumerGenesis(t *testing.T, chainID string) ccv.GenesisState {
 	t.Helper()
 	// generate validator public key
 	cId := crypto.NewCryptoIdentityFromIntSeed(239668)
@@ -781,7 +780,7 @@ func getInitialConsumerGenesis(t *testing.T, chainID string) consumertypes.Genes
 		[]string{"upgrade", "upgradedIBCState"})
 	consensusState := ibctmtypes.NewConsensusState(time.Now(), commitmenttypes.NewMerkleRoot([]byte("apphash")), valHash)
 
-	params := consumertypes.DefaultParams()
+	params := ccv.DefaultParams()
 	params.Enabled = true
-	return *consumertypes.NewInitialGenesisState(cs, consensusState, valUpdates, params)
+	return *ccv.NewInitialGenesisState(cs, consensusState, valUpdates, params)
 }
diff --git a/x/ccv/provider/types/params.go b/x/ccv/provider/types/params.go
index 515d8954ec..afb46694a3 100644
--- a/x/ccv/provider/types/params.go
+++ b/x/ccv/provider/types/params.go
@@ -11,7 +11,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
-	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
@@ -178,13 +177,13 @@ func ValidateTemplateClient(i interface{}) error {
 	// populate zeroed fields with valid fields
 	copiedClient.ChainId = "chainid"
 
-	trustPeriod, err := ccvtypes.CalculateTrustPeriod(consumertypes.DefaultConsumerUnbondingPeriod, DefaultTrustingPeriodFraction)
+	trustPeriod, err := ccvtypes.CalculateTrustPeriod(ccvtypes.DefaultConsumerUnbondingPeriod, DefaultTrustingPeriodFraction)
 	if err != nil {
 		return fmt.Errorf("invalid TrustPeriodFraction: %T", err)
 	}
 	copiedClient.TrustingPeriod = trustPeriod
 
-	copiedClient.UnbondingPeriod = consumertypes.DefaultConsumerUnbondingPeriod
+	copiedClient.UnbondingPeriod = ccvtypes.DefaultConsumerUnbondingPeriod
 	copiedClient.LatestHeight = clienttypes.NewHeight(0, 1)
 
 	if err := copiedClient.Validate(); err != nil {
diff --git a/x/ccv/consumer/types/genesis.go b/x/ccv/types/genesis.go
similarity index 67%
rename from x/ccv/consumer/types/genesis.go
rename to x/ccv/types/genesis.go
index 3a8769939b..ff18480ecb 100644
--- a/x/ccv/consumer/types/genesis.go
+++ b/x/ccv/types/genesis.go
@@ -6,8 +6,6 @@ import (
 	errorsmod "cosmossdk.io/errors"
 
 	abci "github.com/cometbft/cometbft/abci/types"
-
-	ccv "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 // NewInitialGenesisState returns a consumer GenesisState for a completely new consumer chain.
@@ -29,7 +27,7 @@ func NewRestartGenesisState(
 	maturingPackets []MaturingVSCPacket,
 	initValSet []abci.ValidatorUpdate,
 	heightToValsetUpdateIDs []HeightToValsetUpdateID,
-	pendingConsumerPackets ccv.ConsumerPacketDataList,
+	pendingConsumerPackets ConsumerPacketDataList,
 	outstandingDowntimes []OutstandingDowntime,
 	lastTransBlockHeight LastTransmissionBlockHeight,
 	params Params,
@@ -78,7 +76,7 @@ func (gs GenesisState) Validate() error {
 		return nil
 	}
 	if len(gs.InitialValSet) == 0 {
-		return errorsmod.Wrap(ccv.ErrInvalidGenesis, "initial validator set is empty")
+		return errorsmod.Wrap(ErrInvalidGenesis, "initial validator set is empty")
 	}
 	if err := gs.Params.Validate(); err != nil {
 		return err
@@ -86,68 +84,68 @@ func (gs GenesisState) Validate() error {
 
 	if gs.NewChain {
 		if gs.ProviderClientState == nil {
-			return errorsmod.Wrap(ccv.ErrInvalidGenesis, "provider client state cannot be nil for new chain")
+			return errorsmod.Wrap(ErrInvalidGenesis, "provider client state cannot be nil for new chain")
 		}
 		if err := gs.ProviderClientState.Validate(); err != nil {
-			return errorsmod.Wrapf(ccv.ErrInvalidGenesis, "provider client state invalid for new chain %s", err.Error())
+			return errorsmod.Wrapf(ErrInvalidGenesis, "provider client state invalid for new chain %s", err.Error())
 		}
 		if gs.ProviderConsensusState == nil {
-			return errorsmod.Wrap(ccv.ErrInvalidGenesis, "provider consensus state cannot be nil for new chain")
+			return errorsmod.Wrap(ErrInvalidGenesis, "provider consensus state cannot be nil for new chain")
 		}
 		if err := gs.ProviderConsensusState.ValidateBasic(); err != nil {
-			return errorsmod.Wrapf(ccv.ErrInvalidGenesis, "provider consensus state invalid for new chain %s", err.Error())
+			return errorsmod.Wrapf(ErrInvalidGenesis, "provider consensus state invalid for new chain %s", err.Error())
 		}
 		if gs.ProviderClientId != "" {
-			return errorsmod.Wrap(ccv.ErrInvalidGenesis, "provider client id cannot be set for new chain. It must be established on handshake")
+			return errorsmod.Wrap(ErrInvalidGenesis, "provider client id cannot be set for new chain. It must be established on handshake")
 		}
 		if gs.ProviderChannelId != "" {
-			return errorsmod.Wrap(ccv.ErrInvalidGenesis, "provider channel id cannot be set for new chain. It must be established on handshake")
+			return errorsmod.Wrap(ErrInvalidGenesis, "provider channel id cannot be set for new chain. It must be established on handshake")
 		}
 		if len(gs.MaturingPackets) != 0 {
-			return errorsmod.Wrap(ccv.ErrInvalidGenesis, "maturing packets must be empty for new chain")
+			return errorsmod.Wrap(ErrInvalidGenesis, "maturing packets must be empty for new chain")
 		}
 		if len(gs.PendingConsumerPackets.List) != 0 {
-			return errorsmod.Wrap(ccv.ErrInvalidGenesis, "pending consumer packets must be empty for new chain")
+			return errorsmod.Wrap(ErrInvalidGenesis, "pending consumer packets must be empty for new chain")
 		}
 		if gs.LastTransmissionBlockHeight.Height != 0 {
-			return errorsmod.Wrap(ccv.ErrInvalidGenesis, "last transmission block height must be empty for new chain")
+			return errorsmod.Wrap(ErrInvalidGenesis, "last transmission block height must be empty for new chain")
 		}
 	} else {
 		// NOTE: For restart genesis, we will verify initial validator set in InitGenesis.
 		if gs.ProviderClientId == "" {
-			return errorsmod.Wrap(ccv.ErrInvalidGenesis, "provider client id must be set for a restarting consumer genesis state")
+			return errorsmod.Wrap(ErrInvalidGenesis, "provider client id must be set for a restarting consumer genesis state")
 		}
 		// handshake is still in progress
 		handshakeInProgress := gs.ProviderChannelId == ""
 		if handshakeInProgress {
 			if len(gs.MaturingPackets) != 0 {
 				return errorsmod.Wrap(
-					ccv.ErrInvalidGenesis, "maturing packets must be empty when handshake isn't completed")
+					ErrInvalidGenesis, "maturing packets must be empty when handshake isn't completed")
 			}
 			if len(gs.OutstandingDowntimeSlashing) != 0 {
 				return errorsmod.Wrap(
-					ccv.ErrInvalidGenesis, "outstanding downtime must be empty when handshake isn't completed")
+					ErrInvalidGenesis, "outstanding downtime must be empty when handshake isn't completed")
 			}
 			if gs.LastTransmissionBlockHeight.Height != 0 {
 				return errorsmod.Wrap(
-					ccv.ErrInvalidGenesis, "last transmission block height must be zero when handshake isn't completed")
+					ErrInvalidGenesis, "last transmission block height must be zero when handshake isn't completed")
 			}
 			if len(gs.PendingConsumerPackets.List) != 0 {
 				for _, packet := range gs.PendingConsumerPackets.List {
-					if packet.Type == ccv.VscMaturedPacket {
-						return errorsmod.Wrap(ccv.ErrInvalidGenesis, "pending maturing packets must be empty when handshake isn't completed")
+					if packet.Type == VscMaturedPacket {
+						return errorsmod.Wrap(ErrInvalidGenesis, "pending maturing packets must be empty when handshake isn't completed")
 					}
 				}
 			}
 		}
 		if gs.HeightToValsetUpdateId == nil {
 			return errorsmod.Wrap(
-				ccv.ErrInvalidGenesis,
+				ErrInvalidGenesis,
 				"empty height to validator set update id mapping",
 			)
 		}
 		if gs.ProviderClientState != nil || gs.ProviderConsensusState != nil {
-			return errorsmod.Wrap(ccv.ErrInvalidGenesis, "provider client state and consensus state must be nil for a restarting genesis state")
+			return errorsmod.Wrap(ErrInvalidGenesis, "provider client state and consensus state must be nil for a restarting genesis state")
 		}
 		for _, mat := range gs.MaturingPackets {
 			if err := mat.Validate(); err != nil {
@@ -160,10 +158,10 @@ func (gs GenesisState) Validate() error {
 
 func (mat MaturingVSCPacket) Validate() error {
 	if mat.MaturityTime.IsZero() {
-		return errorsmod.Wrap(ccv.ErrInvalidVSCMaturedTime, "cannot have 0 maturity time")
+		return errorsmod.Wrap(ErrInvalidVSCMaturedTime, "cannot have 0 maturity time")
 	}
 	if mat.VscId == 0 {
-		return errorsmod.Wrap(ccv.ErrInvalidVSCMaturedId, "cannot have 0 maturity time")
+		return errorsmod.Wrap(ErrInvalidVSCMaturedId, "cannot have 0 maturity time")
 	}
 	return nil
 }
diff --git a/x/ccv/consumer/types/params.go b/x/ccv/types/params.go
similarity index 83%
rename from x/ccv/consumer/types/params.go
rename to x/ccv/types/params.go
index a9b4e61285..e8ea0a8765 100644
--- a/x/ccv/consumer/types/params.go
+++ b/x/ccv/types/params.go
@@ -7,8 +7,6 @@ import (
 	sdktypes "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-
-	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 const (
@@ -95,7 +93,7 @@ func DefaultParams() Params {
 		DefaultBlocksPerDistributionTransmission,
 		"",
 		"",
-		ccvtypes.DefaultCCVTimeoutPeriod,
+		DefaultCCVTimeoutPeriod,
 		DefaultTransferTimeoutPeriod,
 		DefaultConsumerRedistributeFrac,
 		DefaultHistoricalEntries,
@@ -108,31 +106,31 @@ func DefaultParams() Params {
 
 // Validate all ccv-consumer module parameters
 func (p Params) Validate() error {
-	if err := ccvtypes.ValidateBool(p.Enabled); err != nil {
+	if err := ValidateBool(p.Enabled); err != nil {
 		return err
 	}
-	if err := ccvtypes.ValidatePositiveInt64(p.BlocksPerDistributionTransmission); err != nil {
+	if err := ValidatePositiveInt64(p.BlocksPerDistributionTransmission); err != nil {
 		return err
 	}
-	if err := ccvtypes.ValidateDistributionTransmissionChannel(p.DistributionTransmissionChannel); err != nil {
+	if err := ValidateDistributionTransmissionChannel(p.DistributionTransmissionChannel); err != nil {
 		return err
 	}
 	if err := ValidateProviderFeePoolAddrStr(p.ProviderFeePoolAddrStr); err != nil {
 		return err
 	}
-	if err := ccvtypes.ValidateDuration(p.CcvTimeoutPeriod); err != nil {
+	if err := ValidateDuration(p.CcvTimeoutPeriod); err != nil {
 		return err
 	}
-	if err := ccvtypes.ValidateDuration(p.TransferTimeoutPeriod); err != nil {
+	if err := ValidateDuration(p.TransferTimeoutPeriod); err != nil {
 		return err
 	}
-	if err := ccvtypes.ValidateStringFraction(p.ConsumerRedistributionFraction); err != nil {
+	if err := ValidateStringFraction(p.ConsumerRedistributionFraction); err != nil {
 		return err
 	}
-	if err := ccvtypes.ValidatePositiveInt64(p.HistoricalEntries); err != nil {
+	if err := ValidatePositiveInt64(p.HistoricalEntries); err != nil {
 		return err
 	}
-	if err := ccvtypes.ValidateDuration(p.UnbondingPeriod); err != nil {
+	if err := ValidateDuration(p.UnbondingPeriod); err != nil {
 		return err
 	}
 	if err := ValidateSoftOptOutThreshold(p.SoftOptOutThreshold); err != nil {
@@ -150,23 +148,23 @@ func (p Params) Validate() error {
 // ParamSetPairs implements params.ParamSet
 func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
 	return paramtypes.ParamSetPairs{
-		paramtypes.NewParamSetPair(KeyEnabled, p.Enabled, ccvtypes.ValidateBool),
+		paramtypes.NewParamSetPair(KeyEnabled, p.Enabled, ValidateBool),
 		paramtypes.NewParamSetPair(KeyBlocksPerDistributionTransmission,
-			p.BlocksPerDistributionTransmission, ccvtypes.ValidatePositiveInt64),
+			p.BlocksPerDistributionTransmission, ValidatePositiveInt64),
 		paramtypes.NewParamSetPair(KeyDistributionTransmissionChannel,
-			p.DistributionTransmissionChannel, ccvtypes.ValidateDistributionTransmissionChannel),
+			p.DistributionTransmissionChannel, ValidateDistributionTransmissionChannel),
 		paramtypes.NewParamSetPair(KeyProviderFeePoolAddrStr,
 			p.ProviderFeePoolAddrStr, ValidateProviderFeePoolAddrStr),
-		paramtypes.NewParamSetPair(ccvtypes.KeyCCVTimeoutPeriod,
-			p.CcvTimeoutPeriod, ccvtypes.ValidateDuration),
+		paramtypes.NewParamSetPair(KeyCCVTimeoutPeriod,
+			p.CcvTimeoutPeriod, ValidateDuration),
 		paramtypes.NewParamSetPair(KeyTransferTimeoutPeriod,
-			p.TransferTimeoutPeriod, ccvtypes.ValidateDuration),
+			p.TransferTimeoutPeriod, ValidateDuration),
 		paramtypes.NewParamSetPair(KeyConsumerRedistributionFrac,
-			p.ConsumerRedistributionFraction, ccvtypes.ValidateStringFraction),
+			p.ConsumerRedistributionFraction, ValidateStringFraction),
 		paramtypes.NewParamSetPair(KeyHistoricalEntries,
-			p.HistoricalEntries, ccvtypes.ValidatePositiveInt64),
+			p.HistoricalEntries, ValidatePositiveInt64),
 		paramtypes.NewParamSetPair(KeyConsumerUnbondingPeriod,
-			p.UnbondingPeriod, ccvtypes.ValidateDuration),
+			p.UnbondingPeriod, ValidateDuration),
 		paramtypes.NewParamSetPair(KeySoftOptOutThreshold,
 			p.SoftOptOutThreshold, ValidateSoftOptOutThreshold),
 		paramtypes.NewParamSetPair(KeyRewardDenoms,
@@ -182,7 +180,7 @@ func ValidateProviderFeePoolAddrStr(i interface{}) error {
 		return nil
 	}
 	// Otherwise validate as usual for a bech32 address
-	return ccvtypes.ValidateBech32(i)
+	return ValidateBech32(i)
 }
 
 func ValidateSoftOptOutThreshold(i interface{}) error {
diff --git a/x/ccv/types/shared_consumer.pb.go b/x/ccv/types/shared_consumer.pb.go
index cd39605bb7..bbc9eeb993 100644
--- a/x/ccv/types/shared_consumer.pb.go
+++ b/x/ccv/types/shared_consumer.pb.go
@@ -11,7 +11,6 @@ import (
 	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
 	_ "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	_07_tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
-	types1 "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	_ "google.golang.org/protobuf/types/known/durationpb"
 	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
@@ -223,7 +222,7 @@ type GenesisState struct {
 	// OutstandingDowntimes nil on new chain, filled  in on restart.
 	OutstandingDowntimeSlashing []OutstandingDowntime `protobuf:"bytes,10,rep,name=outstanding_downtime_slashing,json=outstandingDowntimeSlashing,proto3" json:"outstanding_downtime_slashing"`
 	// PendingConsumerPackets nil on new chain, filled in on restart.
-	PendingConsumerPackets types1.ConsumerPacketDataList `protobuf:"bytes,11,opt,name=pending_consumer_packets,json=pendingConsumerPackets,proto3" json:"pending_consumer_packets"`
+	PendingConsumerPackets ConsumerPacketDataList `protobuf:"bytes,11,opt,name=pending_consumer_packets,json=pendingConsumerPackets,proto3" json:"pending_consumer_packets"`
 	// LastTransmissionBlockHeight nil on new chain, filled in on restart.
 	LastTransmissionBlockHeight LastTransmissionBlockHeight `protobuf:"bytes,12,opt,name=last_transmission_block_height,json=lastTransmissionBlockHeight,proto3" json:"last_transmission_block_height"`
 	PreCCV                      bool                        `protobuf:"varint,13,opt,name=preCCV,proto3" json:"preCCV,omitempty"`
@@ -332,11 +331,11 @@ func (m *GenesisState) GetOutstandingDowntimeSlashing() []OutstandingDowntime {
 	return nil
 }
 
-func (m *GenesisState) GetPendingConsumerPackets() types1.ConsumerPacketDataList {
+func (m *GenesisState) GetPendingConsumerPackets() ConsumerPacketDataList {
 	if m != nil {
 		return m.PendingConsumerPackets
 	}
-	return types1.ConsumerPacketDataList{}
+	return ConsumerPacketDataList{}
 }
 
 func (m *GenesisState) GetLastTransmissionBlockHeight() LastTransmissionBlockHeight {
@@ -557,6 +556,56 @@ func (m *MaturingVSCPacket) GetMaturityTime() time.Time {
 	return time.Time{}
 }
 
+// ConsumerPacketDataList is a list of consumer packet data packets.
+//
+// Note this type is is used internally to the consumer CCV module
+// for exporting / importing state in InitGenesis and ExportGenesis,
+// AND included in the consumer genesis type (reffed by provider and consumer modules),
+// hence this is a shared type.
+type ConsumerPacketDataList struct {
+	List []ConsumerPacketData `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
+}
+
+func (m *ConsumerPacketDataList) Reset()         { *m = ConsumerPacketDataList{} }
+func (m *ConsumerPacketDataList) String() string { return proto.CompactTextString(m) }
+func (*ConsumerPacketDataList) ProtoMessage()    {}
+func (*ConsumerPacketDataList) Descriptor() ([]byte, []int) {
+	return fileDescriptor_d0a8be0efc64dfbc, []int{6}
+}
+func (m *ConsumerPacketDataList) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ConsumerPacketDataList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_ConsumerPacketDataList.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *ConsumerPacketDataList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConsumerPacketDataList.Merge(m, src)
+}
+func (m *ConsumerPacketDataList) XXX_Size() int {
+	return m.Size()
+}
+func (m *ConsumerPacketDataList) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConsumerPacketDataList.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ConsumerPacketDataList proto.InternalMessageInfo
+
+func (m *ConsumerPacketDataList) GetList() []ConsumerPacketData {
+	if m != nil {
+		return m.List
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*Params)(nil), "interchain_security.ccv.v1.Params")
 	proto.RegisterType((*GenesisState)(nil), "interchain_security.ccv.v1.GenesisState")
@@ -564,6 +613,7 @@ func init() {
 	proto.RegisterType((*OutstandingDowntime)(nil), "interchain_security.ccv.v1.OutstandingDowntime")
 	proto.RegisterType((*LastTransmissionBlockHeight)(nil), "interchain_security.ccv.v1.LastTransmissionBlockHeight")
 	proto.RegisterType((*MaturingVSCPacket)(nil), "interchain_security.ccv.v1.MaturingVSCPacket")
+	proto.RegisterType((*ConsumerPacketDataList)(nil), "interchain_security.ccv.v1.ConsumerPacketDataList")
 }
 
 func init() {
@@ -571,81 +621,82 @@ func init() {
 }
 
 var fileDescriptor_d0a8be0efc64dfbc = []byte{
-	// 1171 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x4d, 0x6f, 0x1c, 0x35,
-	0x18, 0xce, 0x36, 0x6d, 0xba, 0xeb, 0x24, 0x34, 0x75, 0xda, 0x30, 0x4d, 0xc4, 0x66, 0xbb, 0x80,
-	0xb4, 0x12, 0x74, 0x86, 0xa4, 0x45, 0x48, 0x20, 0x21, 0x9a, 0x84, 0xd2, 0xa0, 0xd2, 0x84, 0x49,
-	0x9a, 0x43, 0x91, 0xb0, 0xbc, 0xb6, 0xb3, 0x63, 0x75, 0xd6, 0x1e, 0xd9, 0x9e, 0x09, 0x11, 0x37,
-	0xc4, 0x0f, 0xe8, 0x91, 0x9f, 0xd4, 0x63, 0xb9, 0x71, 0x02, 0xd4, 0xfe, 0x11, 0xe4, 0x8f, 0xd9,
-	0xec, 0xe6, 0x8b, 0xde, 0xc6, 0x7e, 0x9f, 0xe7, 0xfd, 0x7e, 0xfd, 0x0e, 0xf8, 0x8c, 0x0b, 0xc3,
-	0x14, 0xc9, 0x30, 0x17, 0x48, 0x33, 0x52, 0x2a, 0x6e, 0x8e, 0x13, 0x42, 0xaa, 0xa4, 0x5a, 0x4b,
-	0x74, 0x86, 0x15, 0xa3, 0x88, 0x48, 0xa1, 0xcb, 0x21, 0x53, 0x71, 0xa1, 0xa4, 0x91, 0x70, 0xf9,
-	0x1c, 0x46, 0x4c, 0x48, 0x15, 0x57, 0x6b, 0xcb, 0x2b, 0x86, 0x09, 0xca, 0xd4, 0x90, 0x0b, 0x93,
-	0xe0, 0x3e, 0xe1, 0x89, 0x39, 0x2e, 0x98, 0xf6, 0xc4, 0xe5, 0x84, 0xf7, 0x49, 0x92, 0xf3, 0x41,
-	0x66, 0x48, 0xce, 0x99, 0x30, 0x3a, 0x19, 0x43, 0x57, 0x6b, 0x63, 0xa7, 0x40, 0xb8, 0x6b, 0x09,
-	0x44, 0x2a, 0x96, 0x90, 0x0c, 0x0b, 0xc1, 0x72, 0x8b, 0x0a, 0x9f, 0x01, 0xd2, 0x1e, 0x48, 0x39,
-	0xc8, 0x59, 0xe2, 0x4e, 0xfd, 0xf2, 0x30, 0xa1, 0xa5, 0xc2, 0x86, 0x4b, 0x11, 0xe4, 0xb7, 0x06,
-	0x72, 0x20, 0xdd, 0x67, 0x62, 0xbf, 0xc2, 0xed, 0xc7, 0x97, 0x04, 0x7d, 0xc4, 0x15, 0x0b, 0xb0,
-	0xd5, 0xd3, 0xca, 0x0d, 0x1f, 0x32, 0x6d, 0xf0, 0xb0, 0x08, 0x80, 0xf5, 0x8b, 0xf4, 0xd4, 0x29,
-	0x73, 0x0e, 0x4f, 0xa4, 0xaf, 0xfb, 0xfb, 0x0c, 0x98, 0xd9, 0xc5, 0x0a, 0x0f, 0x35, 0x8c, 0xc0,
-	0x75, 0x26, 0x70, 0x3f, 0x67, 0x34, 0x6a, 0x74, 0x1a, 0xbd, 0x66, 0x5a, 0x1f, 0xe1, 0x0e, 0xf8,
-	0xa8, 0x9f, 0x4b, 0xf2, 0x42, 0xa3, 0x82, 0x29, 0x44, 0xb9, 0x36, 0x8a, 0xf7, 0x4b, 0x1b, 0x17,
-	0x32, 0x0a, 0x0b, 0x3d, 0xe4, 0x5a, 0x73, 0x29, 0xa2, 0x2b, 0x9d, 0x46, 0x6f, 0x3a, 0xbd, 0xeb,
-	0xb1, 0xbb, 0x4c, 0x6d, 0x8d, 0x21, 0xf7, 0xc7, 0x80, 0xf0, 0x7b, 0x70, 0xf7, 0x42, 0x2d, 0x28,
-	0xa4, 0x34, 0x9a, 0xee, 0x34, 0x7a, 0xad, 0x74, 0x95, 0x5e, 0xa0, 0x64, 0xd3, 0xc3, 0xe0, 0x97,
-	0x60, 0xb9, 0x50, 0xb2, 0xe2, 0x94, 0x29, 0x74, 0xc8, 0x18, 0x2a, 0xa4, 0xcc, 0x11, 0xa6, 0x54,
-	0x21, 0x6d, 0x54, 0x74, 0xd5, 0x29, 0x59, 0xaa, 0x11, 0x8f, 0x18, 0xdb, 0x95, 0x32, 0x7f, 0x48,
-	0xa9, 0xda, 0x33, 0x0a, 0xfe, 0x08, 0x20, 0x21, 0x15, 0xb2, 0x89, 0x94, 0xa5, 0xb1, 0xd1, 0x71,
-	0x49, 0xa3, 0x6b, 0x9d, 0x46, 0x6f, 0x76, 0xfd, 0x4e, 0xec, 0xf3, 0x1d, 0xd7, 0xf9, 0x8e, 0xb7,
-	0x42, 0x31, 0x37, 0x9a, 0xaf, 0xfe, 0x5e, 0x9d, 0xfa, 0xe3, 0x9f, 0xd5, 0x46, 0xba, 0x40, 0x48,
-	0xb5, 0xef, 0xd9, 0xbb, 0x8e, 0x0c, 0x7f, 0x02, 0xef, 0xbb, 0x68, 0x0e, 0x99, 0x3a, 0xad, 0x77,
-	0xe6, 0xdd, 0xf5, 0xde, 0xae, 0x75, 0x4c, 0x2a, 0x7f, 0x0c, 0x3a, 0x75, 0xfd, 0x90, 0x62, 0x13,
-	0x29, 0x3c, 0x54, 0x98, 0xd8, 0x8f, 0xe8, 0xba, 0x8b, 0xb8, 0x5d, 0xe3, 0xd2, 0x09, 0xd8, 0xa3,
-	0x80, 0x82, 0xf7, 0x00, 0xcc, 0xb8, 0x36, 0x52, 0x71, 0x82, 0x73, 0xc4, 0x84, 0x51, 0x9c, 0xe9,
-	0xa8, 0xe9, 0x0a, 0x78, 0xf3, 0x44, 0xf2, 0xad, 0x17, 0xc0, 0xa7, 0x60, 0xa1, 0x14, 0x7d, 0x29,
-	0x28, 0x17, 0x83, 0x3a, 0x9c, 0xd6, 0xbb, 0x87, 0x73, 0x63, 0x44, 0x0e, 0x81, 0xdc, 0x07, 0x4b,
-	0x5a, 0x1e, 0x1a, 0x24, 0x0b, 0x83, 0x6c, 0x86, 0x4c, 0xa6, 0x98, 0xce, 0x64, 0x4e, 0x23, 0xe0,
-	0xdc, 0x5f, 0xb4, 0xd2, 0x9d, 0xc2, 0xec, 0x94, 0x66, 0xbf, 0x16, 0xc1, 0x0f, 0xc1, 0xbc, 0x62,
-	0x47, 0x58, 0x51, 0x44, 0x99, 0x90, 0x43, 0x1d, 0xcd, 0x76, 0xa6, 0x7b, 0xad, 0x74, 0xce, 0x5f,
-	0x6e, 0xb9, 0x3b, 0xf8, 0x00, 0x8c, 0x8a, 0x8d, 0x26, 0xd1, 0x73, 0x0e, 0x7d, 0xab, 0x96, 0xa6,
-	0x63, 0xac, 0xee, 0x9f, 0x4d, 0x30, 0xf7, 0x1d, 0x13, 0x4c, 0x73, 0xbd, 0x67, 0xb0, 0x61, 0xf0,
-	0x1b, 0x30, 0x53, 0xb8, 0xb1, 0x70, 0xb3, 0x30, 0xbb, 0xde, 0x8d, 0x2f, 0x7e, 0x67, 0x62, 0x3f,
-	0x40, 0x1b, 0x57, 0x6d, 0xbc, 0x69, 0xe0, 0xc1, 0x4f, 0x01, 0x1c, 0x39, 0xe2, 0x5f, 0x18, 0xc4,
-	0xa9, 0x1b, 0x91, 0x56, 0xba, 0x50, 0x4b, 0x36, 0x9d, 0x60, 0x9b, 0xc2, 0x18, 0x2c, 0x9e, 0xa0,
-	0x7d, 0x67, 0x5b, 0xb8, 0x9f, 0x81, 0x9b, 0x23, 0xb8, 0x97, 0x6c, 0x53, 0xb8, 0x02, 0x5a, 0x82,
-	0x1d, 0x21, 0xe7, 0x8f, 0x6b, 0xf2, 0x66, 0xda, 0x14, 0xec, 0x68, 0xd3, 0x9e, 0x21, 0x02, 0xb7,
-	0x4f, 0x9b, 0xd6, 0x36, 0xaa, 0xd0, 0xd9, 0x9f, 0xc4, 0xbc, 0x4f, 0xe2, 0xf1, 0xa7, 0x2f, 0x1e,
-	0x7b, 0xec, 0xaa, 0xb5, 0xd8, 0x7b, 0xe5, 0x12, 0x91, 0x2e, 0x4e, 0xba, 0xea, 0xb3, 0x93, 0x81,
-	0xe8, 0xc4, 0x80, 0x14, 0x9a, 0x09, 0x5d, 0xea, 0x60, 0xc3, 0x77, 0x79, 0xfc, 0xbf, 0x36, 0x6a,
-	0x9a, 0x37, 0x33, 0x2a, 0xda, 0xe4, 0x3d, 0xfc, 0x19, 0x2c, 0x0c, 0xb1, 0x29, 0x95, 0xeb, 0x3b,
-	0x4c, 0x5e, 0x30, 0xa3, 0xa3, 0xeb, 0x9d, 0xe9, 0xde, 0xec, 0xfa, 0xbd, 0xcb, 0x2a, 0xf2, 0x43,
-	0xe0, 0x1c, 0xec, 0x6d, 0xee, 0x3a, 0x56, 0x28, 0xce, 0x8d, 0x5a, 0x99, 0xbf, 0xb5, 0x8d, 0x7d,
-	0x83, 0x0b, 0x6e, 0x38, 0xce, 0x51, 0x85, 0x73, 0xa4, 0x99, 0x89, 0x9a, 0x4e, 0x7d, 0x67, 0xdc,
-	0x5f, 0xbb, 0x3c, 0xe2, 0x03, 0x9c, 0x73, 0x8a, 0x8d, 0x54, 0xcf, 0x0a, 0x8a, 0x0d, 0x0b, 0x1a,
-	0xe7, 0x03, 0xfd, 0x00, 0xe7, 0x7b, 0xcc, 0x40, 0x03, 0x96, 0x33, 0x66, 0xa3, 0x46, 0x46, 0x5a,
-	0x8d, 0x9a, 0x19, 0x54, 0x3a, 0xbc, 0x2d, 0x67, 0xcb, 0xa9, 0x5e, 0xbf, 0xcc, 0xf3, 0xc7, 0x8e,
-	0xbd, 0x2f, 0x0f, 0x1c, 0xd7, 0x9b, 0xda, 0xde, 0x0a, 0xc6, 0x96, 0xb2, 0xf3, 0xa4, 0x14, 0x1e,
-	0x83, 0x0f, 0x64, 0x69, 0xb4, 0xc1, 0x7e, 0x40, 0xa9, 0x3c, 0x12, 0xf6, 0xed, 0x41, 0x3a, 0xc7,
-	0x3a, 0xe3, 0x62, 0x10, 0x01, 0x67, 0x38, 0xb9, 0xcc, 0xf0, 0xce, 0x89, 0x82, 0xad, 0xc0, 0x0f,
-	0x56, 0x57, 0xe4, 0x59, 0xd1, 0x5e, 0xd0, 0x0c, 0x7f, 0x05, 0x51, 0xc1, 0xbc, 0xd9, 0xd1, 0xd3,
-	0x54, 0x17, 0x6a, 0xd6, 0xb5, 0xc2, 0x57, 0x17, 0x5a, 0x1d, 0xed, 0xa2, 0xd0, 0x0f, 0xf6, 0xdb,
-	0x17, 0x66, 0x0b, 0x1b, 0xfc, 0x84, 0xeb, 0xba, 0x6c, 0x4b, 0xc1, 0xc4, 0x24, 0x48, 0xc3, 0xdf,
-	0x1a, 0xa0, 0x9d, 0x63, 0x6d, 0x26, 0x17, 0x88, 0xdb, 0x3f, 0xc8, 0xa7, 0x2a, 0x9a, 0x73, 0x3e,
-	0x7c, 0x71, 0x59, 0xe4, 0x4f, 0xb0, 0x36, 0xe3, 0x9b, 0x65, 0xc3, 0xf2, 0x7d, 0x1d, 0xea, 0x0c,
-	0xe4, 0x17, 0x43, 0xe0, 0x12, 0x98, 0x29, 0x14, 0xdb, 0xdc, 0x3c, 0x88, 0xe6, 0xdd, 0x1c, 0x86,
-	0x53, 0xf7, 0x39, 0x58, 0x3a, 0xbf, 0x98, 0x96, 0x11, 0xbc, 0xb3, 0x8f, 0xcb, 0xd5, 0x34, 0x9c,
-	0x60, 0x0f, 0x2c, 0x9c, 0x69, 0x99, 0x2b, 0x0e, 0xf1, 0x5e, 0x35, 0x51, 0xf0, 0xee, 0x33, 0xb0,
-	0x78, 0x4e, 0xbd, 0xe0, 0xd7, 0x60, 0xa5, 0xaa, 0xbb, 0x74, 0x6c, 0x30, 0xed, 0x36, 0x64, 0xda,
-	0x3f, 0x65, 0xad, 0xf4, 0xce, 0x08, 0x32, 0x9a, 0xb5, 0x87, 0x1e, 0xd0, 0xfd, 0x1c, 0xac, 0x3c,
-	0xb9, 0x3c, 0xd2, 0x31, 0xbf, 0xa7, 0x6b, 0xbf, 0xbb, 0x06, 0xdc, 0x3c, 0x33, 0x70, 0xf0, 0x16,
-	0xb8, 0x56, 0x69, 0xb2, 0x4d, 0x43, 0x8c, 0xfe, 0x00, 0xb7, 0xc1, 0xbc, 0x1f, 0x41, 0x73, 0xec,
-	0xd6, 0xa3, 0x8b, 0x6f, 0x76, 0x7d, 0xf9, 0xcc, 0x16, 0xd9, 0xaf, 0x7f, 0x6e, 0xfc, 0x1a, 0x79,
-	0x69, 0xd7, 0xc8, 0x5c, 0x4d, 0xb5, 0xc2, 0x8d, 0xa7, 0xaf, 0xde, 0xb4, 0x1b, 0xaf, 0xdf, 0xb4,
-	0x1b, 0xff, 0xbe, 0x69, 0x37, 0x5e, 0xbe, 0x6d, 0x4f, 0xbd, 0x7e, 0xdb, 0x9e, 0xfa, 0xeb, 0x6d,
-	0x7b, 0xea, 0xf9, 0x83, 0x01, 0x37, 0x59, 0xd9, 0x8f, 0x89, 0x1c, 0x26, 0x44, 0xea, 0xa1, 0xd4,
-	0xc9, 0x49, 0xf9, 0xef, 0x8d, 0x7e, 0x8d, 0xaa, 0xfb, 0xc9, 0x2f, 0xee, 0xff, 0xc8, 0xfd, 0x16,
-	0xf6, 0x67, 0x9c, 0xed, 0xfb, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x82, 0xc7, 0x84, 0x84,
-	0x0a, 0x00, 0x00,
+	// 1188 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4d, 0x6f, 0x1b, 0x45,
+	0x18, 0x8e, 0x9b, 0x34, 0xb5, 0x27, 0x09, 0x4d, 0x27, 0xad, 0xd9, 0x26, 0xc2, 0x71, 0x0d, 0x48,
+	0x96, 0xa0, 0xbb, 0x24, 0x2d, 0x42, 0xe2, 0x80, 0x68, 0x6c, 0x4a, 0x83, 0x4a, 0x13, 0x36, 0x69,
+	0x0e, 0x45, 0x62, 0x34, 0x9e, 0x99, 0xd8, 0xa3, 0xae, 0x67, 0xac, 0x99, 0xd9, 0x0d, 0xb9, 0x22,
+	0x7e, 0x40, 0x8f, 0xfc, 0xa4, 0x1e, 0x7b, 0xe4, 0x04, 0xa8, 0xfd, 0x23, 0x68, 0x3e, 0xd6, 0xb1,
+	0xf3, 0x61, 0xca, 0x6d, 0x67, 0xde, 0xe7, 0x79, 0xbf, 0xdf, 0x79, 0x17, 0x7c, 0xc1, 0x85, 0x61,
+	0x8a, 0x0c, 0x30, 0x17, 0x48, 0x33, 0x92, 0x2b, 0x6e, 0x4e, 0x13, 0x42, 0x8a, 0xa4, 0xd8, 0x4a,
+	0xf4, 0x00, 0x2b, 0x46, 0x11, 0x91, 0x42, 0xe7, 0x43, 0xa6, 0xe2, 0x91, 0x92, 0x46, 0xc2, 0xf5,
+	0x4b, 0x18, 0x31, 0x21, 0x45, 0x5c, 0x6c, 0xad, 0x6f, 0x18, 0x26, 0x28, 0x53, 0x43, 0x2e, 0x4c,
+	0x82, 0x7b, 0x84, 0x27, 0xe6, 0x74, 0xc4, 0xb4, 0x27, 0xae, 0x27, 0xbc, 0x47, 0x92, 0x8c, 0xf7,
+	0x07, 0x86, 0x64, 0x9c, 0x09, 0xa3, 0x93, 0x09, 0x74, 0xb1, 0x35, 0x71, 0x0a, 0x84, 0x7b, 0x96,
+	0x40, 0xa4, 0x62, 0x09, 0x19, 0x60, 0x21, 0x58, 0x66, 0x51, 0xe1, 0x33, 0x40, 0x1a, 0x7d, 0x29,
+	0xfb, 0x19, 0x4b, 0xdc, 0xa9, 0x97, 0x1f, 0x27, 0x34, 0x57, 0xd8, 0x70, 0x29, 0x82, 0xfc, 0x76,
+	0x5f, 0xf6, 0xa5, 0xfb, 0x4c, 0xec, 0x57, 0xb8, 0xfd, 0x74, 0x46, 0xd0, 0x27, 0x5c, 0xb1, 0x00,
+	0xdb, 0x3c, 0xaf, 0xdc, 0xf0, 0x21, 0xd3, 0x06, 0x0f, 0x47, 0x01, 0xb0, 0x7d, 0x95, 0x9e, 0x32,
+	0x65, 0xce, 0xe1, 0xa9, 0xf4, 0xb5, 0x7e, 0x5f, 0x04, 0x8b, 0xfb, 0x58, 0xe1, 0xa1, 0x86, 0x11,
+	0xb8, 0xc1, 0x04, 0xee, 0x65, 0x8c, 0x46, 0x95, 0x66, 0xa5, 0x5d, 0x4d, 0xcb, 0x23, 0xdc, 0x03,
+	0x9f, 0xf4, 0x32, 0x49, 0x5e, 0x6a, 0x34, 0x62, 0x0a, 0x51, 0xae, 0x8d, 0xe2, 0xbd, 0xdc, 0xc6,
+	0x85, 0x8c, 0xc2, 0x42, 0x0f, 0xb9, 0xd6, 0x5c, 0x8a, 0xe8, 0x5a, 0xb3, 0xd2, 0x9e, 0x4f, 0xef,
+	0x79, 0xec, 0x3e, 0x53, 0xdd, 0x09, 0xe4, 0xe1, 0x04, 0x10, 0xfe, 0x00, 0xee, 0x5d, 0xa9, 0x05,
+	0x85, 0x94, 0x46, 0xf3, 0xcd, 0x4a, 0xbb, 0x96, 0x6e, 0xd2, 0x2b, 0x94, 0x74, 0x3c, 0x0c, 0x7e,
+	0x0d, 0xd6, 0x47, 0x4a, 0x16, 0x9c, 0x32, 0x85, 0x8e, 0x19, 0x43, 0x23, 0x29, 0x33, 0x84, 0x29,
+	0x55, 0x48, 0x1b, 0x15, 0x2d, 0x38, 0x25, 0xf5, 0x12, 0xf1, 0x98, 0xb1, 0x7d, 0x29, 0xb3, 0x47,
+	0x94, 0xaa, 0x03, 0xa3, 0xe0, 0x4f, 0x00, 0x12, 0x52, 0x20, 0x9b, 0x48, 0x99, 0x1b, 0x1b, 0x1d,
+	0x97, 0x34, 0xba, 0xde, 0xac, 0xb4, 0x97, 0xb6, 0xef, 0xc6, 0x3e, 0xdf, 0x71, 0x99, 0xef, 0xb8,
+	0x1b, 0x8a, 0xb9, 0x53, 0x7d, 0xfd, 0xd7, 0xe6, 0xdc, 0x1f, 0x7f, 0x6f, 0x56, 0xd2, 0x55, 0x42,
+	0x8a, 0x43, 0xcf, 0xde, 0x77, 0x64, 0xf8, 0x33, 0xf8, 0xd0, 0x45, 0x73, 0xcc, 0xd4, 0x79, 0xbd,
+	0x8b, 0xef, 0xaf, 0xf7, 0x4e, 0xa9, 0x63, 0x5a, 0xf9, 0x13, 0xd0, 0x2c, 0xeb, 0x87, 0x14, 0x9b,
+	0x4a, 0xe1, 0xb1, 0xc2, 0xc4, 0x7e, 0x44, 0x37, 0x5c, 0xc4, 0x8d, 0x12, 0x97, 0x4e, 0xc1, 0x1e,
+	0x07, 0x14, 0xbc, 0x0f, 0xe0, 0x80, 0x6b, 0x23, 0x15, 0x27, 0x38, 0x43, 0x4c, 0x18, 0xc5, 0x99,
+	0x8e, 0xaa, 0xae, 0x80, 0xb7, 0xce, 0x24, 0xdf, 0x79, 0x01, 0x7c, 0x06, 0x56, 0x73, 0xd1, 0x93,
+	0x82, 0x72, 0xd1, 0x2f, 0xc3, 0xa9, 0xbd, 0x7f, 0x38, 0x37, 0xc7, 0xe4, 0x10, 0xc8, 0x03, 0x50,
+	0xd7, 0xf2, 0xd8, 0x20, 0x39, 0x32, 0xc8, 0x66, 0xc8, 0x0c, 0x14, 0xd3, 0x03, 0x99, 0xd1, 0x08,
+	0x38, 0xf7, 0xd7, 0xac, 0x74, 0x6f, 0x64, 0xf6, 0x72, 0x73, 0x58, 0x8a, 0xe0, 0xc7, 0x60, 0x45,
+	0xb1, 0x13, 0xac, 0x28, 0xa2, 0x4c, 0xc8, 0xa1, 0x8e, 0x96, 0x9a, 0xf3, 0xed, 0x5a, 0xba, 0xec,
+	0x2f, 0xbb, 0xee, 0x0e, 0x3e, 0x04, 0xe3, 0x62, 0xa3, 0x69, 0xf4, 0xb2, 0x43, 0xdf, 0x2e, 0xa5,
+	0xe9, 0x04, 0xab, 0xf5, 0xba, 0x0a, 0x96, 0xbf, 0x67, 0x82, 0x69, 0xae, 0x0f, 0x0c, 0x36, 0x0c,
+	0x7e, 0x0b, 0x16, 0x47, 0x6e, 0x2c, 0xdc, 0x2c, 0x2c, 0x6d, 0xb7, 0xe2, 0xab, 0xdf, 0x99, 0xd8,
+	0x0f, 0xd0, 0xce, 0x82, 0x8d, 0x37, 0x0d, 0x3c, 0xf8, 0x39, 0x80, 0x63, 0x47, 0xfc, 0x0b, 0x83,
+	0x38, 0x75, 0x23, 0x52, 0x4b, 0x57, 0x4b, 0x49, 0xc7, 0x09, 0x76, 0x29, 0x8c, 0xc1, 0xda, 0x19,
+	0xda, 0x77, 0xb6, 0x85, 0xfb, 0x19, 0xb8, 0x35, 0x86, 0x7b, 0xc9, 0x2e, 0x85, 0x1b, 0xa0, 0x26,
+	0xd8, 0x09, 0x72, 0xfe, 0xb8, 0x26, 0xaf, 0xa6, 0x55, 0xc1, 0x4e, 0x3a, 0xf6, 0x0c, 0x11, 0xb8,
+	0x73, 0xde, 0xb4, 0xb6, 0x51, 0x85, 0xce, 0xfe, 0x2c, 0xe6, 0x3d, 0x12, 0x4f, 0x3e, 0x7d, 0xf1,
+	0xc4, 0x63, 0x57, 0x6c, 0xc5, 0xde, 0x2b, 0x97, 0x88, 0x74, 0x6d, 0xda, 0x55, 0x9f, 0x9d, 0x01,
+	0x88, 0xce, 0x0c, 0x48, 0xa1, 0x99, 0xd0, 0xb9, 0x0e, 0x36, 0x7c, 0x97, 0xc7, 0xff, 0x69, 0xa3,
+	0xa4, 0x79, 0x33, 0xe3, 0xa2, 0x4d, 0xdf, 0xc3, 0x5f, 0xc0, 0xea, 0x10, 0x9b, 0x5c, 0xb9, 0xbe,
+	0xc3, 0xe4, 0x25, 0x33, 0x3a, 0xba, 0xd1, 0x9c, 0x6f, 0x2f, 0x6d, 0xdf, 0x9f, 0x55, 0x91, 0x1f,
+	0x03, 0xe7, 0xe8, 0xa0, 0xb3, 0xef, 0x58, 0xa1, 0x38, 0x37, 0x4b, 0x65, 0xfe, 0xd6, 0x36, 0xf6,
+	0x4d, 0x2e, 0xb8, 0xe1, 0x38, 0x43, 0x05, 0xce, 0x90, 0x66, 0x26, 0xaa, 0x3a, 0xf5, 0xcd, 0x49,
+	0x7f, 0xed, 0xf2, 0x88, 0x8f, 0x70, 0xc6, 0x29, 0x36, 0x52, 0x3d, 0x1f, 0x51, 0x6c, 0x58, 0xd0,
+	0xb8, 0x12, 0xe8, 0x47, 0x38, 0x3b, 0x60, 0x06, 0x1a, 0xb0, 0x3e, 0x60, 0x36, 0x6a, 0x64, 0xa4,
+	0xd5, 0xa8, 0x99, 0x41, 0xb9, 0xc3, 0xdb, 0x72, 0xd6, 0x9c, 0xea, 0xed, 0x59, 0x9e, 0x3f, 0x71,
+	0xec, 0x43, 0x79, 0xe4, 0xb8, 0xde, 0xd4, 0x6e, 0x37, 0x18, 0xab, 0x0f, 0x2e, 0x93, 0x52, 0x78,
+	0x0a, 0x3e, 0x92, 0xb9, 0xd1, 0x06, 0xfb, 0x01, 0xa5, 0xf2, 0x44, 0xd8, 0xb7, 0x07, 0xe9, 0x0c,
+	0xeb, 0x01, 0x17, 0xfd, 0x08, 0x38, 0xc3, 0xc9, 0x2c, 0xc3, 0x7b, 0x67, 0x0a, 0xba, 0x81, 0x1f,
+	0xac, 0x6e, 0xc8, 0x8b, 0xa2, 0x83, 0xa0, 0x19, 0x2a, 0x10, 0x8d, 0x98, 0x37, 0x3b, 0x7e, 0x9a,
+	0xca, 0x42, 0x2d, 0xb9, 0x56, 0x98, 0x19, 0x6e, 0x27, 0x70, 0x7c, 0x3d, 0xba, 0xd8, 0xe0, 0xa7,
+	0x5c, 0x97, 0xd5, 0xaa, 0x07, 0xcd, 0xd3, 0x20, 0x0d, 0x7f, 0xab, 0x80, 0x46, 0x86, 0xb5, 0x99,
+	0xde, 0x1b, 0x6e, 0xed, 0x20, 0x9f, 0xa1, 0x68, 0xd9, 0x99, 0xfe, 0x6a, 0x96, 0xe9, 0xa7, 0x58,
+	0x9b, 0xc9, 0x85, 0xb2, 0x63, 0xf9, 0x3e, 0xfd, 0x65, 0xe0, 0xd9, 0xd5, 0x10, 0x58, 0x07, 0x8b,
+	0x23, 0xc5, 0x3a, 0x9d, 0xa3, 0x68, 0xc5, 0x8d, 0x5f, 0x38, 0xb5, 0x5e, 0x80, 0xfa, 0xe5, 0x35,
+	0xb4, 0x8c, 0xe0, 0x9d, 0x7d, 0x53, 0x16, 0xd2, 0x70, 0x82, 0x6d, 0xb0, 0x7a, 0xa1, 0x53, 0xae,
+	0x39, 0xc4, 0x07, 0xc5, 0x54, 0x9d, 0x5b, 0xcf, 0xc1, 0xda, 0x25, 0x65, 0x82, 0xdf, 0x80, 0x8d,
+	0xa2, 0x6c, 0xce, 0x89, 0x79, 0xb4, 0x4b, 0x90, 0x69, 0xff, 0x82, 0xd5, 0xd2, 0xbb, 0x63, 0xc8,
+	0x78, 0xc4, 0x1e, 0x79, 0x40, 0xeb, 0x4b, 0xb0, 0xf1, 0x74, 0x76, 0xa4, 0x13, 0x7e, 0xcf, 0x97,
+	0x7e, 0xb7, 0x0c, 0xb8, 0x75, 0x61, 0xce, 0xe0, 0x6d, 0x70, 0xbd, 0xd0, 0x64, 0x97, 0x86, 0x18,
+	0xfd, 0x01, 0xee, 0x82, 0x15, 0x3f, 0x79, 0xe6, 0xd4, 0x6d, 0x45, 0x17, 0xdf, 0xd2, 0xf6, 0xfa,
+	0x85, 0xe5, 0x71, 0x58, 0xfe, 0xd3, 0xf8, 0xed, 0xf1, 0xca, 0x6e, 0x8f, 0xe5, 0x92, 0x6a, 0x85,
+	0xad, 0x1e, 0xa8, 0x5f, 0xde, 0x34, 0xf0, 0x09, 0x58, 0xc8, 0xb8, 0xb6, 0x5e, 0xce, 0xfb, 0x17,
+	0xe8, 0xff, 0xb4, 0x5d, 0x28, 0xb9, 0xd3, 0xb0, 0xf3, 0xec, 0xf5, 0xdb, 0x46, 0xe5, 0xcd, 0xdb,
+	0x46, 0xe5, 0x9f, 0xb7, 0x8d, 0xca, 0xab, 0x77, 0x8d, 0xb9, 0x37, 0xef, 0x1a, 0x73, 0x7f, 0xbe,
+	0x6b, 0xcc, 0xbd, 0x78, 0xd8, 0xe7, 0x66, 0x90, 0xf7, 0x62, 0x22, 0x87, 0x09, 0x91, 0x7a, 0x28,
+	0x75, 0x72, 0x66, 0xe6, 0xfe, 0xf8, 0xaf, 0xab, 0x78, 0x90, 0xfc, 0xea, 0x7e, 0xbd, 0xdc, 0x1f,
+	0x67, 0x6f, 0xd1, 0xc5, 0xf7, 0xe0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x8a, 0xea, 0xf8,
+	0xdf, 0x0a, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
@@ -1055,6 +1106,43 @@ func (m *MaturingVSCPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
+func (m *ConsumerPacketDataList) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *ConsumerPacketDataList) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ConsumerPacketDataList) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.List) > 0 {
+		for iNdEx := len(m.List) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.List[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintSharedConsumer(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0xa
+		}
+	}
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintSharedConsumer(dAtA []byte, offset int, v uint64) int {
 	offset -= sovSharedConsumer(v)
 	base := offset
@@ -1233,6 +1321,21 @@ func (m *MaturingVSCPacket) Size() (n int) {
 	return n
 }
 
+func (m *ConsumerPacketDataList) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.List) > 0 {
+		for _, e := range m.List {
+			l = e.Size()
+			n += 1 + l + sovSharedConsumer(uint64(l))
+		}
+	}
+	return n
+}
+
 func sovSharedConsumer(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -2440,6 +2543,90 @@ func (m *MaturingVSCPacket) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowSharedConsumer
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: ConsumerPacketDataList: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: ConsumerPacketDataList: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field List", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSharedConsumer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.List = append(m.List, ConsumerPacketData{})
+			if err := m.List[len(m.List)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipSharedConsumer(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthSharedConsumer
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipSharedConsumer(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0

From 61ea66151df32a2ac41468d6b36a804bb54327e6 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Tue, 15 Aug 2023 11:35:18 -0700
Subject: [PATCH 12/21] FIN

---
 app/consumer-democracy/app.go          | 4 +++-
 legacy_ibc_testing/testing/app.go      | 3 ++-
 tests/e2e/actions.go                   | 4 ++--
 tests/integration/distribution.go      | 6 +++---
 tests/integration/normal_operations.go | 3 ++-
 tests/integration/setup.go             | 3 +--
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/consumer-democracy/app.go b/app/consumer-democracy/app.go
index 063c5bf427..ebcbd6bad4 100644
--- a/app/consumer-democracy/app.go
+++ b/app/consumer-democracy/app.go
@@ -77,6 +77,7 @@ import (
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
+
 	// add mint
 	mint "github.com/cosmos/cosmos-sdk/x/mint"
 	mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
@@ -112,6 +113,7 @@ import (
 	ccvdistr "github.com/cosmos/interchain-security/v3/x/ccv/democracy/distribution"
 	ccvgov "github.com/cosmos/interchain-security/v3/x/ccv/democracy/governance"
 	ccvstaking "github.com/cosmos/interchain-security/v3/x/ccv/democracy/staking"
+	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 const (
@@ -712,7 +714,7 @@ func New(
 				return fromVM, fmt.Errorf("failed to unmarshal genesis state: %w", err)
 			}
 
-			consumerGenesis := consumertypes.GenesisState{}
+			consumerGenesis := ccvtypes.GenesisState{}
 			appCodec.MustUnmarshalJSON(appState[consumertypes.ModuleName], &consumerGenesis)
 
 			consumerGenesis.PreCCV = true
diff --git a/legacy_ibc_testing/testing/app.go b/legacy_ibc_testing/testing/app.go
index 8a1fef452c..db9da4bfb5 100644
--- a/legacy_ibc_testing/testing/app.go
+++ b/legacy_ibc_testing/testing/app.go
@@ -25,6 +25,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/cosmos/ibc-go/v7/modules/core/keeper"
+	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 
 	"github.com/cosmos/interchain-security/v3/legacy_ibc_testing/simapp"
 	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
@@ -110,7 +111,7 @@ func SetupWithGenesisValSet(t *testing.T, appIniter AppIniter, valSet *tmtypes.V
 	// set validators and delegations
 	var (
 		stakingGenesis  stakingtypes.GenesisState
-		consumerGenesis consumertypes.GenesisState
+		consumerGenesis ccvtypes.GenesisState
 		bondDenom       string
 	)
 	if genesisState[stakingtypes.ModuleName] != nil {
diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go
index e5ac465aa0..d7fba4a358 100644
--- a/tests/e2e/actions.go
+++ b/tests/e2e/actions.go
@@ -17,9 +17,9 @@ import (
 
 	evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
 
-	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	"github.com/cosmos/interchain-security/v3/x/ccv/provider/client"
 	"github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
+	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 type SendTokensAction struct {
@@ -235,7 +235,7 @@ func (tr TestRun) submitConsumerAdditionProposal(
 	verbose bool,
 ) {
 	spawnTime := tr.containerConfig.now.Add(time.Duration(action.spawnTime) * time.Millisecond)
-	params := consumertypes.DefaultParams()
+	params := ccvtypes.DefaultParams()
 	prop := client.ConsumerAdditionProposalJSON{
 		Title:                             "Propose the addition of a new chain",
 		Summary:                           "Gonna be a great chain",
diff --git a/tests/integration/distribution.go b/tests/integration/distribution.go
index a896a6f22b..5d5c50220a 100644
--- a/tests/integration/distribution.go
+++ b/tests/integration/distribution.go
@@ -34,7 +34,7 @@ func (s *CCVTestSuite) TestRewardsDistribution() {
 
 	// reward for the provider chain will be sent after each 2 blocks
 	consumerParams := s.consumerApp.GetSubspace(consumertypes.ModuleName)
-	consumerParams.Set(s.consumerCtx(), consumertypes.KeyBlocksPerDistributionTransmission, int64(2))
+	consumerParams.Set(s.consumerCtx(), ccv.KeyBlocksPerDistributionTransmission, int64(2))
 	s.consumerChain.NextBlock()
 
 	consumerAccountKeeper := s.consumerApp.GetTestAccountKeeper()
@@ -166,7 +166,7 @@ func (s *CCVTestSuite) TestSendRewardsRetries() {
 
 	// reward for the provider chain will be sent after each 1000 blocks
 	consumerParams := s.consumerApp.GetSubspace(consumertypes.ModuleName)
-	consumerParams.Set(s.consumerCtx(), consumertypes.KeyBlocksPerDistributionTransmission, int64(1000))
+	consumerParams.Set(s.consumerCtx(), ccv.KeyBlocksPerDistributionTransmission, int64(1000))
 
 	// fill fee pool
 	fees := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100)))
@@ -296,7 +296,7 @@ func (s *CCVTestSuite) TestEndBlockRD() {
 
 		// reward for the provider chain will be sent after each 1000 blocks
 		consumerParams := s.consumerApp.GetSubspace(consumertypes.ModuleName)
-		consumerParams.Set(s.consumerCtx(), consumertypes.KeyBlocksPerDistributionTransmission, int64(1000))
+		consumerParams.Set(s.consumerCtx(), ccv.KeyBlocksPerDistributionTransmission, int64(1000))
 
 		// fill fee pool
 		fees := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100)))
diff --git a/tests/integration/normal_operations.go b/tests/integration/normal_operations.go
index b676689e89..cd8e07f323 100644
--- a/tests/integration/normal_operations.go
+++ b/tests/integration/normal_operations.go
@@ -6,6 +6,7 @@ import (
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 
 	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
+	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 // Tests the tracking of historical info in the context of new blocks being committed
@@ -73,7 +74,7 @@ func (k CCVTestSuite) TestHistoricalInfo() { //nolint:govet // this is a test so
 			expLen: 0,
 		},
 		{
-			height: initHeight + consumertypes.DefaultHistoricalEntries + 2,
+			height: initHeight + ccvtypes.DefaultHistoricalEntries + 2,
 			found:  true,
 			expLen: initValsetLen + 2,
 		},
diff --git a/tests/integration/setup.go b/tests/integration/setup.go
index a18ff551e4..61cb8a96c9 100644
--- a/tests/integration/setup.go
+++ b/tests/integration/setup.go
@@ -16,7 +16,6 @@ import (
 	ibctesting "github.com/cosmos/interchain-security/v3/legacy_ibc_testing/testing"
 	icstestingutils "github.com/cosmos/interchain-security/v3/testutil/ibc_testing"
 	testutil "github.com/cosmos/interchain-security/v3/testutil/integration"
-	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	ccv "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
@@ -152,7 +151,7 @@ func (suite *CCVTestSuite) SetupTest() {
 func initConsumerChain(
 	s *CCVTestSuite,
 	chainID string,
-	genesisState *consumertypes.GenesisState,
+	genesisState *ccv.GenesisState,
 ) {
 	providerKeeper := s.providerApp.GetProviderKeeper()
 	bundle := s.consumerBundles[chainID]

From f267c8ab78b1e59fb4b4441a1544d35e8c8721a1 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Tue, 15 Aug 2023 11:47:22 -0700
Subject: [PATCH 13/21] refactors

---
 app/consumer-democracy/app.go                 |   1 -
 legacy_ibc_testing/testing/app.go             |   2 +-
 .../ccv/v1/shared_consumer.proto              |   4 -
 x/ccv/consumer/types/consumer.pb.go           | 248 +++---------------
 x/ccv/types/shared_consumer.pb.go             |   4 -
 5 files changed, 31 insertions(+), 228 deletions(-)

diff --git a/app/consumer-democracy/app.go b/app/consumer-democracy/app.go
index ebcbd6bad4..fee730d752 100644
--- a/app/consumer-democracy/app.go
+++ b/app/consumer-democracy/app.go
@@ -77,7 +77,6 @@ import (
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
-
 	// add mint
 	mint "github.com/cosmos/cosmos-sdk/x/mint"
 	mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
diff --git a/legacy_ibc_testing/testing/app.go b/legacy_ibc_testing/testing/app.go
index 116d57b284..ff3c146a4a 100644
--- a/legacy_ibc_testing/testing/app.go
+++ b/legacy_ibc_testing/testing/app.go
@@ -25,11 +25,11 @@ import (
 	abci "github.com/cometbft/cometbft/abci/types"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	tmtypes "github.com/cometbft/cometbft/types"
-	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 
 	"github.com/cosmos/interchain-security/v3/legacy_ibc_testing/core"
 	"github.com/cosmos/interchain-security/v3/legacy_ibc_testing/simapp"
 	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
+	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 /*
diff --git a/proto/interchain_security/ccv/v1/shared_consumer.proto b/proto/interchain_security/ccv/v1/shared_consumer.proto
index d00c416a12..a7ea3e273c 100644
--- a/proto/interchain_security/ccv/v1/shared_consumer.proto
+++ b/proto/interchain_security/ccv/v1/shared_consumer.proto
@@ -18,8 +18,6 @@ import "interchain_security/ccv/consumer/v1/consumer.proto";
 // but not sent over the wire. These schemas could change, only with careful consideration of effects!
 //
 
-// TODO: rename to ConsumerParams (or make issue)
-// 
 // Params defines the parameters for CCV consumer module.
 // 
 // Note this type is referenced in both the consumer and provider CCV modules,
@@ -80,8 +78,6 @@ message Params {
     repeated string provider_reward_denoms = 12;
 }
 
-// TODO: rename to ConsumerGenesisState (make issue)
-//
 // GenesisState defines the CCV consumer chain genesis state.
 // 
 // Note this type is referenced in both the consumer and provider CCV modules,
diff --git a/x/ccv/consumer/types/consumer.pb.go b/x/ccv/consumer/types/consumer.pb.go
index e83fd1ba2a..c6c09166a5 100644
--- a/x/ccv/consumer/types/consumer.pb.go
+++ b/x/ccv/consumer/types/consumer.pb.go
@@ -10,7 +10,7 @@ import (
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
-	types1 "github.com/cosmos/interchain-security/v3/x/ccv/types"
+	_ "github.com/cosmos/interchain-security/v3/x/ccv/types"
 	_ "google.golang.org/protobuf/types/known/durationpb"
 	_ "google.golang.org/protobuf/types/known/timestamppb"
 	io "io"
@@ -98,54 +98,6 @@ func (m *CrossChainValidator) GetPubkey() *types.Any {
 	return nil
 }
 
-// ConsumerPacketDataList is a list of consumer packet data packets.
-//
-// Note this type is is only used internally to the consumer CCV module
-// for exporting / importing state in InitGenesis and ExportGenesis.
-type ConsumerPacketDataList struct {
-	List []types1.ConsumerPacketData `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
-}
-
-func (m *ConsumerPacketDataList) Reset()         { *m = ConsumerPacketDataList{} }
-func (m *ConsumerPacketDataList) String() string { return proto.CompactTextString(m) }
-func (*ConsumerPacketDataList) ProtoMessage()    {}
-func (*ConsumerPacketDataList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5b27a82b276e7f93, []int{1}
-}
-func (m *ConsumerPacketDataList) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *ConsumerPacketDataList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_ConsumerPacketDataList.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *ConsumerPacketDataList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConsumerPacketDataList.Merge(m, src)
-}
-func (m *ConsumerPacketDataList) XXX_Size() int {
-	return m.Size()
-}
-func (m *ConsumerPacketDataList) XXX_DiscardUnknown() {
-	xxx_messageInfo_ConsumerPacketDataList.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ConsumerPacketDataList proto.InternalMessageInfo
-
-func (m *ConsumerPacketDataList) GetList() []types1.ConsumerPacketData {
-	if m != nil {
-		return m.List
-	}
-	return nil
-}
-
 // A record storing the state of a slash packet sent to the provider chain
 // which may bounce back and forth until handled by the provider.
 //
@@ -159,7 +111,7 @@ func (m *SlashRecord) Reset()         { *m = SlashRecord{} }
 func (m *SlashRecord) String() string { return proto.CompactTextString(m) }
 func (*SlashRecord) ProtoMessage()    {}
 func (*SlashRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5b27a82b276e7f93, []int{2}
+	return fileDescriptor_5b27a82b276e7f93, []int{1}
 }
 func (m *SlashRecord) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -204,7 +156,6 @@ func (m *SlashRecord) GetSendTime() time.Time {
 
 func init() {
 	proto.RegisterType((*CrossChainValidator)(nil), "interchain_security.ccv.consumer.v1.CrossChainValidator")
-	proto.RegisterType((*ConsumerPacketDataList)(nil), "interchain_security.ccv.consumer.v1.ConsumerPacketDataList")
 	proto.RegisterType((*SlashRecord)(nil), "interchain_security.ccv.consumer.v1.SlashRecord")
 }
 
@@ -213,37 +164,34 @@ func init() {
 }
 
 var fileDescriptor_5b27a82b276e7f93 = []byte{
-	// 479 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x4d, 0x8e, 0xd3, 0x30,
-	0x18, 0xad, 0xe9, 0x30, 0x14, 0x17, 0x21, 0x14, 0x2a, 0x08, 0x5d, 0xa4, 0x55, 0x10, 0x52, 0x36,
-	0xe3, 0xa8, 0xed, 0x0e, 0x89, 0xc5, 0xb4, 0x2c, 0x90, 0x40, 0x62, 0x14, 0x10, 0x48, 0x6c, 0x22,
-	0xc7, 0x31, 0xa9, 0x35, 0x89, 0x1d, 0xd9, 0x4e, 0x8a, 0x39, 0xc5, 0x1c, 0x83, 0x03, 0x70, 0x88,
-	0x11, 0xab, 0x59, 0xb2, 0x1a, 0x50, 0x7b, 0x03, 0x4e, 0x80, 0xf2, 0xd3, 0x22, 0x66, 0xa6, 0xbb,
-	0xef, 0xf9, 0xf9, 0xbd, 0xcf, 0x7e, 0xdf, 0x07, 0xa7, 0x8c, 0x6b, 0x2a, 0xc9, 0x12, 0x33, 0x1e,
-	0x2a, 0x4a, 0x0a, 0xc9, 0xb4, 0xf1, 0x09, 0x29, 0x7d, 0x22, 0xb8, 0x2a, 0x32, 0x2a, 0xfd, 0x72,
-	0xb2, 0xab, 0x51, 0x2e, 0x85, 0x16, 0xd6, 0xd3, 0x1b, 0x34, 0x88, 0x90, 0x12, 0xed, 0xee, 0x95,
-	0x93, 0xe1, 0xb3, 0x7d, 0xc6, 0xe5, 0xc4, 0x5f, 0x31, 0x49, 0x1b, 0xaf, 0xe1, 0x93, 0x44, 0x88,
-	0x24, 0xa5, 0x7e, 0x8d, 0xa2, 0xe2, 0xb3, 0x8f, 0xb9, 0x69, 0xa9, 0x41, 0x22, 0x12, 0x51, 0x97,
-	0x7e, 0x55, 0x6d, 0x05, 0x44, 0xa8, 0x4c, 0xa8, 0xb0, 0x21, 0x1a, 0xd0, 0x52, 0xce, 0x55, 0xaf,
-	0xb8, 0x90, 0x58, 0x33, 0xc1, 0x5b, 0x7e, 0x74, 0x95, 0xd7, 0x2c, 0xa3, 0x4a, 0xe3, 0x2c, 0x6f,
-	0x2e, 0xb8, 0xdf, 0x00, 0x7c, 0xb8, 0x90, 0x42, 0xa9, 0x45, 0xf5, 0xec, 0x0f, 0x38, 0x65, 0x31,
-	0xd6, 0x42, 0x5a, 0x36, 0xbc, 0x83, 0xe3, 0x58, 0x52, 0xa5, 0x6c, 0x30, 0x06, 0xde, 0xbd, 0x60,
-	0x0b, 0xad, 0x01, 0xbc, 0x9d, 0x8b, 0x15, 0x95, 0xf6, 0xad, 0x31, 0xf0, 0xba, 0x41, 0x03, 0x2c,
-	0x0c, 0x0f, 0xf3, 0x22, 0x3a, 0xa5, 0xc6, 0xee, 0x8e, 0x81, 0xd7, 0x9f, 0x0e, 0x50, 0xd3, 0x19,
-	0x6d, 0x3b, 0xa3, 0x63, 0x6e, 0xe6, 0xb3, 0x3f, 0x97, 0xa3, 0xc7, 0x06, 0x67, 0xe9, 0x73, 0xb7,
-	0x0a, 0x8e, 0x72, 0x55, 0xa8, 0xb0, 0xd1, 0xb9, 0x3f, 0xbe, 0x1f, 0x0d, 0xda, 0xbf, 0x11, 0x69,
-	0x72, 0x2d, 0xd0, 0x49, 0x11, 0xbd, 0xa6, 0x26, 0x68, 0x8d, 0xdd, 0x08, 0x3e, 0x5a, 0xb4, 0x69,
-	0x9f, 0x60, 0x72, 0x4a, 0xf5, 0x4b, 0xac, 0xf1, 0x1b, 0xa6, 0xb4, 0xf5, 0x0a, 0x1e, 0xa4, 0x4c,
-	0x69, 0x1b, 0x8c, 0xbb, 0x5e, 0x7f, 0x8a, 0xd0, 0xbe, 0x61, 0x95, 0x13, 0x74, 0xdd, 0x61, 0x7e,
-	0x70, 0x7e, 0x39, 0xea, 0x04, 0xb5, 0x83, 0xfb, 0x15, 0xf6, 0xdf, 0xa5, 0x58, 0x2d, 0x03, 0x4a,
-	0x84, 0x8c, 0x2d, 0x0f, 0x3e, 0x58, 0x61, 0xa6, 0x19, 0x4f, 0x42, 0xc1, 0x43, 0x49, 0xf3, 0xd4,
-	0xd4, 0x71, 0xf4, 0x82, 0xfb, 0xed, 0xf9, 0x5b, 0x1e, 0x54, 0xa7, 0xd6, 0x31, 0xbc, 0xab, 0x28,
-	0x8f, 0xc3, 0x2a, 0xdf, 0x3a, 0x99, 0xfe, 0x74, 0x78, 0x2d, 0x82, 0xf7, 0xdb, 0xf0, 0xe7, 0xbd,
-	0xaa, 0xe7, 0xd9, 0xaf, 0x11, 0x08, 0x7a, 0x95, 0xac, 0x22, 0xe6, 0x1f, 0xcf, 0xd7, 0x0e, 0xb8,
-	0x58, 0x3b, 0xe0, 0xf7, 0xda, 0x01, 0x67, 0x1b, 0xa7, 0x73, 0xb1, 0x71, 0x3a, 0x3f, 0x37, 0x4e,
-	0xe7, 0xd3, 0x8b, 0x84, 0xe9, 0x65, 0x11, 0x21, 0x22, 0xb2, 0x76, 0xfc, 0xfe, 0xbf, 0x2f, 0x1e,
-	0xed, 0x56, 0xad, 0x9c, 0xf9, 0x5f, 0xfe, 0x5f, 0x64, 0x6d, 0x72, 0xaa, 0xa2, 0xc3, 0xfa, 0x01,
-	0xb3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xcb, 0xdf, 0xa0, 0xf9, 0x02, 0x00, 0x00,
+	// 432 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xcb, 0x8e, 0xd3, 0x30,
+	0x14, 0xad, 0x19, 0x31, 0x94, 0x14, 0x21, 0x14, 0x2a, 0x51, 0xba, 0x48, 0xab, 0x22, 0xa4, 0x6e,
+	0xc6, 0x56, 0xdb, 0x1d, 0x12, 0x8b, 0xe9, 0x2c, 0x59, 0x80, 0x02, 0x02, 0x89, 0x4d, 0xe4, 0x38,
+	0x26, 0xb5, 0x48, 0x7c, 0x23, 0x3f, 0x52, 0xcc, 0x57, 0xcc, 0x67, 0xf0, 0x01, 0x7c, 0xc4, 0x88,
+	0xd5, 0x2c, 0x59, 0x0d, 0xa8, 0xfd, 0x03, 0xbe, 0x00, 0xe5, 0x55, 0xc4, 0xc0, 0xec, 0xee, 0xf1,
+	0xf1, 0x39, 0x3e, 0xf7, 0xfa, 0x7a, 0x4b, 0x21, 0x0d, 0x57, 0x6c, 0x43, 0x85, 0x8c, 0x34, 0x67,
+	0x56, 0x09, 0xe3, 0x08, 0x63, 0x25, 0x61, 0x20, 0xb5, 0xcd, 0xb9, 0x22, 0xe5, 0xe2, 0x50, 0xe3,
+	0x42, 0x81, 0x01, 0xff, 0xc9, 0x7f, 0x34, 0x98, 0xb1, 0x12, 0x1f, 0xee, 0x95, 0x8b, 0xf1, 0xd3,
+	0x9b, 0x8c, 0xcb, 0x05, 0xd9, 0x0a, 0xc5, 0x1b, 0xaf, 0xf1, 0xe3, 0x14, 0x20, 0xcd, 0x38, 0xa9,
+	0x51, 0x6c, 0x3f, 0x10, 0x2a, 0x5d, 0x4b, 0x0d, 0x53, 0x48, 0xa1, 0x2e, 0x49, 0x55, 0x75, 0x02,
+	0x06, 0x3a, 0x07, 0x1d, 0x35, 0x44, 0x03, 0x5a, 0x2a, 0xb8, 0xee, 0x95, 0x58, 0x45, 0x8d, 0x00,
+	0xd9, 0xf2, 0x93, 0xeb, 0xbc, 0x11, 0x39, 0xd7, 0x86, 0xe6, 0x45, 0x73, 0x61, 0xf6, 0x05, 0x79,
+	0x0f, 0xcf, 0x14, 0x68, 0x7d, 0x56, 0xc5, 0x7e, 0x4b, 0x33, 0x91, 0x50, 0x03, 0xca, 0x1f, 0x79,
+	0x77, 0x68, 0x92, 0x28, 0xae, 0xf5, 0x08, 0x4d, 0xd1, 0xfc, 0x5e, 0xd8, 0x41, 0x7f, 0xe8, 0xdd,
+	0x2e, 0x60, 0xcb, 0xd5, 0xe8, 0xd6, 0x14, 0xcd, 0x8f, 0xc2, 0x06, 0xf8, 0xd4, 0x3b, 0x2e, 0x6c,
+	0xfc, 0x91, 0xbb, 0xd1, 0xd1, 0x14, 0xcd, 0x07, 0xcb, 0x21, 0x6e, 0x5e, 0xc6, 0xdd, 0xcb, 0xf8,
+	0x54, 0xba, 0xf5, 0xea, 0xd7, 0xd5, 0xe4, 0x91, 0xa3, 0x79, 0xf6, 0x6c, 0x56, 0x0d, 0x8e, 0x4b,
+	0x6d, 0x75, 0xd4, 0xe8, 0x66, 0xdf, 0xbe, 0x9e, 0x0c, 0xdb, 0xde, 0x98, 0x72, 0x85, 0x01, 0xfc,
+	0xca, 0xc6, 0x2f, 0xb8, 0x0b, 0x5b, 0xe3, 0xd9, 0x67, 0x6f, 0xf0, 0x3a, 0xa3, 0x7a, 0x13, 0x72,
+	0x06, 0x2a, 0xf1, 0xe7, 0xde, 0x83, 0x2d, 0x15, 0x46, 0xc8, 0x34, 0x02, 0x19, 0x29, 0x5e, 0x64,
+	0xae, 0x8e, 0xda, 0x0f, 0xef, 0xb7, 0xe7, 0x2f, 0x65, 0x58, 0x9d, 0xfa, 0xa7, 0xde, 0x5d, 0xcd,
+	0x65, 0x12, 0x55, 0xbd, 0xd7, 0xa9, 0x07, 0xcb, 0xf1, 0x3f, 0xf1, 0xde, 0x74, 0x83, 0x59, 0xf7,
+	0x2f, 0xae, 0x26, 0xbd, 0xf3, 0x1f, 0x13, 0x14, 0xf6, 0x2b, 0x59, 0x45, 0xac, 0xdf, 0x5d, 0xec,
+	0x02, 0x74, 0xb9, 0x0b, 0xd0, 0xcf, 0x5d, 0x80, 0xce, 0xf7, 0x41, 0xef, 0x72, 0x1f, 0xf4, 0xbe,
+	0xef, 0x83, 0xde, 0xfb, 0xe7, 0xa9, 0x30, 0x1b, 0x1b, 0x63, 0x06, 0x79, 0xfb, 0x35, 0xe4, 0xcf,
+	0x1a, 0x9c, 0x1c, 0xd6, 0xa0, 0x5c, 0x91, 0x4f, 0x7f, 0x2f, 0x99, 0x71, 0x05, 0xd7, 0xf1, 0x71,
+	0x1d, 0x60, 0xf5, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x5c, 0xdb, 0x0f, 0x5e, 0x95, 0x02, 0x00, 0x00,
 }
 
 func (m *CrossChainValidator) Marshal() (dAtA []byte, err error) {
@@ -293,43 +241,6 @@ func (m *CrossChainValidator) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *ConsumerPacketDataList) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *ConsumerPacketDataList) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *ConsumerPacketDataList) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if len(m.List) > 0 {
-		for iNdEx := len(m.List) - 1; iNdEx >= 0; iNdEx-- {
-			{
-				size, err := m.List[iNdEx].MarshalToSizedBuffer(dAtA[:i])
-				if err != nil {
-					return 0, err
-				}
-				i -= size
-				i = encodeVarintConsumer(dAtA, i, uint64(size))
-			}
-			i--
-			dAtA[i] = 0xa
-		}
-	}
-	return len(dAtA) - i, nil
-}
-
 func (m *SlashRecord) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -402,21 +313,6 @@ func (m *CrossChainValidator) Size() (n int) {
 	return n
 }
 
-func (m *ConsumerPacketDataList) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if len(m.List) > 0 {
-		for _, e := range m.List {
-			l = e.Size()
-			n += 1 + l + sovConsumer(uint64(l))
-		}
-	}
-	return n
-}
-
 func (m *SlashRecord) Size() (n int) {
 	if m == nil {
 		return 0
@@ -576,90 +472,6 @@ func (m *CrossChainValidator) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowConsumer
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: ConsumerPacketDataList: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: ConsumerPacketDataList: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field List", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowConsumer
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.List = append(m.List, types1.ConsumerPacketData{})
-			if err := m.List[len(m.List)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipConsumer(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthConsumer
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
 func (m *SlashRecord) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/x/ccv/types/shared_consumer.pb.go b/x/ccv/types/shared_consumer.pb.go
index bbc9eeb993..cb0db42229 100644
--- a/x/ccv/types/shared_consumer.pb.go
+++ b/x/ccv/types/shared_consumer.pb.go
@@ -31,8 +31,6 @@ var _ = time.Kitchen
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
-// TODO: rename to ConsumerParams (or make issue)
-//
 // Params defines the parameters for CCV consumer module.
 //
 // Note this type is referenced in both the consumer and provider CCV modules,
@@ -198,8 +196,6 @@ func (m *Params) GetProviderRewardDenoms() []string {
 	return nil
 }
 
-// TODO: rename to ConsumerGenesisState (make issue)
-//
 // GenesisState defines the CCV consumer chain genesis state.
 //
 // Note this type is referenced in both the consumer and provider CCV modules,

From a306031bc087586aa8ffda0e505f1462a9050f3f Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Tue, 15 Aug 2023 11:49:59 -0700
Subject: [PATCH 14/21] rm improper proto ref

---
 .../ccv/v1/shared_consumer.proto              |   1 -
 x/ccv/types/shared_consumer.pb.go             | 123 +++++++++---------
 2 files changed, 61 insertions(+), 63 deletions(-)

diff --git a/proto/interchain_security/ccv/v1/shared_consumer.proto b/proto/interchain_security/ccv/v1/shared_consumer.proto
index a7ea3e273c..46ea286e3d 100644
--- a/proto/interchain_security/ccv/v1/shared_consumer.proto
+++ b/proto/interchain_security/ccv/v1/shared_consumer.proto
@@ -11,7 +11,6 @@ import "google/protobuf/duration.proto";
 import "gogoproto/gogo.proto";
 import "interchain_security/ccv/v1/wire.proto";
 import "google/protobuf/timestamp.proto";
-import "interchain_security/ccv/consumer/v1/consumer.proto";
 
 //
 // Note any type defined in this file is referenced/persisted in both the consumer and provider CCV modules,
diff --git a/x/ccv/types/shared_consumer.pb.go b/x/ccv/types/shared_consumer.pb.go
index cb0db42229..8b81888b3c 100644
--- a/x/ccv/types/shared_consumer.pb.go
+++ b/x/ccv/types/shared_consumer.pb.go
@@ -617,7 +617,7 @@ func init() {
 }
 
 var fileDescriptor_d0a8be0efc64dfbc = []byte{
-	// 1188 bytes of a gzipped FileDescriptorProto
+	// 1178 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4d, 0x6f, 0x1b, 0x45,
 	0x18, 0x8e, 0x9b, 0x34, 0xb5, 0x27, 0x09, 0x4d, 0x27, 0xad, 0xd9, 0x26, 0xc2, 0x71, 0x0d, 0x48,
 	0x96, 0xa0, 0xbb, 0x24, 0x2d, 0x42, 0xe2, 0x80, 0x68, 0x6c, 0x4a, 0x83, 0x4a, 0x13, 0x36, 0x69,
@@ -632,67 +632,66 @@ var fileDescriptor_d0a8be0efc64dfbc = []byte{
 	0x40, 0xa4, 0x62, 0x09, 0x19, 0x60, 0x21, 0x58, 0x66, 0x51, 0xe1, 0x33, 0x40, 0x1a, 0x7d, 0x29,
 	0xfb, 0x19, 0x4b, 0xdc, 0xa9, 0x97, 0x1f, 0x27, 0x34, 0x57, 0xd8, 0x70, 0x29, 0x82, 0xfc, 0x76,
 	0x5f, 0xf6, 0xa5, 0xfb, 0x4c, 0xec, 0x57, 0xb8, 0xfd, 0x74, 0x46, 0xd0, 0x27, 0x5c, 0xb1, 0x00,
-	0xdb, 0x3c, 0xaf, 0xdc, 0xf0, 0x21, 0xd3, 0x06, 0x0f, 0x47, 0x01, 0xb0, 0x7d, 0x95, 0x9e, 0x32,
-	0x65, 0xce, 0xe1, 0xa9, 0xf4, 0xb5, 0x7e, 0x5f, 0x04, 0x8b, 0xfb, 0x58, 0xe1, 0xa1, 0x86, 0x11,
-	0xb8, 0xc1, 0x04, 0xee, 0x65, 0x8c, 0x46, 0x95, 0x66, 0xa5, 0x5d, 0x4d, 0xcb, 0x23, 0xdc, 0x03,
-	0x9f, 0xf4, 0x32, 0x49, 0x5e, 0x6a, 0x34, 0x62, 0x0a, 0x51, 0xae, 0x8d, 0xe2, 0xbd, 0xdc, 0xc6,
-	0x85, 0x8c, 0xc2, 0x42, 0x0f, 0xb9, 0xd6, 0x5c, 0x8a, 0xe8, 0x5a, 0xb3, 0xd2, 0x9e, 0x4f, 0xef,
-	0x79, 0xec, 0x3e, 0x53, 0xdd, 0x09, 0xe4, 0xe1, 0x04, 0x10, 0xfe, 0x00, 0xee, 0x5d, 0xa9, 0x05,
-	0x85, 0x94, 0x46, 0xf3, 0xcd, 0x4a, 0xbb, 0x96, 0x6e, 0xd2, 0x2b, 0x94, 0x74, 0x3c, 0x0c, 0x7e,
-	0x0d, 0xd6, 0x47, 0x4a, 0x16, 0x9c, 0x32, 0x85, 0x8e, 0x19, 0x43, 0x23, 0x29, 0x33, 0x84, 0x29,
-	0x55, 0x48, 0x1b, 0x15, 0x2d, 0x38, 0x25, 0xf5, 0x12, 0xf1, 0x98, 0xb1, 0x7d, 0x29, 0xb3, 0x47,
-	0x94, 0xaa, 0x03, 0xa3, 0xe0, 0x4f, 0x00, 0x12, 0x52, 0x20, 0x9b, 0x48, 0x99, 0x1b, 0x1b, 0x1d,
-	0x97, 0x34, 0xba, 0xde, 0xac, 0xb4, 0x97, 0xb6, 0xef, 0xc6, 0x3e, 0xdf, 0x71, 0x99, 0xef, 0xb8,
-	0x1b, 0x8a, 0xb9, 0x53, 0x7d, 0xfd, 0xd7, 0xe6, 0xdc, 0x1f, 0x7f, 0x6f, 0x56, 0xd2, 0x55, 0x42,
-	0x8a, 0x43, 0xcf, 0xde, 0x77, 0x64, 0xf8, 0x33, 0xf8, 0xd0, 0x45, 0x73, 0xcc, 0xd4, 0x79, 0xbd,
-	0x8b, 0xef, 0xaf, 0xf7, 0x4e, 0xa9, 0x63, 0x5a, 0xf9, 0x13, 0xd0, 0x2c, 0xeb, 0x87, 0x14, 0x9b,
-	0x4a, 0xe1, 0xb1, 0xc2, 0xc4, 0x7e, 0x44, 0x37, 0x5c, 0xc4, 0x8d, 0x12, 0x97, 0x4e, 0xc1, 0x1e,
-	0x07, 0x14, 0xbc, 0x0f, 0xe0, 0x80, 0x6b, 0x23, 0x15, 0x27, 0x38, 0x43, 0x4c, 0x18, 0xc5, 0x99,
-	0x8e, 0xaa, 0xae, 0x80, 0xb7, 0xce, 0x24, 0xdf, 0x79, 0x01, 0x7c, 0x06, 0x56, 0x73, 0xd1, 0x93,
-	0x82, 0x72, 0xd1, 0x2f, 0xc3, 0xa9, 0xbd, 0x7f, 0x38, 0x37, 0xc7, 0xe4, 0x10, 0xc8, 0x03, 0x50,
-	0xd7, 0xf2, 0xd8, 0x20, 0x39, 0x32, 0xc8, 0x66, 0xc8, 0x0c, 0x14, 0xd3, 0x03, 0x99, 0xd1, 0x08,
-	0x38, 0xf7, 0xd7, 0xac, 0x74, 0x6f, 0x64, 0xf6, 0x72, 0x73, 0x58, 0x8a, 0xe0, 0xc7, 0x60, 0x45,
-	0xb1, 0x13, 0xac, 0x28, 0xa2, 0x4c, 0xc8, 0xa1, 0x8e, 0x96, 0x9a, 0xf3, 0xed, 0x5a, 0xba, 0xec,
-	0x2f, 0xbb, 0xee, 0x0e, 0x3e, 0x04, 0xe3, 0x62, 0xa3, 0x69, 0xf4, 0xb2, 0x43, 0xdf, 0x2e, 0xa5,
-	0xe9, 0x04, 0xab, 0xf5, 0xba, 0x0a, 0x96, 0xbf, 0x67, 0x82, 0x69, 0xae, 0x0f, 0x0c, 0x36, 0x0c,
-	0x7e, 0x0b, 0x16, 0x47, 0x6e, 0x2c, 0xdc, 0x2c, 0x2c, 0x6d, 0xb7, 0xe2, 0xab, 0xdf, 0x99, 0xd8,
-	0x0f, 0xd0, 0xce, 0x82, 0x8d, 0x37, 0x0d, 0x3c, 0xf8, 0x39, 0x80, 0x63, 0x47, 0xfc, 0x0b, 0x83,
-	0x38, 0x75, 0x23, 0x52, 0x4b, 0x57, 0x4b, 0x49, 0xc7, 0x09, 0x76, 0x29, 0x8c, 0xc1, 0xda, 0x19,
-	0xda, 0x77, 0xb6, 0x85, 0xfb, 0x19, 0xb8, 0x35, 0x86, 0x7b, 0xc9, 0x2e, 0x85, 0x1b, 0xa0, 0x26,
-	0xd8, 0x09, 0x72, 0xfe, 0xb8, 0x26, 0xaf, 0xa6, 0x55, 0xc1, 0x4e, 0x3a, 0xf6, 0x0c, 0x11, 0xb8,
-	0x73, 0xde, 0xb4, 0xb6, 0x51, 0x85, 0xce, 0xfe, 0x2c, 0xe6, 0x3d, 0x12, 0x4f, 0x3e, 0x7d, 0xf1,
-	0xc4, 0x63, 0x57, 0x6c, 0xc5, 0xde, 0x2b, 0x97, 0x88, 0x74, 0x6d, 0xda, 0x55, 0x9f, 0x9d, 0x01,
-	0x88, 0xce, 0x0c, 0x48, 0xa1, 0x99, 0xd0, 0xb9, 0x0e, 0x36, 0x7c, 0x97, 0xc7, 0xff, 0x69, 0xa3,
-	0xa4, 0x79, 0x33, 0xe3, 0xa2, 0x4d, 0xdf, 0xc3, 0x5f, 0xc0, 0xea, 0x10, 0x9b, 0x5c, 0xb9, 0xbe,
-	0xc3, 0xe4, 0x25, 0x33, 0x3a, 0xba, 0xd1, 0x9c, 0x6f, 0x2f, 0x6d, 0xdf, 0x9f, 0x55, 0x91, 0x1f,
-	0x03, 0xe7, 0xe8, 0xa0, 0xb3, 0xef, 0x58, 0xa1, 0x38, 0x37, 0x4b, 0x65, 0xfe, 0xd6, 0x36, 0xf6,
-	0x4d, 0x2e, 0xb8, 0xe1, 0x38, 0x43, 0x05, 0xce, 0x90, 0x66, 0x26, 0xaa, 0x3a, 0xf5, 0xcd, 0x49,
-	0x7f, 0xed, 0xf2, 0x88, 0x8f, 0x70, 0xc6, 0x29, 0x36, 0x52, 0x3d, 0x1f, 0x51, 0x6c, 0x58, 0xd0,
-	0xb8, 0x12, 0xe8, 0x47, 0x38, 0x3b, 0x60, 0x06, 0x1a, 0xb0, 0x3e, 0x60, 0x36, 0x6a, 0x64, 0xa4,
-	0xd5, 0xa8, 0x99, 0x41, 0xb9, 0xc3, 0xdb, 0x72, 0xd6, 0x9c, 0xea, 0xed, 0x59, 0x9e, 0x3f, 0x71,
-	0xec, 0x43, 0x79, 0xe4, 0xb8, 0xde, 0xd4, 0x6e, 0x37, 0x18, 0xab, 0x0f, 0x2e, 0x93, 0x52, 0x78,
-	0x0a, 0x3e, 0x92, 0xb9, 0xd1, 0x06, 0xfb, 0x01, 0xa5, 0xf2, 0x44, 0xd8, 0xb7, 0x07, 0xe9, 0x0c,
-	0xeb, 0x01, 0x17, 0xfd, 0x08, 0x38, 0xc3, 0xc9, 0x2c, 0xc3, 0x7b, 0x67, 0x0a, 0xba, 0x81, 0x1f,
-	0xac, 0x6e, 0xc8, 0x8b, 0xa2, 0x83, 0xa0, 0x19, 0x2a, 0x10, 0x8d, 0x98, 0x37, 0x3b, 0x7e, 0x9a,
-	0xca, 0x42, 0x2d, 0xb9, 0x56, 0x98, 0x19, 0x6e, 0x27, 0x70, 0x7c, 0x3d, 0xba, 0xd8, 0xe0, 0xa7,
-	0x5c, 0x97, 0xd5, 0xaa, 0x07, 0xcd, 0xd3, 0x20, 0x0d, 0x7f, 0xab, 0x80, 0x46, 0x86, 0xb5, 0x99,
-	0xde, 0x1b, 0x6e, 0xed, 0x20, 0x9f, 0xa1, 0x68, 0xd9, 0x99, 0xfe, 0x6a, 0x96, 0xe9, 0xa7, 0x58,
-	0x9b, 0xc9, 0x85, 0xb2, 0x63, 0xf9, 0x3e, 0xfd, 0x65, 0xe0, 0xd9, 0xd5, 0x10, 0x58, 0x07, 0x8b,
-	0x23, 0xc5, 0x3a, 0x9d, 0xa3, 0x68, 0xc5, 0x8d, 0x5f, 0x38, 0xb5, 0x5e, 0x80, 0xfa, 0xe5, 0x35,
-	0xb4, 0x8c, 0xe0, 0x9d, 0x7d, 0x53, 0x16, 0xd2, 0x70, 0x82, 0x6d, 0xb0, 0x7a, 0xa1, 0x53, 0xae,
-	0x39, 0xc4, 0x07, 0xc5, 0x54, 0x9d, 0x5b, 0xcf, 0xc1, 0xda, 0x25, 0x65, 0x82, 0xdf, 0x80, 0x8d,
-	0xa2, 0x6c, 0xce, 0x89, 0x79, 0xb4, 0x4b, 0x90, 0x69, 0xff, 0x82, 0xd5, 0xd2, 0xbb, 0x63, 0xc8,
-	0x78, 0xc4, 0x1e, 0x79, 0x40, 0xeb, 0x4b, 0xb0, 0xf1, 0x74, 0x76, 0xa4, 0x13, 0x7e, 0xcf, 0x97,
-	0x7e, 0xb7, 0x0c, 0xb8, 0x75, 0x61, 0xce, 0xe0, 0x6d, 0x70, 0xbd, 0xd0, 0x64, 0x97, 0x86, 0x18,
-	0xfd, 0x01, 0xee, 0x82, 0x15, 0x3f, 0x79, 0xe6, 0xd4, 0x6d, 0x45, 0x17, 0xdf, 0xd2, 0xf6, 0xfa,
-	0x85, 0xe5, 0x71, 0x58, 0xfe, 0xd3, 0xf8, 0xed, 0xf1, 0xca, 0x6e, 0x8f, 0xe5, 0x92, 0x6a, 0x85,
-	0xad, 0x1e, 0xa8, 0x5f, 0xde, 0x34, 0xf0, 0x09, 0x58, 0xc8, 0xb8, 0xb6, 0x5e, 0xce, 0xfb, 0x17,
-	0xe8, 0xff, 0xb4, 0x5d, 0x28, 0xb9, 0xd3, 0xb0, 0xf3, 0xec, 0xf5, 0xdb, 0x46, 0xe5, 0xcd, 0xdb,
-	0x46, 0xe5, 0x9f, 0xb7, 0x8d, 0xca, 0xab, 0x77, 0x8d, 0xb9, 0x37, 0xef, 0x1a, 0x73, 0x7f, 0xbe,
-	0x6b, 0xcc, 0xbd, 0x78, 0xd8, 0xe7, 0x66, 0x90, 0xf7, 0x62, 0x22, 0x87, 0x09, 0x91, 0x7a, 0x28,
-	0x75, 0x72, 0x66, 0xe6, 0xfe, 0xf8, 0xaf, 0xab, 0x78, 0x90, 0xfc, 0xea, 0x7e, 0xbd, 0xdc, 0x1f,
-	0x67, 0x6f, 0xd1, 0xc5, 0xf7, 0xe0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x8a, 0xea, 0xf8,
-	0xdf, 0x0a, 0x00, 0x00,
+	0xdb, 0x3c, 0xaf, 0xdc, 0xf0, 0x21, 0xd3, 0x06, 0x0f, 0x47, 0x1e, 0xd0, 0xfa, 0x7d, 0x11, 0x2c,
+	0xee, 0x63, 0x85, 0x87, 0x1a, 0x46, 0xe0, 0x06, 0x13, 0xb8, 0x97, 0x31, 0x1a, 0x55, 0x9a, 0x95,
+	0x76, 0x35, 0x2d, 0x8f, 0x70, 0x0f, 0x7c, 0xd2, 0xcb, 0x24, 0x79, 0xa9, 0xd1, 0x88, 0x29, 0x44,
+	0xb9, 0x36, 0x8a, 0xf7, 0x72, 0xeb, 0x23, 0x32, 0x0a, 0x0b, 0x3d, 0xe4, 0x5a, 0x73, 0x29, 0xa2,
+	0x6b, 0xcd, 0x4a, 0x7b, 0x3e, 0xbd, 0xe7, 0xb1, 0xfb, 0x4c, 0x75, 0x27, 0x90, 0x87, 0x13, 0x40,
+	0xf8, 0x03, 0xb8, 0x77, 0xa5, 0x16, 0x14, 0xd2, 0x13, 0xcd, 0x37, 0x2b, 0xed, 0x5a, 0xba, 0x49,
+	0xaf, 0x50, 0xd2, 0xf1, 0x30, 0xf8, 0x35, 0x58, 0x1f, 0x29, 0x59, 0x70, 0xca, 0x14, 0x3a, 0x66,
+	0x0c, 0x8d, 0xa4, 0xcc, 0x10, 0xa6, 0x54, 0x21, 0x6d, 0x54, 0xb4, 0xe0, 0x94, 0xd4, 0x4b, 0xc4,
+	0x63, 0xc6, 0xf6, 0xa5, 0xcc, 0x1e, 0x51, 0xaa, 0x0e, 0x8c, 0x82, 0x3f, 0x01, 0x48, 0x48, 0x81,
+	0x6c, 0x52, 0x64, 0x6e, 0x6c, 0x74, 0x5c, 0xd2, 0xe8, 0x7a, 0xb3, 0xd2, 0x5e, 0xda, 0xbe, 0x1b,
+	0xfb, 0xdc, 0xc5, 0x65, 0xee, 0xe2, 0x6e, 0x28, 0xcc, 0x4e, 0xf5, 0xf5, 0x5f, 0x9b, 0x73, 0x7f,
+	0xfc, 0xbd, 0x59, 0x49, 0x57, 0x09, 0x29, 0x0e, 0x3d, 0x7b, 0xdf, 0x91, 0xe1, 0xcf, 0xe0, 0x43,
+	0x17, 0xcd, 0x31, 0x53, 0xe7, 0xf5, 0x2e, 0xbe, 0xbf, 0xde, 0x3b, 0xa5, 0x8e, 0x69, 0xe5, 0x4f,
+	0x40, 0xb3, 0x6c, 0x65, 0xa4, 0xd8, 0x54, 0x0a, 0x8f, 0x15, 0x26, 0xf6, 0x23, 0xba, 0xe1, 0x22,
+	0x6e, 0x94, 0xb8, 0x74, 0x0a, 0xf6, 0x38, 0xa0, 0xe0, 0x7d, 0x00, 0x07, 0x5c, 0x1b, 0xa9, 0x38,
+	0xc1, 0x19, 0x62, 0xc2, 0x28, 0xce, 0x74, 0x54, 0x75, 0x05, 0xbc, 0x75, 0x26, 0xf9, 0xce, 0x0b,
+	0xe0, 0x33, 0xb0, 0x9a, 0x8b, 0x9e, 0x14, 0x94, 0x8b, 0x7e, 0x19, 0x4e, 0xed, 0xfd, 0xc3, 0xb9,
+	0x39, 0x26, 0x87, 0x40, 0x1e, 0x80, 0xba, 0x96, 0xc7, 0x06, 0xc9, 0x91, 0x41, 0x36, 0x43, 0x66,
+	0xa0, 0x98, 0x1e, 0xc8, 0x8c, 0x46, 0xc0, 0xb9, 0xbf, 0x66, 0xa5, 0x7b, 0x23, 0xb3, 0x97, 0x9b,
+	0xc3, 0x52, 0x04, 0x3f, 0x06, 0x2b, 0x8a, 0x9d, 0x60, 0x45, 0x11, 0x65, 0x42, 0x0e, 0x75, 0xb4,
+	0xd4, 0x9c, 0x6f, 0xd7, 0xd2, 0x65, 0x7f, 0xd9, 0x75, 0x77, 0xf0, 0x21, 0x18, 0x17, 0x1b, 0x4d,
+	0xa3, 0x97, 0x1d, 0xfa, 0x76, 0x29, 0x4d, 0x27, 0x58, 0xad, 0xd7, 0x55, 0xb0, 0xfc, 0x3d, 0x13,
+	0x4c, 0x73, 0x7d, 0x60, 0xb0, 0x61, 0xf0, 0x5b, 0xb0, 0x38, 0x72, 0x63, 0xe1, 0x66, 0x61, 0x69,
+	0xbb, 0x15, 0x5f, 0xfd, 0x66, 0xc4, 0x7e, 0x80, 0x76, 0x16, 0x6c, 0xbc, 0x69, 0xe0, 0xc1, 0xcf,
+	0x01, 0x1c, 0x3b, 0xe2, 0x5f, 0x0b, 0xc4, 0xa9, 0x1b, 0x91, 0x5a, 0xba, 0x5a, 0x4a, 0x3a, 0x4e,
+	0xb0, 0x4b, 0x61, 0x0c, 0xd6, 0xce, 0xd0, 0xbe, 0xb3, 0x2d, 0xdc, 0xcf, 0xc0, 0xad, 0x31, 0xdc,
+	0x4b, 0x76, 0x29, 0xdc, 0x00, 0x35, 0xc1, 0x4e, 0x90, 0xf3, 0xc7, 0x35, 0x79, 0x35, 0xad, 0x0a,
+	0x76, 0xd2, 0xb1, 0x67, 0x88, 0xc0, 0x9d, 0xf3, 0xa6, 0xb5, 0x8d, 0x2a, 0x74, 0xf6, 0x67, 0x31,
+	0xef, 0x91, 0x78, 0xf2, 0x19, 0x8b, 0x27, 0x1e, 0xae, 0x62, 0x2b, 0xf6, 0x5e, 0xb9, 0x44, 0xa4,
+	0x6b, 0xd3, 0xae, 0xfa, 0xec, 0x0c, 0x40, 0x74, 0x66, 0x40, 0x0a, 0xcd, 0x84, 0xce, 0x75, 0xb0,
+	0xe1, 0xbb, 0x3c, 0xfe, 0x4f, 0x1b, 0x25, 0xcd, 0x9b, 0x19, 0x17, 0x6d, 0xfa, 0x1e, 0xfe, 0x02,
+	0x56, 0x87, 0xd8, 0xe4, 0xca, 0xf5, 0x1d, 0x26, 0x2f, 0x99, 0xd1, 0xd1, 0x8d, 0xe6, 0x7c, 0x7b,
+	0x69, 0xfb, 0xfe, 0xac, 0x8a, 0xfc, 0x18, 0x38, 0x47, 0x07, 0x9d, 0x7d, 0xc7, 0x0a, 0xc5, 0xb9,
+	0x59, 0x2a, 0xf3, 0xb7, 0xb6, 0xb1, 0x6f, 0x72, 0xc1, 0x0d, 0xc7, 0x19, 0x2a, 0x70, 0x86, 0x34,
+	0x33, 0x51, 0xd5, 0xa9, 0x6f, 0x4e, 0xfa, 0x6b, 0x17, 0x41, 0x7c, 0x84, 0x33, 0x4e, 0xb1, 0x91,
+	0xea, 0xf9, 0x88, 0x62, 0xc3, 0x82, 0xc6, 0x95, 0x40, 0x3f, 0xc2, 0xd9, 0x01, 0x33, 0xd0, 0x80,
+	0xf5, 0x01, 0xb3, 0x51, 0x23, 0x23, 0xad, 0x46, 0xcd, 0x0c, 0xca, 0x1d, 0xde, 0x96, 0xb3, 0xe6,
+	0x54, 0x6f, 0xcf, 0xf2, 0xfc, 0x89, 0x63, 0x1f, 0xca, 0x23, 0xc7, 0xf5, 0xa6, 0x76, 0xbb, 0xc1,
+	0x58, 0x7d, 0x70, 0x99, 0x94, 0xc2, 0x53, 0xf0, 0x91, 0xcc, 0x8d, 0x36, 0xd8, 0x0f, 0x28, 0x95,
+	0x27, 0xc2, 0xbe, 0x3d, 0x48, 0x67, 0x58, 0x0f, 0xb8, 0xe8, 0x47, 0xc0, 0x19, 0x4e, 0x66, 0x19,
+	0xde, 0x3b, 0x53, 0xd0, 0x0d, 0xfc, 0x60, 0x75, 0x43, 0x5e, 0x14, 0x1d, 0x04, 0xcd, 0x50, 0x81,
+	0x68, 0xc4, 0xbc, 0xd9, 0xf1, 0xd3, 0x54, 0x16, 0x6a, 0xc9, 0xb5, 0xc2, 0xcc, 0x70, 0x3b, 0x81,
+	0xe3, 0xeb, 0xd1, 0xc5, 0x06, 0x3f, 0xe5, 0xba, 0xac, 0x56, 0x3d, 0x68, 0x9e, 0x06, 0x69, 0xf8,
+	0x5b, 0x05, 0x34, 0x32, 0xac, 0xcd, 0xf4, 0xde, 0x70, 0x6b, 0x07, 0xf9, 0x0c, 0x45, 0xcb, 0xce,
+	0xf4, 0x57, 0xb3, 0x4c, 0x3f, 0xc5, 0xda, 0x4c, 0x2e, 0x94, 0x1d, 0xcb, 0xf7, 0xe9, 0x2f, 0x03,
+	0xcf, 0xae, 0x86, 0xc0, 0x3a, 0x58, 0x1c, 0x29, 0xd6, 0xe9, 0x1c, 0x45, 0x2b, 0x6e, 0xfc, 0xc2,
+	0xa9, 0xf5, 0x02, 0xd4, 0x2f, 0xaf, 0xa1, 0x65, 0x04, 0xef, 0xec, 0x9b, 0xb2, 0x90, 0x86, 0x13,
+	0x6c, 0x83, 0xd5, 0x0b, 0x9d, 0x72, 0xcd, 0x21, 0x3e, 0x28, 0xa6, 0xea, 0xdc, 0x7a, 0x0e, 0xd6,
+	0x2e, 0x29, 0x13, 0xfc, 0x06, 0x6c, 0x14, 0x65, 0x73, 0x4e, 0xcc, 0xa3, 0x5d, 0x82, 0x4c, 0xfb,
+	0x17, 0xac, 0x96, 0xde, 0x1d, 0x43, 0xc6, 0x23, 0xf6, 0xc8, 0x03, 0x5a, 0x5f, 0x82, 0x8d, 0xa7,
+	0xb3, 0x23, 0x9d, 0xf0, 0x7b, 0xbe, 0xf4, 0xbb, 0x65, 0xc0, 0xad, 0x0b, 0x73, 0x06, 0x6f, 0x83,
+	0xeb, 0x85, 0x26, 0xbb, 0x34, 0xc4, 0xe8, 0x0f, 0x70, 0x17, 0xac, 0xf8, 0xc9, 0x33, 0xa7, 0x6e,
+	0x2b, 0xba, 0xf8, 0x96, 0xb6, 0xd7, 0x2f, 0x2c, 0x8f, 0xc3, 0xf2, 0xff, 0xc4, 0x6f, 0x8f, 0x57,
+	0x76, 0x7b, 0x2c, 0x97, 0x54, 0x2b, 0x6c, 0xf5, 0x40, 0xfd, 0xf2, 0xa6, 0x81, 0x4f, 0xc0, 0x42,
+	0xc6, 0xb5, 0xf5, 0x72, 0xde, 0xbf, 0x40, 0xff, 0xa7, 0xed, 0x42, 0xc9, 0x9d, 0x86, 0x9d, 0x67,
+	0xaf, 0xdf, 0x36, 0x2a, 0x6f, 0xde, 0x36, 0x2a, 0xff, 0xbc, 0x6d, 0x54, 0x5e, 0xbd, 0x6b, 0xcc,
+	0xbd, 0x79, 0xd7, 0x98, 0xfb, 0xf3, 0x5d, 0x63, 0xee, 0xc5, 0xc3, 0x3e, 0x37, 0x83, 0xbc, 0x17,
+	0x13, 0x39, 0x4c, 0x88, 0xd4, 0x43, 0xa9, 0x93, 0x33, 0x33, 0xf7, 0xc7, 0x7f, 0x62, 0xc5, 0x83,
+	0xe4, 0x57, 0xf7, 0x3b, 0xe6, 0xfe, 0x1e, 0x7b, 0x8b, 0x2e, 0xbe, 0x07, 0xff, 0x06, 0x00, 0x00,
+	0xff, 0xff, 0xd1, 0x28, 0xd8, 0xb6, 0xab, 0x0a, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {

From 11b3af21c09b7e0ff31858eab9c6c7f8bbfa9608 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Tue, 15 Aug 2023 11:53:20 -0700
Subject: [PATCH 15/21] rm todos, issue now

---
 proto/interchain_security/ccv/provider/v1/genesis.proto  | 2 --
 proto/interchain_security/ccv/provider/v1/provider.proto | 2 --
 x/ccv/provider/types/genesis.pb.go                       | 2 --
 x/ccv/provider/types/provider.pb.go                      | 2 --
 4 files changed, 8 deletions(-)

diff --git a/proto/interchain_security/ccv/provider/v1/genesis.proto b/proto/interchain_security/ccv/provider/v1/genesis.proto
index c7ea70a39f..22da5c4200 100644
--- a/proto/interchain_security/ccv/provider/v1/genesis.proto
+++ b/proto/interchain_security/ccv/provider/v1/genesis.proto
@@ -11,8 +11,6 @@ import "interchain_security/ccv/provider/v1/provider.proto";
 import "tendermint/crypto/keys.proto";
 
 // GenesisState defines the CCV provider chain genesis state
-// 
-// TODO: Change to ProviderGenesisState for consistency with consumer, or create issue for this.
 message GenesisState {
   // strictly positive and set to 1 (DefaultValsetUpdateID) for a new chain
   uint64 valset_update_id = 1;
diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto
index 8ecc355896..2fb52671f3 100644
--- a/proto/interchain_security/ccv/provider/v1/provider.proto
+++ b/proto/interchain_security/ccv/provider/v1/provider.proto
@@ -146,8 +146,6 @@ message GlobalSlashEntry {
 // Params defines the parameters for CCV Provider module
 // 
 // Note this type is only used internally to the provider CCV module. 
-//
-// TODO: change to ProviderParams for consistency with consumer, or create issue for this.
 message Params {
   ibc.lightclients.tendermint.v1.ClientState template_client = 1;
   // TrustingPeriodFraction is used to compute the consumer and provider IBC
diff --git a/x/ccv/provider/types/genesis.pb.go b/x/ccv/provider/types/genesis.pb.go
index 803976092f..fa952b9b13 100644
--- a/x/ccv/provider/types/genesis.pb.go
+++ b/x/ccv/provider/types/genesis.pb.go
@@ -26,8 +26,6 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // GenesisState defines the CCV provider chain genesis state
-//
-// TODO: Change to ProviderGenesisState for consistency with consumer, or create issue for this.
 type GenesisState struct {
 	// strictly positive and set to 1 (DefaultValsetUpdateID) for a new chain
 	ValsetUpdateId uint64 `protobuf:"varint,1,opt,name=valset_update_id,json=valsetUpdateId,proto3" json:"valset_update_id,omitempty"`
diff --git a/x/ccv/provider/types/provider.pb.go b/x/ccv/provider/types/provider.pb.go
index e76d9459cb..67cf9f166d 100644
--- a/x/ccv/provider/types/provider.pb.go
+++ b/x/ccv/provider/types/provider.pb.go
@@ -358,8 +358,6 @@ func (m *GlobalSlashEntry) GetProviderValConsAddr() []byte {
 // Params defines the parameters for CCV Provider module
 //
 // Note this type is only used internally to the provider CCV module.
-//
-// TODO: change to ProviderParams for consistency with consumer, or create issue for this.
 type Params struct {
 	TemplateClient *_07_tendermint.ClientState `protobuf:"bytes,1,opt,name=template_client,json=templateClient,proto3" json:"template_client,omitempty"`
 	// TrustingPeriodFraction is used to compute the consumer and provider IBC

From 7f0fe613797340ea1284e494c4111a9703f67cdd Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Tue, 15 Aug 2023 12:16:14 -0700
Subject: [PATCH 16/21] lint till I die

---
 tests/difference/core/driver/setup.go |  14 +-
 x/ccv/consumer/keeper/relay_test.go   |  11 +-
 x/ccv/consumer/types/genesis_test.go  | 196 +++++++++++++-------------
 x/ccv/provider/keeper/keeper.go       |   9 +-
 4 files changed, 114 insertions(+), 116 deletions(-)

diff --git a/tests/difference/core/driver/setup.go b/tests/difference/core/driver/setup.go
index fb5bf6a611..9ca6d00b9f 100644
--- a/tests/difference/core/driver/setup.go
+++ b/tests/difference/core/driver/setup.go
@@ -206,7 +206,7 @@ func (b *Builder) getAppBytesAndSenders(
 
 	bondDenom := sdk.DefaultBondDenom
 	genesisStaking := stakingtypes.GenesisState{}
-	genesisConsumer := consumertypes.GenesisState{}
+	genesisConsumer := ccv.GenesisState{}
 
 	if genesis[stakingtypes.ModuleName] != nil {
 		// If staking module genesis already exists
@@ -520,25 +520,25 @@ func (b *Builder) createConsumersLocalClientGenesis() *ibctmtypes.ClientState {
 	)
 }
 
-func (b *Builder) createConsumerGenesis(client *ibctmtypes.ClientState) *consumertypes.GenesisState {
+func (b *Builder) createConsumerGenesis(client *ibctmtypes.ClientState) *ccv.GenesisState {
 	providerConsState := b.provider().LastHeader.ConsensusState()
 
 	valUpdates := tmtypes.TM2PB.ValidatorUpdates(b.provider().Vals)
-	params := consumertypes.NewParams(
+	params := ccv.NewParams(
 		true,
 		1000, // ignore distribution
 		"",   // ignore distribution
 		"",   // ignore distribution
 		ccv.DefaultCCVTimeoutPeriod,
-		consumertypes.DefaultTransferTimeoutPeriod,
-		consumertypes.DefaultConsumerRedistributeFrac,
-		consumertypes.DefaultHistoricalEntries,
+		ccv.DefaultTransferTimeoutPeriod,
+		ccv.DefaultConsumerRedistributeFrac,
+		ccv.DefaultHistoricalEntries,
 		b.initState.UnbondingC,
 		"0", // disable soft opt-out
 		[]string{},
 		[]string{},
 	)
-	return consumertypes.NewInitialGenesisState(client, providerConsState, valUpdates, params)
+	return ccv.NewInitialGenesisState(client, providerConsState, valUpdates, params)
 }
 
 // The state of the data returned is equivalent to the state of two chains
diff --git a/x/ccv/consumer/keeper/relay_test.go b/x/ccv/consumer/keeper/relay_test.go
index 466ba0743e..d681a2fdc4 100644
--- a/x/ccv/consumer/keeper/relay_test.go
+++ b/x/ccv/consumer/keeper/relay_test.go
@@ -26,7 +26,6 @@ import (
 	consumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
 	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	"github.com/cosmos/interchain-security/v3/x/ccv/types"
-	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 // TestOnRecvVSCPacket tests the behavior of OnRecvVSCPacket over various packet scenarios
@@ -124,7 +123,7 @@ func TestOnRecvVSCPacket(t *testing.T) {
 	consumerKeeper.SetProviderChannel(ctx, consumerCCVChannelID)
 
 	// Set module params with custom unbonding period
-	moduleParams := ccvtypes.DefaultParams()
+	moduleParams := types.DefaultParams()
 	moduleParams.UnbondingPeriod = 100 * time.Hour
 	consumerKeeper.SetParams(ctx, moduleParams)
 
@@ -173,7 +172,7 @@ func TestOnRecvVSCPacketDuplicateUpdates(t *testing.T) {
 	consumerKeeper, ctx, ctrl, _ := testkeeper.GetConsumerKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
 	consumerKeeper.SetProviderChannel(ctx, consumerCCVChannelID)
-	consumerKeeper.SetParams(ctx, ccvtypes.DefaultParams())
+	consumerKeeper.SetParams(ctx, types.DefaultParams())
 
 	// Construct packet/data with duplicate val updates for the same pub key
 	cId := crypto.NewCryptoIdentityFromIntSeed(43278947)
@@ -219,7 +218,7 @@ func TestSendPacketsFailure(t *testing.T) {
 	consumerKeeper, ctx, ctrl, mocks := testkeeper.GetConsumerKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
 	consumerKeeper.SetProviderChannel(ctx, "consumerCCVChannelID")
-	consumerKeeper.SetParams(ctx, ccvtypes.DefaultParams())
+	consumerKeeper.SetParams(ctx, types.DefaultParams())
 
 	// Set some pending packets
 	consumerKeeper.AppendPendingPacket(ctx, types.VscMaturedPacket, &types.ConsumerPacketData_VscMaturedPacketData{})
@@ -241,7 +240,7 @@ func TestSendPackets(t *testing.T) {
 	// Keeper setup
 	consumerKeeper, ctx, ctrl, mocks := testkeeper.GetConsumerKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	consumerKeeper.SetProviderChannel(ctx, "consumerCCVChannelID")
-	consumerKeeper.SetParams(ctx, ccvtypes.DefaultParams())
+	consumerKeeper.SetParams(ctx, types.DefaultParams())
 
 	// No slash record should exist
 	_, found := consumerKeeper.GetSlashRecord(ctx)
@@ -472,7 +471,7 @@ func TestSendPacketsDeletion(t *testing.T) {
 	consumerKeeper, ctx, ctrl, mocks := testkeeper.GetConsumerKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
 	consumerKeeper.SetProviderChannel(ctx, "consumerCCVChannelID")
-	consumerKeeper.SetParams(ctx, ccvtypes.DefaultParams())
+	consumerKeeper.SetParams(ctx, types.DefaultParams())
 
 	// Queue two pending packets, vsc matured first
 	consumerKeeper.AppendPendingPacket(ctx, types.VscMaturedPacket, &types.ConsumerPacketData_VscMaturedPacketData{
diff --git a/x/ccv/consumer/types/genesis_test.go b/x/ccv/consumer/types/genesis_test.go
index d75a01610b..453a3aab20 100644
--- a/x/ccv/consumer/types/genesis_test.go
+++ b/x/ccv/consumer/types/genesis_test.go
@@ -85,95 +85,95 @@ func TestValidateInitialGenesisState(t *testing.T) {
 		{
 			"invalid new consumer genesis state: client id not empty",
 			&types.GenesisState{
-				params,
-				"ccvclient",
-				"",
-				true,
-				cs,
-				consensusState,
-				nil,
-				valUpdates,
-				nil,
-				nil,
-				types.ConsumerPacketDataList{},
-				types.LastTransmissionBlockHeight{},
-				false,
+				Params:                      params,
+				ProviderClientId:            "ccvclient",
+				ProviderChannelId:           "",
+				NewChain:                    true,
+				ProviderClientState:         cs,
+				ProviderConsensusState:      consensusState,
+				MaturingPackets:             nil,
+				InitialValSet:               valUpdates,
+				HeightToValsetUpdateId:      nil,
+				OutstandingDowntimeSlashing: nil,
+				PendingConsumerPackets:      types.ConsumerPacketDataList{},
+				LastTransmissionBlockHeight: types.LastTransmissionBlockHeight{},
+				PreCCV:                      false,
 			},
 			true,
 		},
 		{
 			"invalid new consumer genesis state: channel id not empty",
 			&types.GenesisState{
-				params,
-				"",
-				"ccvchannel",
-				true,
-				cs,
-				consensusState,
-				nil,
-				valUpdates,
-				nil,
-				nil,
-				types.ConsumerPacketDataList{},
-				types.LastTransmissionBlockHeight{},
-				false,
+				Params:                      params,
+				ProviderClientId:            "",
+				ProviderChannelId:           "ccvchannel",
+				NewChain:                    true,
+				ProviderClientState:         cs,
+				ProviderConsensusState:      consensusState,
+				MaturingPackets:             nil,
+				InitialValSet:               valUpdates,
+				HeightToValsetUpdateId:      nil,
+				OutstandingDowntimeSlashing: nil,
+				PendingConsumerPackets:      types.ConsumerPacketDataList{},
+				LastTransmissionBlockHeight: types.LastTransmissionBlockHeight{},
+				PreCCV:                      false,
 			},
 			true,
 		},
 		{
 			"invalid new consumer genesis state: non-empty unbonding sequences",
 			&types.GenesisState{
-				params,
-				"",
-				"",
-				true,
-				cs,
-				consensusState,
-				[]types.MaturingVSCPacket{{}},
-				valUpdates,
-				nil,
-				nil,
-				types.ConsumerPacketDataList{},
-				types.LastTransmissionBlockHeight{},
-				false,
+				Params:                      params,
+				ProviderClientId:            "",
+				ProviderChannelId:           "",
+				NewChain:                    true,
+				ProviderClientState:         cs,
+				ProviderConsensusState:      consensusState,
+				MaturingPackets:             []types.MaturingVSCPacket{{}},
+				InitialValSet:               valUpdates,
+				HeightToValsetUpdateId:      nil,
+				OutstandingDowntimeSlashing: nil,
+				PendingConsumerPackets:      types.ConsumerPacketDataList{},
+				LastTransmissionBlockHeight: types.LastTransmissionBlockHeight{},
+				PreCCV:                      false,
 			},
 			true,
 		},
 		{
 			"invalid new consumer genesis state: non-empty last transmission packet",
 			&types.GenesisState{
-				params,
-				"",
-				"",
-				true,
-				cs,
-				consensusState,
-				nil,
-				valUpdates,
-				nil,
-				nil,
-				types.ConsumerPacketDataList{},
-				types.LastTransmissionBlockHeight{Height: 1},
-				false,
+				Params:                      params,
+				ProviderClientId:            "",
+				ProviderChannelId:           "",
+				NewChain:                    true,
+				ProviderClientState:         cs,
+				ProviderConsensusState:      consensusState,
+				MaturingPackets:             nil,
+				InitialValSet:               valUpdates,
+				HeightToValsetUpdateId:      nil,
+				OutstandingDowntimeSlashing: nil,
+				PendingConsumerPackets:      types.ConsumerPacketDataList{},
+				LastTransmissionBlockHeight: types.LastTransmissionBlockHeight{Height: 1},
+				PreCCV:                      false,
 			},
 			true,
 		},
 		{
 			"invalid new consumer genesis state: non-empty pending consumer packets",
 			&types.GenesisState{
-				params,
-				"",
-				"",
-				true,
-				cs,
-				consensusState,
-				nil,
-				valUpdates,
-				nil,
-				nil,
-				types.ConsumerPacketDataList{List: []types.ConsumerPacketData{{}}},
-				types.LastTransmissionBlockHeight{},
-				false,
+				Params:                      params,
+				ProviderClientId:            "",
+				ProviderChannelId:           "",
+				NewChain:                    true,
+				ProviderClientState:         cs,
+				ProviderConsensusState:      consensusState,
+				MaturingPackets:             nil,
+				InitialValSet:               valUpdates,
+				HeightToValsetUpdateId:      nil,
+				OutstandingDowntimeSlashing: nil,
+				PendingConsumerPackets:      types.ConsumerPacketDataList{List: []types.ConsumerPacketData{{}}},
+				LastTransmissionBlockHeight: types.LastTransmissionBlockHeight{},
+				PreCCV:                      false,
 			},
 			true,
 		},
@@ -318,9 +318,9 @@ func TestValidateRestartGenesisState(t *testing.T) {
 		{
 			"valid restart consumer genesis state: maturing packets",
 			types.NewRestartGenesisState("ccvclient", "ccvchannel", []types.MaturingVSCPacket{
-				{1, time.Now().UTC()},
-				{3, time.Now().UTC()},
-				{5, time.Now().UTC()},
+				{VscId: 1, MaturityTime: time.Now().UTC()},
+				{VscId: 3, MaturityTime: time.Now().UTC()},
+				{VscId: 5, MaturityTime: time.Now().UTC()},
 			}, valUpdates, heightToValsetUpdateID, types.ConsumerPacketDataList{},
 				[]types.OutstandingDowntime{{ValidatorConsensusAddress: sdk.ConsAddress(validator.Address.Bytes()).String()}},
 				types.LastTransmissionBlockHeight{}, params),
@@ -334,52 +334,52 @@ func TestValidateRestartGenesisState(t *testing.T) {
 		{
 			"invalid restart consumer genesis state: maturing packet vscId is invalid",
 			types.NewRestartGenesisState("ccvclient", "ccvchannel", []types.MaturingVSCPacket{
-				{0, time.Now().UTC()},
+				{VscId: 0, MaturityTime: time.Now().UTC()},
 			}, valUpdates, nil, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
 		{
 			"invalid restart consumer genesis state: maturing packet time is invalid",
 			types.NewRestartGenesisState("ccvclient", "ccvchannel", []types.MaturingVSCPacket{
-				{1, time.Time{}},
+				{VscId: 1, MaturityTime: time.Time{}},
 			}, valUpdates, nil, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
 		{
 			"invalid restart consumer genesis: client state defined",
 			&types.GenesisState{
-				params,
-				"ccvclient",
-				"ccvchannel",
-				false,
-				cs,
-				nil,
-				nil,
-				valUpdates,
-				nil,
-				nil,
-				types.ConsumerPacketDataList{},
-				types.LastTransmissionBlockHeight{},
-				false,
+				Params:                      params,
+				ProviderClientId:            "ccvclient",
+				ProviderChannelId:           "ccvchannel",
+				NewChain:                    false,
+				ProviderClientState:         cs,
+				ProviderConsensusState:      nil,
+				MaturingPackets:             nil,
+				InitialValSet:               valUpdates,
+				HeightToValsetUpdateId:      nil,
+				OutstandingDowntimeSlashing: nil,
+				PendingConsumerPackets:      types.ConsumerPacketDataList{},
+				LastTransmissionBlockHeight: types.LastTransmissionBlockHeight{},
+				PreCCV:                      false,
 			},
 			true,
 		},
 		{
 			"invalid restart consumer genesis: consensus state defined",
 			&types.GenesisState{
-				params,
-				"ccvclient",
-				"ccvchannel",
-				false,
-				nil,
-				consensusState,
-				nil,
-				valUpdates,
-				nil,
-				nil,
-				types.ConsumerPacketDataList{},
-				types.LastTransmissionBlockHeight{},
-				false,
+				Params:                      params,
+				ProviderClientId:            "ccvclient",
+				ProviderChannelId:           "ccvchannel",
+				NewChain:                    false,
+				ProviderClientState:         nil,
+				ProviderConsensusState:      consensusState,
+				MaturingPackets:             nil,
+				InitialValSet:               valUpdates,
+				HeightToValsetUpdateId:      nil,
+				OutstandingDowntimeSlashing: nil,
+				PendingConsumerPackets:      types.ConsumerPacketDataList{},
+				LastTransmissionBlockHeight: types.LastTransmissionBlockHeight{},
+				PreCCV:                      false,
 			},
 			true,
 		},
@@ -391,13 +391,13 @@ func TestValidateRestartGenesisState(t *testing.T) {
 		{
 			"invalid restart consumer genesis state: nil height to validator set id mapping",
 			types.NewRestartGenesisState("ccvclient", "",
-				[]types.MaturingVSCPacket{{1, time.Time{}}}, valUpdates, nil, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
+				[]types.MaturingVSCPacket{{VscId: 1, MaturityTime: time.Time{}}}, valUpdates, nil, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
 		{
 			"invalid restart consumer genesis state: maturing packet defined when handshake is still in progress",
 			types.NewRestartGenesisState("ccvclient", "",
-				[]types.MaturingVSCPacket{{1, time.Time{}}}, valUpdates, heightToValsetUpdateID, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
+				[]types.MaturingVSCPacket{{VscId: 1, MaturityTime: time.Time{}}}, valUpdates, heightToValsetUpdateID, types.ConsumerPacketDataList{}, nil, types.LastTransmissionBlockHeight{}, params),
 			true,
 		},
 		{
diff --git a/x/ccv/provider/keeper/keeper.go b/x/ccv/provider/keeper/keeper.go
index b7fa7a00ff..bebef70c56 100644
--- a/x/ccv/provider/keeper/keeper.go
+++ b/x/ccv/provider/keeper/keeper.go
@@ -25,7 +25,6 @@ import (
 
 	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 	"github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
-	providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
 	ccv "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
@@ -576,7 +575,7 @@ func (k Keeper) GetMaturedUnbondingOps(ctx sdk.Context) (ids []uint64) {
 		return nil
 	}
 
-	var ops providertypes.MaturedUnbondingOps
+	var ops types.MaturedUnbondingOps
 	if err := ops.Unmarshal(bz); err != nil {
 		// An error here would indicate something is very wrong,
 		// the MaturedUnbondingOps are assumed to be correctly serialized in AppendMaturedUnbondingOps.
@@ -591,7 +590,7 @@ func (k Keeper) AppendMaturedUnbondingOps(ctx sdk.Context, ids []uint64) {
 		return
 	}
 	existingIds := k.GetMaturedUnbondingOps(ctx)
-	maturedOps := providertypes.MaturedUnbondingOps{
+	maturedOps := types.MaturedUnbondingOps{
 		Ids: append(existingIds, ids...),
 	}
 
@@ -815,7 +814,7 @@ func (k Keeper) DeleteInitChainHeight(ctx sdk.Context, chainID string) {
 
 // GetPendingVSCPackets returns the list of pending ValidatorSetChange packets stored under chain ID
 func (k Keeper) GetPendingVSCPackets(ctx sdk.Context, chainID string) []ccv.ValidatorSetChangePacketData {
-	var packets providertypes.ValidatorSetChangePackets
+	var packets types.ValidatorSetChangePackets
 
 	store := ctx.KVStore(k.storeKey)
 	bz := store.Get(types.PendingVSCsKey(chainID))
@@ -836,7 +835,7 @@ func (k Keeper) AppendPendingVSCPackets(ctx sdk.Context, chainID string, newPack
 	pds := append(k.GetPendingVSCPackets(ctx, chainID), newPackets...)
 
 	store := ctx.KVStore(k.storeKey)
-	packets := providertypes.ValidatorSetChangePackets{List: pds}
+	packets := types.ValidatorSetChangePackets{List: pds}
 	buf, err := packets.Marshal()
 	if err != nil {
 		// An error here would indicate something is very wrong,

From c558f5588a75bb074153b4d0c9988bf28596d65c Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Wed, 16 Aug 2023 08:57:31 -0700
Subject: [PATCH 17/21] update comments, rebuild protos

---
 .../ccv/provider/v1/provider.proto            | 36 -------------------
 .../ccv/v1/shared_consumer.proto              |  4 +++
 x/ccv/provider/types/provider.pb.go           | 36 -------------------
 x/ccv/types/shared_consumer.pb.go             |  4 +++
 4 files changed, 8 insertions(+), 72 deletions(-)

diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto
index 2fb52671f3..9423e1f924 100644
--- a/proto/interchain_security/ccv/provider/v1/provider.proto
+++ b/proto/interchain_security/ccv/provider/v1/provider.proto
@@ -25,8 +25,6 @@ import "cosmos/base/v1beta1/coin.proto";
 // chain are expected to validate the consumer chain at spawn time or get
 // slashed. It is recommended that spawn time occurs after the proposal end
 // time.
-// 
-// Note this type is only used internally to the provider CCV module. 
 message ConsumerAdditionProposal {
   option (gogoproto.goproto_getters) = false;
   option (gogoproto.goproto_stringer) = false;
@@ -92,8 +90,6 @@ message ConsumerAdditionProposal {
 // remove (and stop) a consumer chain. If it passes, all the consumer chain's
 // state is removed from the provider chain. The outstanding unbonding operation
 // funds are released.
-// 
-// Note this type is only used internally to the provider CCV module. 
 message ConsumerRemovalProposal {
   // the title of the proposal
   string title = 1;
@@ -123,8 +119,6 @@ message EquivocationProposal {
 // A persisted queue entry indicating that a slash packet data instance needs to
 // be handled. This type belongs in the "global" queue, to coordinate slash
 // packet handling times between consumers.
-//
-// Soon to be depreicated
 message GlobalSlashEntry {
   // Block time that slash packet was received by provider chain.
   // This field is used for store key iteration ordering.
@@ -144,8 +138,6 @@ message GlobalSlashEntry {
 }
 
 // Params defines the parameters for CCV Provider module
-// 
-// Note this type is only used internally to the provider CCV module. 
 message Params {
   ibc.lightclients.tendermint.v1.ClientState template_client = 1;
   // TrustingPeriodFraction is used to compute the consumer and provider IBC
@@ -185,14 +177,10 @@ message Params {
 
 // SlashAcks contains cons addresses of consumer chain validators
 // successfully slashed on the provider chain. 
-// 
-// Note this type is only used internally to the provider CCV module.
 message SlashAcks { repeated string addresses = 1; }
 
 // ConsumerAdditionProposals holds pending governance proposals on the provider
 // chain to spawn a new chain.
-// 
-// Note this type is only used internally to the provider CCV module.
 message ConsumerAdditionProposals {
   // proposals waiting for spawn_time to pass
   repeated ConsumerAdditionProposal pending = 1;
@@ -200,19 +188,14 @@ message ConsumerAdditionProposals {
 
 // ConsumerRemovalProposals holds pending governance proposals on the provider
 // chain to remove (and stop) a consumer chain.
-// 
-// Note this type is only used internally to the provider CCV module.
 message ConsumerRemovalProposals {
   // proposals waiting for stop_time to pass
   repeated ConsumerRemovalProposal pending = 1;
 }
 
 // AddressList contains a list of consensus addresses
-// 
-// Note this type is only used internally to the provider CCV module.
 message AddressList { repeated bytes addresses = 1; }
 
-// Note this type is only used internally to the provider CCV module.
 message ChannelToChain {
   string channel_id = 1;
   string chain_id = 2;
@@ -220,8 +203,6 @@ message ChannelToChain {
 
 // VscUnbondingOps contains the IDs of unbonding operations that are waiting for
 // at least one VSCMaturedPacket with vscID from a consumer chain
-// 
-// Note this type is only used internally to the provider CCV module  .
 message VscUnbondingOps {
   uint64 vsc_id = 1;
   repeated uint64 unbonding_op_ids = 2;
@@ -229,21 +210,17 @@ message VscUnbondingOps {
 
 // UnbondingOp contains the ids of consumer chains that need to unbond before
 // the unbonding operation with the given ID can unbond
-// 
-// Note this type is only used internally to the provider CCV module.
 message UnbondingOp {
   uint64 id = 1;
   // consumer chains that are still unbonding
   repeated string unbonding_consumer_chains = 2;
 }
 
-// Note this type is only used internally to the provider CCV module.
 message InitTimeoutTimestamp {
   string chain_id = 1;
   uint64 timestamp = 2;
 }
 
-// Note this type is only used internally to the provider CCV module.
 message VscSendTimestamp {
   uint64 vsc_id = 1;
   google.protobuf.Timestamp timestamp = 2
@@ -251,8 +228,6 @@ message VscSendTimestamp {
 }
 
 // ValidatorSetChangePackets is a pb list of ccv.ValidatorSetChangePacketData.
-// 
-// Note this type is only used internally to the provider CCV module.
 message ValidatorSetChangePackets {
   repeated interchain_security.ccv.v1.ValidatorSetChangePacketData list = 1
       [ (gogoproto.nullable) = false ];
@@ -260,13 +235,9 @@ message ValidatorSetChangePackets {
 
 // MaturedUnbondingOps defines a list of ids corresponding to ids of matured
 // unbonding operations.
-// 
-// Note this type is only used internally to the provider CCV module.
 message MaturedUnbondingOps { repeated uint64 ids = 1; }
 
 // ExportedVscSendTimestamps is VscSendTimestamp with chainID info for exporting to genesis
-// 
-// Note this type is only used internally to the provider CCV module.
 message ExportedVscSendTimestamp {
   string chain_id = 1;
   repeated VscSendTimestamp vsc_send_timestamps = 2
@@ -277,7 +248,6 @@ message ExportedVscSendTimestamp {
 // Key assignment section
 //
 
-// Note this type is only used internally to the provider CCV module.
 message KeyAssignmentReplacement {
   bytes provider_addr = 1;
   tendermint.crypto.PublicKey prev_c_key = 2;
@@ -287,8 +257,6 @@ message KeyAssignmentReplacement {
 // Used to serialize the ValidatorConsumerPubKey index from key assignment
 // ValidatorConsumerPubKey: (chainID, providerAddr consAddr) -> consumerKey
 // tmprotocrypto.PublicKey
-//
-// Note this type is only used internally to the provider CCV module.
 message ValidatorConsumerPubKey {
   string chain_id = 1;
   bytes provider_addr = 2;
@@ -298,8 +266,6 @@ message ValidatorConsumerPubKey {
 // Used to serialize the ValidatorConsumerAddr index from key assignment
 // ValidatorByConsumerAddr: (chainID, consumerAddr consAddr) -> providerAddr
 // consAddr
-// 
-// Note this type is only used internally to the provider CCV module.
 message ValidatorByConsumerAddr {
   string chain_id = 1;
   bytes consumer_addr = 2;
@@ -308,8 +274,6 @@ message ValidatorByConsumerAddr {
 
 // Used to serialize the ConsumerAddrsToPrune index from key assignment
 // ConsumerAddrsToPrune: (chainID, vscID uint64) -> consumerAddrs AddressList
-//
-// Note this type is only used internally to the provider CCV module.
 message ConsumerAddrsToPrune {
   string chain_id = 1;
   uint64 vsc_id = 2;
diff --git a/proto/interchain_security/ccv/v1/shared_consumer.proto b/proto/interchain_security/ccv/v1/shared_consumer.proto
index 46ea286e3d..825a84e346 100644
--- a/proto/interchain_security/ccv/v1/shared_consumer.proto
+++ b/proto/interchain_security/ccv/v1/shared_consumer.proto
@@ -21,6 +21,8 @@ import "google/protobuf/timestamp.proto";
 // 
 // Note this type is referenced in both the consumer and provider CCV modules,
 // and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis. 
+//
+// TODO: Rename to ConsumerParams. See https://github.com/cosmos/interchain-security/issues/1206
 message Params {
     // TODO: Remove enabled flag and find a better way to setup integration tests
     // See: https://github.com/cosmos/interchain-security/issues/339
@@ -81,6 +83,8 @@ message Params {
 // 
 // Note this type is referenced in both the consumer and provider CCV modules,
 // and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis.
+// 
+// TODO: Rename to ConsumerGenesisState. See https://github.com/cosmos/interchain-security/issues/1206
 message GenesisState {
     Params params = 1 [ (gogoproto.nullable) = false ];
     string provider_client_id = 2; // empty for a new chain, filled in on restart.
diff --git a/x/ccv/provider/types/provider.pb.go b/x/ccv/provider/types/provider.pb.go
index 67cf9f166d..398010307c 100644
--- a/x/ccv/provider/types/provider.pb.go
+++ b/x/ccv/provider/types/provider.pb.go
@@ -39,8 +39,6 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // chain are expected to validate the consumer chain at spawn time or get
 // slashed. It is recommended that spawn time occurs after the proposal end
 // time.
-//
-// Note this type is only used internally to the provider CCV module.
 type ConsumerAdditionProposal struct {
 	// the title of the proposal
 	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
@@ -130,8 +128,6 @@ var xxx_messageInfo_ConsumerAdditionProposal proto.InternalMessageInfo
 // remove (and stop) a consumer chain. If it passes, all the consumer chain's
 // state is removed from the provider chain. The outstanding unbonding operation
 // funds are released.
-//
-// Note this type is only used internally to the provider CCV module.
 type ConsumerRemovalProposal struct {
 	// the title of the proposal
 	Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
@@ -275,8 +271,6 @@ func (m *EquivocationProposal) GetEquivocations() []*types1.Equivocation {
 // A persisted queue entry indicating that a slash packet data instance needs to
 // be handled. This type belongs in the "global" queue, to coordinate slash
 // packet handling times between consumers.
-//
-// Soon to be depreicated
 type GlobalSlashEntry struct {
 	// Block time that slash packet was received by provider chain.
 	// This field is used for store key iteration ordering.
@@ -356,8 +350,6 @@ func (m *GlobalSlashEntry) GetProviderValConsAddr() []byte {
 }
 
 // Params defines the parameters for CCV Provider module
-//
-// Note this type is only used internally to the provider CCV module.
 type Params struct {
 	TemplateClient *_07_tendermint.ClientState `protobuf:"bytes,1,opt,name=template_client,json=templateClient,proto3" json:"template_client,omitempty"`
 	// TrustingPeriodFraction is used to compute the consumer and provider IBC
@@ -484,8 +476,6 @@ func (m *Params) GetConsumerRewardDenomRegistrationFee() types2.Coin {
 
 // SlashAcks contains cons addresses of consumer chain validators
 // successfully slashed on the provider chain.
-//
-// Note this type is only used internally to the provider CCV module.
 type SlashAcks struct {
 	Addresses []string `protobuf:"bytes,1,rep,name=addresses,proto3" json:"addresses,omitempty"`
 }
@@ -532,8 +522,6 @@ func (m *SlashAcks) GetAddresses() []string {
 
 // ConsumerAdditionProposals holds pending governance proposals on the provider
 // chain to spawn a new chain.
-//
-// Note this type is only used internally to the provider CCV module.
 type ConsumerAdditionProposals struct {
 	// proposals waiting for spawn_time to pass
 	Pending []*ConsumerAdditionProposal `protobuf:"bytes,1,rep,name=pending,proto3" json:"pending,omitempty"`
@@ -581,8 +569,6 @@ func (m *ConsumerAdditionProposals) GetPending() []*ConsumerAdditionProposal {
 
 // ConsumerRemovalProposals holds pending governance proposals on the provider
 // chain to remove (and stop) a consumer chain.
-//
-// Note this type is only used internally to the provider CCV module.
 type ConsumerRemovalProposals struct {
 	// proposals waiting for stop_time to pass
 	Pending []*ConsumerRemovalProposal `protobuf:"bytes,1,rep,name=pending,proto3" json:"pending,omitempty"`
@@ -629,8 +615,6 @@ func (m *ConsumerRemovalProposals) GetPending() []*ConsumerRemovalProposal {
 }
 
 // AddressList contains a list of consensus addresses
-//
-// Note this type is only used internally to the provider CCV module.
 type AddressList struct {
 	Addresses [][]byte `protobuf:"bytes,1,rep,name=addresses,proto3" json:"addresses,omitempty"`
 }
@@ -675,7 +659,6 @@ func (m *AddressList) GetAddresses() [][]byte {
 	return nil
 }
 
-// Note this type is only used internally to the provider CCV module.
 type ChannelToChain struct {
 	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	ChainId   string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
@@ -730,8 +713,6 @@ func (m *ChannelToChain) GetChainId() string {
 
 // VscUnbondingOps contains the IDs of unbonding operations that are waiting for
 // at least one VSCMaturedPacket with vscID from a consumer chain
-//
-// Note this type is only used internally to the provider CCV module  .
 type VscUnbondingOps struct {
 	VscId          uint64   `protobuf:"varint,1,opt,name=vsc_id,json=vscId,proto3" json:"vsc_id,omitempty"`
 	UnbondingOpIds []uint64 `protobuf:"varint,2,rep,packed,name=unbonding_op_ids,json=unbondingOpIds,proto3" json:"unbonding_op_ids,omitempty"`
@@ -786,8 +767,6 @@ func (m *VscUnbondingOps) GetUnbondingOpIds() []uint64 {
 
 // UnbondingOp contains the ids of consumer chains that need to unbond before
 // the unbonding operation with the given ID can unbond
-//
-// Note this type is only used internally to the provider CCV module.
 type UnbondingOp struct {
 	Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
 	// consumer chains that are still unbonding
@@ -841,7 +820,6 @@ func (m *UnbondingOp) GetUnbondingConsumerChains() []string {
 	return nil
 }
 
-// Note this type is only used internally to the provider CCV module.
 type InitTimeoutTimestamp struct {
 	ChainId   string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
 	Timestamp uint64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
@@ -894,7 +872,6 @@ func (m *InitTimeoutTimestamp) GetTimestamp() uint64 {
 	return 0
 }
 
-// Note this type is only used internally to the provider CCV module.
 type VscSendTimestamp struct {
 	VscId     uint64    `protobuf:"varint,1,opt,name=vsc_id,json=vscId,proto3" json:"vsc_id,omitempty"`
 	Timestamp time.Time `protobuf:"bytes,2,opt,name=timestamp,proto3,stdtime" json:"timestamp"`
@@ -948,8 +925,6 @@ func (m *VscSendTimestamp) GetTimestamp() time.Time {
 }
 
 // ValidatorSetChangePackets is a pb list of ccv.ValidatorSetChangePacketData.
-//
-// Note this type is only used internally to the provider CCV module.
 type ValidatorSetChangePackets struct {
 	List []types3.ValidatorSetChangePacketData `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
 }
@@ -996,8 +971,6 @@ func (m *ValidatorSetChangePackets) GetList() []types3.ValidatorSetChangePacketD
 
 // MaturedUnbondingOps defines a list of ids corresponding to ids of matured
 // unbonding operations.
-//
-// Note this type is only used internally to the provider CCV module.
 type MaturedUnbondingOps struct {
 	Ids []uint64 `protobuf:"varint,1,rep,packed,name=ids,proto3" json:"ids,omitempty"`
 }
@@ -1043,8 +1016,6 @@ func (m *MaturedUnbondingOps) GetIds() []uint64 {
 }
 
 // ExportedVscSendTimestamps is VscSendTimestamp with chainID info for exporting to genesis
-//
-// Note this type is only used internally to the provider CCV module.
 type ExportedVscSendTimestamp struct {
 	ChainId           string             `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
 	VscSendTimestamps []VscSendTimestamp `protobuf:"bytes,2,rep,name=vsc_send_timestamps,json=vscSendTimestamps,proto3" json:"vsc_send_timestamps"`
@@ -1097,7 +1068,6 @@ func (m *ExportedVscSendTimestamp) GetVscSendTimestamps() []VscSendTimestamp {
 	return nil
 }
 
-// Note this type is only used internally to the provider CCV module.
 type KeyAssignmentReplacement struct {
 	ProviderAddr []byte            `protobuf:"bytes,1,opt,name=provider_addr,json=providerAddr,proto3" json:"provider_addr,omitempty"`
 	PrevCKey     *crypto.PublicKey `protobuf:"bytes,2,opt,name=prev_c_key,json=prevCKey,proto3" json:"prev_c_key,omitempty"`
@@ -1161,8 +1131,6 @@ func (m *KeyAssignmentReplacement) GetPower() int64 {
 // Used to serialize the ValidatorConsumerPubKey index from key assignment
 // ValidatorConsumerPubKey: (chainID, providerAddr consAddr) -> consumerKey
 // tmprotocrypto.PublicKey
-//
-// Note this type is only used internally to the provider CCV module.
 type ValidatorConsumerPubKey struct {
 	ChainId      string            `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
 	ProviderAddr []byte            `protobuf:"bytes,2,opt,name=provider_addr,json=providerAddr,proto3" json:"provider_addr,omitempty"`
@@ -1226,8 +1194,6 @@ func (m *ValidatorConsumerPubKey) GetConsumerKey() *crypto.PublicKey {
 // Used to serialize the ValidatorConsumerAddr index from key assignment
 // ValidatorByConsumerAddr: (chainID, consumerAddr consAddr) -> providerAddr
 // consAddr
-//
-// Note this type is only used internally to the provider CCV module.
 type ValidatorByConsumerAddr struct {
 	ChainId      string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
 	ConsumerAddr []byte `protobuf:"bytes,2,opt,name=consumer_addr,json=consumerAddr,proto3" json:"consumer_addr,omitempty"`
@@ -1290,8 +1256,6 @@ func (m *ValidatorByConsumerAddr) GetProviderAddr() []byte {
 
 // Used to serialize the ConsumerAddrsToPrune index from key assignment
 // ConsumerAddrsToPrune: (chainID, vscID uint64) -> consumerAddrs AddressList
-//
-// Note this type is only used internally to the provider CCV module.
 type ConsumerAddrsToPrune struct {
 	ChainId       string       `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
 	VscId         uint64       `protobuf:"varint,2,opt,name=vsc_id,json=vscId,proto3" json:"vsc_id,omitempty"`
diff --git a/x/ccv/types/shared_consumer.pb.go b/x/ccv/types/shared_consumer.pb.go
index 8b81888b3c..4cf8860269 100644
--- a/x/ccv/types/shared_consumer.pb.go
+++ b/x/ccv/types/shared_consumer.pb.go
@@ -35,6 +35,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 //
 // Note this type is referenced in both the consumer and provider CCV modules,
 // and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis.
+//
+// TODO: Rename to ConsumerParams. See https://github.com/cosmos/interchain-security/issues/1206
 type Params struct {
 	// TODO: Remove enabled flag and find a better way to setup integration tests
 	// See: https://github.com/cosmos/interchain-security/issues/339
@@ -200,6 +202,8 @@ func (m *Params) GetProviderRewardDenoms() []string {
 //
 // Note this type is referenced in both the consumer and provider CCV modules,
 // and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis.
+//
+// TODO: Rename to ConsumerGenesisState. See https://github.com/cosmos/interchain-security/issues/1206
 type GenesisState struct {
 	Params            Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
 	ProviderClientId  string `protobuf:"bytes,2,opt,name=provider_client_id,json=providerClientId,proto3" json:"provider_client_id,omitempty"`

From 7986c99b3b49b7603590607e9a026a109dd5eecc Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Fri, 18 Aug 2023 10:48:43 -0700
Subject: [PATCH 18/21] change ccv.go to wire.go, and test file

---
 x/ccv/types/{ccv.go => wire.go}           | 0
 x/ccv/types/{ccv_test.go => wire_test.go} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename x/ccv/types/{ccv.go => wire.go} (100%)
 rename x/ccv/types/{ccv_test.go => wire_test.go} (100%)

diff --git a/x/ccv/types/ccv.go b/x/ccv/types/wire.go
similarity index 100%
rename from x/ccv/types/ccv.go
rename to x/ccv/types/wire.go
diff --git a/x/ccv/types/ccv_test.go b/x/ccv/types/wire_test.go
similarity index 100%
rename from x/ccv/types/ccv_test.go
rename to x/ccv/types/wire_test.go

From 1674152eb664d5e0319ce6ba3ea820c54edae088 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Mon, 21 Aug 2023 13:30:12 -0700
Subject: [PATCH 19/21] consistent comment

---
 proto/interchain_security/ccv/v1/wire.proto | 2 +-
 x/ccv/types/wire.pb.go                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/proto/interchain_security/ccv/v1/wire.proto b/proto/interchain_security/ccv/v1/wire.proto
index a188117033..27735eed7a 100644
--- a/proto/interchain_security/ccv/v1/wire.proto
+++ b/proto/interchain_security/ccv/v1/wire.proto
@@ -108,7 +108,7 @@ message SlashPacketDataV1 {
 }
 
 // InfractionType indicates the infraction type a validator commited.
-// NOTE: ccv.InfractionType to maintain compatibility between ICS versions
+// Note ccv.InfractionType to maintain compatibility between ICS versions
 // using different versions of the cosmos-sdk and ibc-go modules.
 enum InfractionType {
   option (gogoproto.goproto_enum_prefix) = false;
diff --git a/x/ccv/types/wire.pb.go b/x/ccv/types/wire.pb.go
index 77f7b7454d..82768cf805 100644
--- a/x/ccv/types/wire.pb.go
+++ b/x/ccv/types/wire.pb.go
@@ -58,7 +58,7 @@ func (ConsumerPacketDataType) EnumDescriptor() ([]byte, []int) {
 }
 
 // InfractionType indicates the infraction type a validator commited.
-// NOTE: ccv.InfractionType to maintain compatibility between ICS versions
+// Note ccv.InfractionType to maintain compatibility between ICS versions
 // using different versions of the cosmos-sdk and ibc-go modules.
 type InfractionType int32
 

From 124803a95e5246bba5134baaf2378411a5b0053e Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Mon, 21 Aug 2023 13:33:10 -0700
Subject: [PATCH 20/21] Update wire.proto

---
 proto/interchain_security/ccv/v1/wire.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proto/interchain_security/ccv/v1/wire.proto b/proto/interchain_security/ccv/v1/wire.proto
index 27735eed7a..57dcbc8847 100644
--- a/proto/interchain_security/ccv/v1/wire.proto
+++ b/proto/interchain_security/ccv/v1/wire.proto
@@ -11,7 +11,7 @@ import "tendermint/abci/types.proto";
 
 //
 // Note any type defined in this file is used by both the consumer and provider
-// AND SENT OVER THE WIRE. Ideally these schemas should never change, or at least 
+// AND SENT OVER THE WIRE via a ccv channel. Ideally these schemas should never change, or at least 
 // be backwards compatible if ever changed. 
 // 
 

From 065c2cd3ad0581aae39c8acd2ef0016ea6a44e8c Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Tue, 22 Aug 2023 08:55:19 -0700
Subject: [PATCH 21/21] example alias diff

---
 x/ccv/consumer/keeper/params.go | 40 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/x/ccv/consumer/keeper/params.go b/x/ccv/consumer/keeper/params.go
index 1c0842d76b..770edf229e 100644
--- a/x/ccv/consumer/keeper/params.go
+++ b/x/ccv/consumer/keeper/params.go
@@ -6,13 +6,13 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	types "github.com/cosmos/interchain-security/v3/x/ccv/types"
+	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 )
 
 // GetParams returns the params for the consumer ccv module
 // NOTE: it is different from the GetParams method which is required to implement StakingKeeper interface
-func (k Keeper) GetConsumerParams(ctx sdk.Context) types.Params {
-	return types.NewParams(
+func (k Keeper) GetConsumerParams(ctx sdk.Context) ccvtypes.Params {
+	return ccvtypes.NewParams(
 		k.GetEnabled(ctx),
 		k.GetBlocksPerDistributionTransmission(ctx),
 		k.GetDistributionTransmissionChannel(ctx),
@@ -29,7 +29,7 @@ func (k Keeper) GetConsumerParams(ctx sdk.Context) types.Params {
 }
 
 // SetParams sets the paramset for the consumer module
-func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
+func (k Keeper) SetParams(ctx sdk.Context, params ccvtypes.Params) {
 	k.paramStore.SetParamSet(ctx, &params)
 }
 
@@ -44,51 +44,51 @@ func (k Keeper) GetParams(ctx sdk.Context) stakingtypes.Params {
 // GetEnabled returns the enabled flag for the consumer module
 func (k Keeper) GetEnabled(ctx sdk.Context) bool {
 	var enabled bool
-	k.paramStore.Get(ctx, types.KeyEnabled, &enabled)
+	k.paramStore.Get(ctx, ccvtypes.KeyEnabled, &enabled)
 	return enabled
 }
 
 func (k Keeper) GetBlocksPerDistributionTransmission(ctx sdk.Context) int64 {
 	var bpdt int64
-	k.paramStore.Get(ctx, types.KeyBlocksPerDistributionTransmission, &bpdt)
+	k.paramStore.Get(ctx, ccvtypes.KeyBlocksPerDistributionTransmission, &bpdt)
 	return bpdt
 }
 
 func (k Keeper) SetBlocksPerDistributionTransmission(ctx sdk.Context, bpdt int64) {
-	k.paramStore.Set(ctx, types.KeyBlocksPerDistributionTransmission, bpdt)
+	k.paramStore.Set(ctx, ccvtypes.KeyBlocksPerDistributionTransmission, bpdt)
 }
 
 func (k Keeper) GetDistributionTransmissionChannel(ctx sdk.Context) string {
 	var s string
-	k.paramStore.Get(ctx, types.KeyDistributionTransmissionChannel, &s)
+	k.paramStore.Get(ctx, ccvtypes.KeyDistributionTransmissionChannel, &s)
 	return s
 }
 
 func (k Keeper) SetDistributionTransmissionChannel(ctx sdk.Context, channel string) {
-	k.paramStore.Set(ctx, types.KeyDistributionTransmissionChannel, channel)
+	k.paramStore.Set(ctx, ccvtypes.KeyDistributionTransmissionChannel, channel)
 }
 
 func (k Keeper) GetProviderFeePoolAddrStr(ctx sdk.Context) string {
 	var s string
-	k.paramStore.Get(ctx, types.KeyProviderFeePoolAddrStr, &s)
+	k.paramStore.Get(ctx, ccvtypes.KeyProviderFeePoolAddrStr, &s)
 	return s
 }
 
 func (k Keeper) SetProviderFeePoolAddrStr(ctx sdk.Context, addr string) {
-	k.paramStore.Set(ctx, types.KeyProviderFeePoolAddrStr, addr)
+	k.paramStore.Set(ctx, ccvtypes.KeyProviderFeePoolAddrStr, addr)
 }
 
 // GetCCVTimeoutPeriod returns the timeout period for sent ccv related ibc packets
 func (k Keeper) GetCCVTimeoutPeriod(ctx sdk.Context) time.Duration {
 	var p time.Duration
-	k.paramStore.Get(ctx, types.KeyCCVTimeoutPeriod, &p)
+	k.paramStore.Get(ctx, ccvtypes.KeyCCVTimeoutPeriod, &p)
 	return p
 }
 
 // GetTransferTimeoutPeriod returns the timeout period for sent transfer related ibc packets
 func (k Keeper) GetTransferTimeoutPeriod(ctx sdk.Context) time.Duration {
 	var p time.Duration
-	k.paramStore.Get(ctx, types.KeyTransferTimeoutPeriod, &p)
+	k.paramStore.Get(ctx, ccvtypes.KeyTransferTimeoutPeriod, &p)
 	return p
 }
 
@@ -97,25 +97,25 @@ func (k Keeper) GetTransferTimeoutPeriod(ctx sdk.Context) time.Duration {
 // decimal number. For example "0.75" would represent 75%.
 func (k Keeper) GetConsumerRedistributionFrac(ctx sdk.Context) string {
 	var str string
-	k.paramStore.Get(ctx, types.KeyConsumerRedistributionFrac, &str)
+	k.paramStore.Get(ctx, ccvtypes.KeyConsumerRedistributionFrac, &str)
 	return str
 }
 
 // GetHistoricalEntries returns the number of historical info entries to persist in store
 func (k Keeper) GetHistoricalEntries(ctx sdk.Context) int64 {
 	var n int64
-	k.paramStore.Get(ctx, types.KeyHistoricalEntries, &n)
+	k.paramStore.Get(ctx, ccvtypes.KeyHistoricalEntries, &n)
 	return n
 }
 
 // Only used to set an unbonding period in diff tests
 func (k Keeper) SetUnbondingPeriod(ctx sdk.Context, period time.Duration) {
-	k.paramStore.Set(ctx, types.KeyConsumerUnbondingPeriod, period)
+	k.paramStore.Set(ctx, ccvtypes.KeyConsumerUnbondingPeriod, period)
 }
 
 func (k Keeper) GetUnbondingPeriod(ctx sdk.Context) time.Duration {
 	var period time.Duration
-	k.paramStore.Get(ctx, types.KeyConsumerUnbondingPeriod, &period)
+	k.paramStore.Get(ctx, ccvtypes.KeyConsumerUnbondingPeriod, &period)
 	return period
 }
 
@@ -123,18 +123,18 @@ func (k Keeper) GetUnbondingPeriod(ctx sdk.Context) time.Duration {
 // that can opt out of running the consumer chain
 func (k Keeper) GetSoftOptOutThreshold(ctx sdk.Context) string {
 	var str string
-	k.paramStore.Get(ctx, types.KeySoftOptOutThreshold, &str)
+	k.paramStore.Get(ctx, ccvtypes.KeySoftOptOutThreshold, &str)
 	return str
 }
 
 func (k Keeper) GetRewardDenoms(ctx sdk.Context) []string {
 	var denoms []string
-	k.paramStore.Get(ctx, types.KeyRewardDenoms, &denoms)
+	k.paramStore.Get(ctx, ccvtypes.KeyRewardDenoms, &denoms)
 	return denoms
 }
 
 func (k Keeper) GetProviderRewardDenoms(ctx sdk.Context) []string {
 	var denoms []string
-	k.paramStore.Get(ctx, types.KeyProviderRewardDenoms, &denoms)
+	k.paramStore.Get(ctx, ccvtypes.KeyProviderRewardDenoms, &denoms)
 	return denoms
 }