Key assignment

go.mod

@@ -33,6 +33,7 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/oxyno-zeta/gomock-extra-matcher v1.1.0
 	github.com/regen-network/cosmos-proto v0.3.1
+	github.com/spf13/pflag v1.0.5
 )
 
 require (
@@ -114,7 +115,6 @@ require (
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/spf13/afero v1.8.2 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.13.0 // indirect
 	github.com/subosito/gotenv v1.4.1 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect

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

@@ -9,6 +9,7 @@ import "interchain_security/ccv/v1/ccv.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
@@ -36,6 +37,15 @@ message GenesisState {
   [ (gogoproto.nullable) = false ];
   Params params = 8
   [ (gogoproto.nullable) = false ];
+  // empty for a new chain
+  repeated ValidatorConsumerPubKey validator_consumer_pubkeys = 9
+  [ (gogoproto.nullable) = false ];
+  // empty for a new chain
+  repeated ValidatorByConsumerAddr validators_by_consumer_addr = 10
+  [ (gogoproto.nullable) = false ];
+  // empty for a new chain
+  repeated ConsumerAddrsToPrune consumer_addrs_to_prune = 11
+  [ (gogoproto.nullable) = false ];
 }
 
 // consumer chain
@@ -76,3 +86,27 @@ message ValsetUpdateIdToHeight {
     uint64 valset_update_id = 1;
     uint64 height = 2;
 }
+
+// Used to serialize the ValidatorConsumerPubKey index from key assignment
+// ValidatorConsumerPubKey: (chainID, providerAddr consAddr) -> consumerKey tmprotocrypto.PublicKey
+message ValidatorConsumerPubKey {
+    string chain_id = 1;
+    bytes provider_addr = 2;
+    tendermint.crypto.PublicKey consumer_key = 3;
+}
+
+// Used to serialize the ValidatorConsumerAddr index from key assignment
+// ValidatorByConsumerAddr: (chainID, consumerAddr consAddr) -> providerAddr consAddr
+message ValidatorByConsumerAddr {
+    string chain_id = 1;
+    bytes consumer_addr = 2;
+    bytes provider_addr = 3;
+}
+
+// Used to serialize the ConsumerAddrsToPrune index from key assignment
+// ConsumerAddrsToPrune: (chainID, vscID uint64) -> consumerAddrsToPrune [][]byte
+message ConsumerAddrsToPrune {
+    string chain_id = 1;
+    uint64 vsc_id = 2;
+    repeated bytes consumer_addrs = 3;
+}

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

@@ -110,3 +110,8 @@ message ConsumerRemovalProposals {
   // proposals waiting for stop_time to pass
   repeated ConsumerRemovalProposal pending = 1;
 }
+
+// AddressList contains a list of consensus addresses
+message AddressList {
+  repeated bytes addresses = 1;
+}

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

@@ -39,6 +39,20 @@ service Query {
     option (google.api.http).get =
         "/interchain_security/ccv/provider/consumer_chain_stop_proposals";
   }
+
+  // QueryValidatorConsumerAddr queries the address
+  // assigned by a validator for a consumer chain.
+  rpc QueryValidatorConsumerAddr(QueryValidatorConsumerAddrRequest)
+      returns (QueryValidatorConsumerAddrResponse) {
+    option (google.api.http).get = "/interchain_security/ccv/provider/validator_consumer_addr";
+  }
+
+  // QueryProviderAddr returns the provider chain validator
+  // given a consumer chain validator address
+  rpc QueryValidatorProviderAddr(QueryValidatorProviderAddrRequest)
+      returns (QueryValidatorProviderAddrResponse) {
+    option (google.api.http).get = "/interchain_security/ccv/provider/validator_provider_addr";
+  }
 }
 
 message QueryConsumerGenesisRequest { string chain_id = 1; }
@@ -68,3 +82,33 @@ message Chain {
   string chain_id = 1;
   string client_id = 2;
 }
+
+message QueryValidatorConsumerAddrRequest {
+  option (gogoproto.equal) = false;
+  option (gogoproto.goproto_getters) = false;
+  // The id of the consumer chain
+  string chain_id = 1;
+  // The consensus address of the validator on the provider chain
+  string provider_address = 2
+      [ (gogoproto.moretags) = "yaml:\"address\"" ];
+}
+
+message QueryValidatorConsumerAddrResponse {
+  // The address of the validator on the consumer chain
+  string consumer_address = 1;
+}
+
+message QueryValidatorProviderAddrRequest {
+  option (gogoproto.equal) = false;
+  option (gogoproto.goproto_getters) = false;
+  // The id of the provider chain
+  string chain_id = 1;
+  // The consensus address of the validator on the consumer chain
+  string consumer_address = 2
+      [ (gogoproto.moretags) = "yaml:\"address\"" ];
+}
+
+message QueryValidatorProviderAddrResponse {
+  // The address of the validator on the provider chain
+  string provider_address = 1;
+}

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

@@ -0,0 +1,29 @@
+syntax = "proto3";
+package interchain_security.ccv.provider.v1;
+
+option go_package = "github.com/cosmos/interchain-security/x/ccv/provider/types";
+
+import "google/api/annotations.proto";
+import "gogoproto/gogo.proto";
+import "cosmos_proto/cosmos.proto";
+import "google/protobuf/any.proto";
+
+// Msg defines the Msg service.
+service Msg {
+  rpc AssignConsumerKey(MsgAssignConsumerKey) returns (MsgAssignConsumerKeyResponse);
+}
+
+message MsgAssignConsumerKey {
+  option (gogoproto.equal) = false;
+  option (gogoproto.goproto_getters) = false;
+  // The chain id of the consumer chain to assign a consensus public key to
+  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
+  google.protobuf.Any consumer_key = 3
+      [ (cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey" ];
+}
+
+message MsgAssignConsumerKeyResponse {}

x/ccv/consumer/keeper/genesis.go

@@ -1,16 +1,13 @@
 package keeper
 
 import (
-	"bytes"
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
 	consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types"
 	ccv "github.com/cosmos/interchain-security/x/ccv/types"
 
 	abci "github.com/tendermint/tendermint/abci/types"
-	tmtypes "github.com/tendermint/tendermint/types"
 )
 
 // InitGenesis initializes the CCV consumer state and binds to PortID.
@@ -56,12 +53,6 @@ func (k Keeper) InitGenesis(ctx sdk.Context, state *consumertypes.GenesisState)
 		k.SetHeightValsetUpdateID(ctx, uint64(ctx.BlockHeight()), uint64(0))
 
 	} else {
-		// verify genesis initial valset against the latest consensus state
-		// IBC genesis MUST run before CCV consumer genesis
-		if err := k.verifyGenesisInitValset(ctx, state); err != nil {
-			panic(err)
-		}
-
 		// chain restarts with the CCV channel established
 		if state.ProviderChannelId != "" {
 			// set provider channel ID
@@ -197,30 +188,3 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) (genesis *consumertypes.GenesisSt
 
 	return
 }
-
-// verifyGenesisInitValset verifies the latest consensus state on provider client matches
-// the initial validator set of restarted chain thus
-func (k Keeper) verifyGenesisInitValset(ctx sdk.Context, genState *consumertypes.GenesisState) error {
-
-	consState, ok := k.clientKeeper.GetLatestClientConsensusState(ctx, genState.ProviderClientId)
-	if !ok {
-		return fmt.Errorf("consensus state for provider client not found. MUST run IBC genesis before CCV consumer genesis")
-	}
-	tmConsState, ok := consState.(*ibctmtypes.ConsensusState)
-	if !ok {
-		return fmt.Errorf(fmt.Sprintf("consensus state has wrong type. expected: %T, got: %T", &ibctmtypes.ConsensusState{}, consState))
-	}
-
-	// ensure that initial validator set is same as initial consensus state on provider client.
-	// this will be verified by provider module on channel handshake.
-	vals, err := tmtypes.PB2TM.ValidatorUpdates(genState.InitialValSet)
-	if err != nil {
-		return err
-	}
-	valSet := tmtypes.NewValidatorSet(vals)
-
-	if !bytes.Equal(tmConsState.NextValidatorsHash, valSet.Hash()) {
-		return fmt.Errorf("initial validator set does not match last consensus state of the provider client")
-	}
-	return nil
-}

x/ccv/consumer/types/genesis.go

@@ -1,14 +1,11 @@
 package types
 
 import (
-	"bytes"
-
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
 	ccv "github.com/cosmos/interchain-security/x/ccv/types"
 
 	abci "github.com/tendermint/tendermint/abci/types"
-	tmtypes "github.com/tendermint/tendermint/types"
 )
 
 // NewInitialGenesisState returns a consumer GenesisState for a completely new consumer chain.
@@ -114,17 +111,6 @@ func (gs GenesisState) Validate() error {
 		if gs.LastTransmissionBlockHeight.Height != 0 {
 			return sdkerrors.Wrap(ccv.ErrInvalidGenesis, "last transmission block height must be empty for new chain")
 		}
-
-		// ensure that initial validator set is same as initial consensus state on provider client.
-		// this will be verified by provider module on channel handshake.
-		vals, err := tmtypes.PB2TM.ValidatorUpdates(gs.InitialValSet)
-		if err != nil {
-			return sdkerrors.Wrap(err, "could not convert val updates to validator set")
-		}
-		valSet := tmtypes.NewValidatorSet(vals)
-		if !bytes.Equal(gs.ProviderConsensusState.NextValidatorsHash, valSet.Hash()) {
-			return sdkerrors.Wrap(ccv.ErrInvalidGenesis, "initial validators does not hash to NextValidatorsHash on provider client")
-		}
 	} else {
 		// NOTE: For restart genesis, we will verify initial validator set in InitGenesis.
 		if gs.ProviderClientId == "" {

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

@@ -0,0 +1,36 @@
+package cli
+
+import (
+	flag "github.com/spf13/pflag"
+)
+
+const (
+	FlagConsumerChainId  = "validator"
+	FlagAddressValidator = "validator"
+	FlagConsumerPubKey   = "pubkey"
+	FlagNodeID           = "node-id"
+	FlagIP               = "ip"
+)
+
+// common flagsets to add to various functions
+var (
+	fsValidator = flag.NewFlagSet("", flag.ContinueOnError)
+)
+
+func init() {
+	fsValidator.String(FlagAddressValidator, "", "The Bech32 address of the validator")
+}
+
+// FlagSetPublicKey Returns the flagset for Public Key related operations.
+func FlagSetPublicKey() *flag.FlagSet {
+	fs := flag.NewFlagSet("", flag.ContinueOnError)
+	fs.String(FlagConsumerPubKey, "", "The Protobuf JSON encoded public key to use for the consumer chain")
+	return fs
+}
+
+// FlagSetPublicKey Returns the flagset for Public Key related operations.
+func FlagSetConsumerChainId() *flag.FlagSet {
+	fs := flag.NewFlagSet("", flag.ContinueOnError)
+	fs.String(FlagConsumerChainId, "", "The chainId of the consumer chain")
+	return fs
+}