cleaning up

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

@@ -71,9 +71,10 @@ message MsgOptIn {
   string chain_id = 1;
   // the validator address on the provider
   string provider_addr = 2 [ (gogoproto.moretags) = "yaml:\"address\"" ];
-  // the consensus public key to use on the consumer in json string format corresponding to proto-any,
+  // (optional) the consensus public key to use on the consumer in json string format corresponding to proto-any,
   // for example `{"@type":"/cosmos.crypto.ed25519.PubKey","key":"Ui5Gf1+mtWUdH8u3xlmzdKID+F3PK0sfXZ73GZ6q6is="}`
-  string consumerKey = 3;
+  // we can set `consumer_key = ""` if we do not consider the `consumer_key`
+  string consumer_key = 3;
 }
 
 message MsgOptInResponse {}

x/ccv/provider/client/cli/tx.go

@@ -225,12 +225,12 @@ func NewOptInCmd() *cobra.Command {
 
 			providerValAddr := clientCtx.GetFromAddress()
 
-			var consumerPubKey types.MsgOptIn_ConsumerKey
+			var consumerPubKey string
 			if len(args) == 2 {
 				// consumer public key was provided
-				consumerPubKey = types.MsgOptIn_ConsumerKey{ConsumerKey: args[1]}
+				consumerPubKey = args[1]
 			} else {
-				consumerPubKey = types.MsgOptIn_ConsumerKey{}
+				consumerPubKey = ""
 			}
 			msg, err := types.NewMsgOptIn(args[0], sdk.ValAddress(providerValAddr), consumerPubKey)
 

x/ccv/provider/types/codec.go

@@ -11,7 +11,7 @@ import (
 )
 
 // RegisterLegacyAminoCodec registers the necessary x/ibc transfer interfaces and concrete types
-// on the provided `LegacyAmino codec. These types are used for Amino JSON serialization.
+// on the provided LegacyAmino codec. These types are used for Amino JSON serialization.
 func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
 }
 

x/ccv/provider/types/keys.go

@@ -150,15 +150,15 @@ const (
 	TopNBytePrefix
 
 	// OptedInBytePrefix is the byte prefix used when storing for each consumer chain all the opted in validators
-	OptedInBytePrefix = 31
+	OptedInBytePrefix
 
 	// ToBeOptedInBytePrefix is the byte prefix used when storing for each consumer chain the validators that
 	// are about to be opted in
-	ToBeOptedInBytePrefix = 32
+	ToBeOptedInBytePrefix
 
 	// ToBeOptedOutBytePrefix is the byte prefix used when storing for each consumer chain the validators that
 	// are about to be opted out
-	ToBeOptedOutBytePrefix = 33
+	ToBeOptedOutBytePrefix
 
 	// NOTE: DO NOT ADD NEW BYTE PREFIXES HERE WITHOUT ADDING THEM TO getAllKeyPrefixes() IN keys_test.go
 )

x/ccv/provider/types/msg.go

@@ -209,11 +209,11 @@ func (msg MsgSubmitConsumerDoubleVoting) GetSigners() []sdk.AccAddress {
 }
 
 // NewMsgOptIn creates a new NewMsgOptIn instance.
-func NewMsgOptIn(chainID string, providerValidatorAddress sdk.ValAddress, consumerConsensusPubKey MsgOptIn_ConsumerKey) (*MsgOptIn, error) {
+func NewMsgOptIn(chainID string, providerValidatorAddress sdk.ValAddress, consumerConsensusPubKey string) (*MsgOptIn, error) {
 	return &MsgOptIn{
 		ChainId:      chainID,
 		ProviderAddr: providerValidatorAddress.String(),
-		XConsumerKey: &consumerConsensusPubKey,
+		ConsumerKey:  consumerConsensusPubKey,
 	}, nil
 }
 
@@ -253,8 +253,8 @@ func (msg MsgOptIn) ValidateBasic() error {
 		return ErrInvalidProviderAddress
 	}
 
-	if _, ok := msg.XConsumerKey.(*MsgOptIn_ConsumerKey); ok {
-		if _, _, err := ParseConsumerKeyFromJson(msg.GetConsumerKey()); err != nil {
+	if msg.ConsumerKey != "" {
+		if _, _, err := ParseConsumerKeyFromJson(msg.ConsumerKey); err != nil {
 			return ErrInvalidConsumerConsensusPubKey
 		}
 	}