Merge branch 'main' into dong/TestRemoveZoneAndAssociatedRecords

proto/buf.gen.yaml

@@ -3,7 +3,7 @@ plugins:
   - name: gocosmos
     out: ..
     opt:
-      - plugins=grpc
+    - plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types,
   - name: grpc-gateway
     out: ..
   - name: swagger

proto/quicksilver/interchainstaking/v1/interchainstaking.proto

@@ -4,6 +4,7 @@ package quicksilver.interchainstaking.v1;
 import "cosmos/base/v1beta1/coin.proto";
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
+import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 
 option go_package = "github.com/quicksilver-zone/quicksilver/x/interchainstaking/types";
@@ -34,29 +35,17 @@ message Zone {
   bool liquidity_module = 15;
   uint32 withdrawal_waitgroup = 16;
   bytes ibc_next_validators_hash = 17;
-  uint64 validator_selection_allocation = 18 [
-    (gogoproto.jsontag) = "validator_selection_allocation,string,omitempty"
-  ];
-  uint64 holdings_allocation = 19[
-    (gogoproto.jsontag) = "holdings_allocation,string,omitempty"
-  ];
-  int64 last_epoch_height = 20 [
-    (gogoproto.jsontag) = "last_epoch_height,string,omitempty"
-  ]; // deprecated
+  uint64 validator_selection_allocation = 18 [(gogoproto.jsontag) = "validator_selection_allocation,string,omitempty"];
+  uint64 holdings_allocation = 19 [(gogoproto.jsontag) = "holdings_allocation,string,omitempty"];
+  int64 last_epoch_height = 20 [(gogoproto.jsontag) = "last_epoch_height,string,omitempty"]; // deprecated
   string tvl = 21 [
     (cosmos_proto.scalar) = "cosmos.Dec",
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable) = false
   ];
-  int64 unbonding_period = 22 [
-    (gogoproto.jsontag) = "unbonding_period,string,omitempty"
-  ];
-  int64 messages_per_tx = 23 [
-    (gogoproto.jsontag) = "messages_per_tx,string,omitempty"
-  ];
-  int64 decimals = 24 [
-    (gogoproto.jsontag) = "decimals,string,omitempty"
-  ];
+  int64 unbonding_period = 22 [(gogoproto.jsontag) = "unbonding_period,string,omitempty"];
+  int64 messages_per_tx = 23 [(gogoproto.jsontag) = "messages_per_tx,string,omitempty"];
+  int64 decimals = 24 [(gogoproto.jsontag) = "decimals,string,omitempty"];
   bool unbonding_enabled = 25;
   bool deposits_enabled = 26;
   bool return_to_sender = 27;
@@ -169,6 +158,8 @@ message Validator {
     (gogoproto.nullable) = false,
     (gogoproto.stdtime) = true
   ];
+  // consensus_pubkey is the consensus public key of the validator, as a Protobuf Any.
+  google.protobuf.Any consensus_pubkey = 10 [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey"];
 }
 
 message DelegatorIntent {