fix: rebase

Author: n2p5

.gitignore

@@ -12,3 +12,6 @@ build/
 # docusaurus versioned docs created during build
 docs/versioned_docs
 docs/versioned_sidebars
+
+# Go test binaries
+*.test

proto/interchain_security/ccv/consumer/v1/consumer.proto

@@ -28,9 +28,8 @@ message CrossChainValidator {
     (gogoproto.moretags) = "yaml:\"consensus_pubkey\""
   ];
 
-  // !!! DEPRECATED !!! opted_out is deprecated because after the introduction
-  // of Partial Set Security (PSS) we removed the soft opt-out feature.
-  bool opted_out = 4 [ deprecated = true ];
+  // Field 4 reserved for previously used opted_out field
+  reserved 4;
 }
 
 // A record storing the state of a slash packet sent to the provider chain

proto/interchain_security/ccv/provider/v1/provider.proto

@@ -16,6 +16,10 @@ import "cosmos/base/v1beta1/coin.proto";
 import "cosmos_proto/cosmos.proto";
 import "amino/amino.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.
 //
 // Note any type defined in this file is ONLY used internally to the provider
 // CCV module. These schemas can change with proper consideration of
@@ -88,32 +92,6 @@ message ConsumerAdditionProposal {
   // chain. it is most relevant for chains performing a sovereign to consumer
   // changeover in order to maintain the existing ibc transfer channel
   string distribution_transmission_channel = 14;
-  // Corresponds to the percentage of validators that have to validate the chain
-  // under the Top N case. For example, 53 corresponds to a Top 53% chain,
-  // meaning that the top 53% provider validators by voting power have to
-  // validate the proposed consumer chain. top_N can either be 0 or any value in
-  // [50, 100]. A chain can join with top_N == 0 as an Opt In chain, or with
-  // top_N ∈ [50, 100] as a Top N chain.
-  uint32 top_N = 15;
-  // Corresponds to the maximum power (percentage-wise) a validator can have on
-  // the consumer chain. For instance, if `validators_power_cap` is set to 32,
-  // it means that no validator can have more than 32% of the voting power on
-  // the consumer chain. Note that this might not be feasible. For example,
-  // think of a consumer chain with only 5 validators and with
-  // `validators_power_cap` set to 10%. In such a scenario, at least one
-  // validator would need to have more than 20% of the total voting power.
-  // Therefore, `validators_power_cap` operates on a best-effort basis.
-  uint32 validators_power_cap = 16;
-  // Corresponds to the maximum number of validators that can validate a
-  // consumer chain. Only applicable to Opt In chains. Setting
-  // `validator_set_cap` on a Top N chain is a no-op.
-  uint32 validator_set_cap = 17;
-  // Corresponds to a list of provider consensus addresses of validators that
-  // are the ONLY ones that can validate the consumer chain.
-  repeated string allowlist = 18;
-  // Corresponds to a list of provider consensus addresses of validators that
-  // CANNOT validate the consumer chain.
-  repeated string denylist = 19;
 }
 
 // ConsumerRemovalProposal is a governance proposal on the provider chain to
@@ -136,6 +114,9 @@ message ConsumerRemovalProposal {
       [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ];
 }
 
+// ConsumerModificationProposal is a governance proposal on the provider chain
+// to modify parameters of a running consumer chain. If it passes, the consumer
+// chain's state is updated to take into account the newest params.
 // ConsumerModificationProposal is a governance proposal on the provider chain
 // to modify parameters of a running consumer chain. If it passes, the consumer
 // chain's state is updated to take into account the newest params.
@@ -146,41 +127,19 @@ message ConsumerModificationProposal {
   string description = 2;
   // the chain-id of the consumer chain to be modified
   string chain_id = 3;
-  // Corresponds to the percentage of validators that have to validate the chain
-  // under the Top N case. For example, 53 corresponds to a Top 53% chain,
-  // meaning that the top 53% provider validators by voting power have to
-  // validate the proposed consumer chain. top_N can either be 0 or any value in
-  // [50, 100]. A chain can join with top_N == 0 as an Opt In chain, or with
-  // top_N ∈ [50, 100] as a Top N chain.
-  uint32 top_N = 4;
-  // Corresponds to the maximum power (percentage-wise) a validator can have on
-  // the consumer chain. For instance, if `validators_power_cap` is set to 32,
-  // it means that no validator can have more than 32% of the voting power on
-  // the consumer chain. Note that this might not be feasible. For example,
-  // think of a consumer chain with only 5 validators and with
-  // `validators_power_cap` set to 10%. In such a scenario, at least one
-  // validator would need to have more than 20% of the total voting power.
-  // Therefore, `validators_power_cap` operates on a best-effort basis.
-  uint32 validators_power_cap = 5;
-  // Corresponds to the maximum number of validators that can validate a
-  // consumer chain. Only applicable to Opt In chains. Setting
-  // `validator_set_cap` on a Top N chain is a no-op.
-  uint32 validator_set_cap = 6;
-  // Corresponds to a list of provider consensus addresses of validators that
-  // are the ONLY ones that can validate the consumer chain.
-  repeated string allowlist = 7;
-  // Corresponds to a list of provider consensus addresses of validators that
-  // CANNOT validate the consumer chain.
-  repeated string denylist = 8;
 }
 
 // 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.
