refactor: change counterparty structure.

modules/core/keeper/msg_server.go

@@ -148,7 +148,7 @@ func (k *Keeper) IBCSoftwareUpgrade(goCtx context.Context, msg *clienttypes.MsgI
 func (k *Keeper) ProvideCounterparty(goCtx context.Context, msg *packetservertypes.MsgProvideCounterparty) (*packetservertypes.MsgProvideCounterpartyResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	creator, found := k.ClientKeeper.GetCreator(ctx, msg.ClientId)
+	creator, found := k.ClientKeeper.GetCreator(ctx, msg.Counterparty.ClientId)
 	if !found {
 		return nil, errorsmod.Wrap(ibcerrors.ErrUnauthorized, "client creator must be set")
 	}
@@ -157,13 +157,13 @@ func (k *Keeper) ProvideCounterparty(goCtx context.Context, msg *packetservertyp
 		return nil, errorsmod.Wrapf(ibcerrors.ErrUnauthorized, "client creator (%s) must match signer (%s)", creator, msg.Signer)
 	}
 
-	if _, ok := k.PacketServerKeeper.GetCounterparty(ctx, msg.ClientId); ok {
-		return nil, errorsmod.Wrapf(packetservertypes.ErrInvalidCounterparty, "counterparty already exists for client %s", msg.ClientId)
+	if _, ok := k.PacketServerKeeper.GetCounterparty(ctx, msg.ChannelId); ok {
+		return nil, errorsmod.Wrapf(packetservertypes.ErrInvalidCounterparty, "counterparty already exists for client %s", msg.ChannelId)
 	}
 
-	k.PacketServerKeeper.SetCounterparty(ctx, msg.ClientId, msg.Counterparty)
+	k.PacketServerKeeper.SetCounterparty(ctx, msg.ChannelId, msg.Counterparty)
 	// Delete client creator from state as it is not needed after this point.
-	k.ClientKeeper.DeleteCreator(ctx, msg.ClientId)
+	k.ClientKeeper.DeleteCreator(ctx, msg.Counterparty.ClientId)
 
 	return &packetservertypes.MsgProvideCounterpartyResponse{}, nil
 }

modules/core/keeper/msg_server_test.go

@@ -1222,7 +1222,7 @@ func (suite *KeeperTestSuite) TestProvideCounterparty() {
 		{
 			"failure: unknown client identifier",
 			func() {
-				msg.ClientId = ibctesting.InvalidID
+				msg.Counterparty.ClientId = ibctesting.InvalidID
 			},
 			ibcerrors.ErrUnauthorized,
 		},
@@ -1237,7 +1237,7 @@ func (suite *KeeperTestSuite) TestProvideCounterparty() {
 			"failure: counterparty already exists",
 			func() {
 				// set it before handler
-				suite.chainA.App.GetIBCKeeper().PacketServerKeeper.SetCounterparty(suite.chainA.GetContext(), msg.ClientId, msg.Counterparty)
+				suite.chainA.App.GetIBCKeeper().PacketServerKeeper.SetCounterparty(suite.chainA.GetContext(), msg.ChannelId, msg.Counterparty)
 			},
 			packetservertypes.ErrInvalidCounterparty,
 		},

modules/core/packet-server/client/cli/tx.go

@@ -41,7 +41,7 @@ The [counterparty-merkle-path-prefix] is a comma-separated list of hex-encoded s
 
 			counterparty := types.NewCounterparty(counterpartyClientIdentifier, counterpartyMerklePathPrefix)
 			msg := types.MsgProvideCounterparty{
-				ClientId:     clientIdentifier,
+				ChannelId:    clientIdentifier,
 				Counterparty: counterparty,
 				Signer:       clientCtx.GetFromAddress().String(),
 			}

modules/core/packet-server/types/msgs.go

@@ -16,12 +16,12 @@ var (
 )
 
 // NewMsgProvideCounterparty creates a new MsgProvideCounterparty instance
-func NewMsgProvideCounterparty(signer, clientID, counterpartyID string, merklePathPrefix commitmenttypes.MerklePath) *MsgProvideCounterparty {
+func NewMsgProvideCounterparty(signer, channelID, counterpartyID string, merklePathPrefix commitmenttypes.MerklePath) *MsgProvideCounterparty {
 	counterparty := NewCounterparty(counterpartyID, merklePathPrefix)
 
 	return &MsgProvideCounterparty{
 		Signer:       signer,
-		ClientId:     clientID,
+		ChannelId:    channelID,
 		Counterparty: counterparty,
 	}
 }
@@ -32,7 +32,7 @@ func (msg *MsgProvideCounterparty) ValidateBasic() error {
 		return errorsmod.Wrapf(ibcerrors.ErrInvalidAddress, "string could not be parsed as address: %v", err)
 	}
 
-	if err := host.ClientIdentifierValidator(msg.ClientId); err != nil {
+	if err := host.ClientIdentifierValidator(msg.ChannelId); err != nil {
 		return err
 	}
 

modules/core/packet-server/types/msgs_test.go

@@ -32,7 +32,7 @@ func (s *TypesTestSuite) TestMsgProvideCounterpartyValidateBasic() {
 		{
 			"failure: invalid client ID",
 			func() {
-				msg.ClientId = ""
+				msg.ChannelId = ""
 			},
 			host.ErrInvalidID,
 		},

proto/ibc/core/packetserver/v1/counterparty.proto

@@ -9,8 +9,12 @@ import "ibc/core/commitment/v2/commitment.proto";
 
 // Counterparty defines the counterparty for a light client to implement IBC eureka protocol
 message Counterparty {
-  // the client identifier of the counterparty chain
+  // the client identifier of the light client representing the counterparty chain
   string client_id = 1;
-  // the merkle path that all ICS24 paths will be stored under
-  ibc.core.commitment.v2.MerklePath merkle_path_prefix = 2 [(gogoproto.nullable) = false];
+  // the counterparty identifier that must be used by the packet
+  string counterparty_channel = 2;
+  // the key path used to store packet flow messages that the counterparty
+  // will use to send to us. In backwards compatible cases, we will append the channelID and sequence in order to create
+  // the final path.
+  ibc.core.commitment.v2.MerklePath merkle_path_prefix = 3 [(gogoproto.nullable) = false];
 }

proto/ibc/core/packetserver/v1/tx.proto

@@ -25,8 +25,8 @@ message MsgProvideCounterparty {
 
   option (gogoproto.goproto_getters) = false;
 
-  // client unique identifier
-  string client_id = 1;
+  // unique identifier we will use to write all packet messages sent to counterparty
+  string channel_id = 1;
   // counterparty client
   Counterparty counterparty = 2 [(gogoproto.nullable) = false];
   // signer address