+//
+// This type is only used internally to the consumer CCV module.
 // WARNING: This message is deprecated now that equivocations can be submitted
 // and verified automatically on the provider. (see SubmitConsumerDoubleVoting
 // in proto/interchain-security/ccv/provider/v1/tx.proto).
+// and verified automatically on the provider. (see SubmitConsumerDoubleVoting
+// in proto/interchain-security/ccv/provider/v1/tx.proto).
 message EquivocationProposal {
   option deprecated = true;
   // the title of the proposal
@@ -268,13 +227,16 @@ message Params {
   // The number of blocks that comprise an epoch.
   int64 blocks_per_epoch = 10;
 
+  // The number of epochs a validator has to validate a consumer chain in order
+  // to start receiving rewards from that chain.
   // The number of epochs a validator has to validate a consumer chain in order
   // to start receiving rewards from that chain.
   int64 number_of_epochs_to_start_receiving_rewards = 11;
 }
 
 // SlashAcks contains cons addresses of consumer chain validators
 // successfully slashed on the provider chain.
+// successfully slashed on the provider chain.
 message SlashAcks { repeated string addresses = 1; }
 
 // ConsumerAdditionProposals holds pending governance proposals on the provider
@@ -336,12 +298,15 @@ message ValidatorSetChangePackets {
 // unbonding operations.
 message MaturedUnbondingOps { repeated uint64 ids = 1; }
 
+// ExportedVscSendTimestamps is VscSendTimestamp with chainID info for exporting
+// to genesis
 // ExportedVscSendTimestamps is VscSendTimestamp with chainID info for exporting
 // to genesis
 message ExportedVscSendTimestamp {
   string chain_id = 1;
   repeated VscSendTimestamp vsc_send_timestamps = 2
       [ (gogoproto.nullable) = false ];
+      [ (gogoproto.nullable) = false ];
 }
 
 //
@@ -380,6 +345,9 @@ message ConsumerAddrsToPrune {
   AddressList consumer_addrs = 3;
 }
 
+// ConsumerValidator is used to facilitate epoch-based transitions. It contains
+// relevant info for a validator that is expected to validate on a consumer
+// chain during an epoch.
 // ConsumerValidator is used to facilitate epoch-based transitions. It contains
 // relevant info for a validator that is expected to validate on a consumer
 // chain during an epoch.
@@ -396,13 +364,22 @@ message ConsumerValidator {
   // height of the validator SHOULD remain `H`. This height only resets to a
   // different height if a validator stops being a consumer validator during an
   // epoch and later becomes again a consumer validator.
+  // If a validator becomes a consumer validator at height `H` and is
+  // continuously a consumer validator for all the upcoming epochs, then the
+  // height of the validator SHOULD remain `H`. This height only resets to a
+  // different height if a validator stops being a consumer validator during an
+  // epoch and later becomes again a consumer validator.
   int64 join_height = 4;
 }
 // ConsumerRewardsAllocation stores the rewards allocated by a consumer chain
 // to the consumer rewards pool. It is used to allocate the tokens to the
 // consumer opted-in validators and the community pool during BeginBlock.
+// to the consumer rewards pool. It is used to allocate the tokens to the
+// consumer opted-in validators and the community pool during BeginBlock.
 message ConsumerRewardsAllocation {
   repeated cosmos.base.v1beta1.DecCoin rewards = 1 [
+    (gogoproto.nullable) = false,
+    (amino.dont_omitempty) = true,
     (gogoproto.nullable) = false,
     (amino.dont_omitempty) = true,
     (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins"

proto/interchain_security/ccv/provider/v1/query.proto

@@ -98,35 +98,6 @@ service Query {
     option (google.api.http).get = "/interchain_security/ccv/provider/params";
   }
 
-  // QueryConsumerChainOptedInValidators returns a list of validators consensus
-  // addresses that opted-in to the given consumer chain
-  rpc QueryConsumerChainOptedInValidators(
-      QueryConsumerChainOptedInValidatorsRequest)
-      returns (QueryConsumerChainOptedInValidatorsResponse) {
-    option (google.api.http).get =
-        "/interchain_security/ccv/provider/opted_in_validators/{chain_id}";
-  }
-
-  // QueryConsumerChainsValidatorHasToValidate returns a list of consumer chains
-  // that a given validator must validate
-  rpc QueryConsumerChainsValidatorHasToValidate(
-      QueryConsumerChainsValidatorHasToValidateRequest)
-      returns (QueryConsumerChainsValidatorHasToValidateResponse) {
-    option (google.api.http).get =
-        "/interchain_security/ccv/provider/consumer_chains_per_validator/"
-        "{provider_address}";
-  }
-
-  // QueryValidatorConsumerCommissionRate returns the commission rate a given
-  // validator charges on a given consumer chain
-  rpc QueryValidatorConsumerCommissionRate(
-      QueryValidatorConsumerCommissionRateRequest)
-      returns (QueryValidatorConsumerCommissionRateResponse) {
-    option (google.api.http).get =
-        "/interchain_security/ccv/provider/consumer_commission_rate/{chain_id}/"
-        "{provider_address}";
-  }
-
   // QueryOldestUnconfirmedVsc returns the send timestamp of the oldest
   // unconfirmed VSCPacket for a given chainID
   rpc QueryOldestUnconfirmedVsc(QueryOldestUnconfirmedVscRequest)
@@ -172,25 +143,6 @@ message QueryConsumerChainStopProposalsResponse {
 message Chain {
   string chain_id = 1;
   string client_id = 2;
-  // If chain with `chainID` is a Top-N chain, i.e., enforces at least one
-  // validator to validate chain `chainID`
-  uint32 top_N = 3;
-  // If the chain is a Top-N chain, this is the minimum power required to be in
-  // the top N. Otherwise, this is -1.
-  int64 min_power_in_top_N = 4;
-  // Corresponds to the maximum power (percentage-wise) a validator can have on
-  // the consumer chain.
-  uint32 validators_power_cap = 5;
-  // Corresponds to the maximum number of validators that can validate a
-  // consumer chain. Only applicable to Opt In chains. Setting
-  // `validator_set_cap` on a Top N chain is a no-op.
-  uint32 validator_set_cap = 6;
-  // Corresponds to a list of provider consensus addresses of validators that
-  // are the ONLY ones that can validate the consumer chain.
-  repeated string allowlist = 7;
-  // Corresponds to a list of provider consensus addresses of validators that
-  // CANNOT validate the consumer chain.
-  repeated string denylist = 8;
 }
 
 message QueryValidatorConsumerAddrRequest {
@@ -277,13 +229,6 @@ message QueryParamsResponse {
   Params params = 1 [ (gogoproto.nullable) = false ];
 }
 
-message QueryConsumerChainOptedInValidatorsRequest { string chain_id = 1; }
-
-message QueryConsumerChainOptedInValidatorsResponse {
-  // The consensus addresses of the validators on the provider chain
-  repeated string validators_provider_addresses = 1;
-}
-
 message QueryConsumerValidatorsRequest { string chain_id = 1; }
 
 message QueryConsumerValidatorsValidator {
@@ -299,29 +244,6 @@ message QueryConsumerValidatorsResponse {
   repeated QueryConsumerValidatorsValidator validators = 1;
 }
 
-message QueryConsumerChainsValidatorHasToValidateRequest {
-  // The consensus address of the validator on the provider chain
-  string provider_address = 1 [ (gogoproto.moretags) = "yaml:\"address\"" ];
-}
-
-message QueryConsumerChainsValidatorHasToValidateResponse {
-  repeated string consumer_chain_ids = 1;
-}
-
-message QueryValidatorConsumerCommissionRateRequest {
-  string chain_id = 1;
-  // The consensus address of the validator on the provider chain
-  string provider_address = 2 [ (gogoproto.moretags) = "yaml:\"address\"" ];
-}
-
-message QueryValidatorConsumerCommissionRateResponse {
-  // The rate to charge delegators on the consumer chain, as a fraction
-  string rate = 1 [
-    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
-    (gogoproto.nullable) = false
-  ];
-}
-
 message QueryOldestUnconfirmedVscRequest { string chain_id = 1; }
 
 message QueryOldestUnconfirmedVscResponse {