fix merge

Author: AdityaSripal

modules/core/04-channel/v2/client/cli/cli.go

@@ -5,14 +5,14 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 
-	"github.com/cosmos/ibc-go/v9/modules/core/packet-server/types"
+	"github.com/cosmos/ibc-go/v9/modules/core/04-channel/v2/types"
 )
 
-// GetQueryCmd returns the query commands for the IBC packet-server.
+// GetQueryCmd returns the query commands for the IBC channel/v2.
 func GetQueryCmd() *cobra.Command {
 	queryCmd := &cobra.Command{
 		Use:                        types.SubModuleName,
-		Short:                      "IBC packet-server query subcommands",
+		Short:                      "IBC channel/v2 query subcommands",
 		DisableFlagParsing:         true,
 		SuggestionsMinimumDistance: 2,
 		RunE:                       client.ValidateCmd,
@@ -25,18 +25,19 @@ func GetQueryCmd() *cobra.Command {
 	return queryCmd
 }
 
-// NewTxCmd returns the command to submit transactions defined for the IBC packet-server.
+// NewTxCmd returns the command to submit transactions defined for IBC channel/v2.
 func NewTxCmd() *cobra.Command {
 	txCmd := &cobra.Command{
 		Use:                        types.SubModuleName,
-		Short:                      "IBC packet-server transaction subcommands",
+		Short:                      "IBC channel/v2 transaction subcommands",
 		DisableFlagParsing:         true,
 		SuggestionsMinimumDistance: 2,
 		RunE:                       client.ValidateCmd,
 	}
 
 	txCmd.AddCommand(
-		newProvideCounterpartyCmd(),
+		newCreateChannelTxCmd(),
+		newProvideCounterpartyTxCmd(),
 	)
 
 	return txCmd

modules/core/04-channel/v2/client/cli/query.go

@@ -13,24 +13,24 @@ import (
 	"github.com/cosmos/ibc-go/v9/modules/core/exported"
 )
 
-// getCmdQueryChannel defines the command to query the client information (creator and channel) for the given client ID.
+// getCmdQueryChannel defines the command to query the channel information (creator and channel) for the given channel ID.
 func getCmdQueryChannel() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "client [client-id]",
-		Short:   "Query the information of a client.",
-		Long:    "Query the client information (creator and channel) for the provided client ID.",
-		Example: fmt.Sprintf("%s query %s %s client [client-id]", version.AppName, exported.ModuleName, types.SubModuleName),
+		Use:     "channel [channel-id]",
+		Short:   "Query the information of a channel.",
+		Long:    "Query the channel information (creator and channel) for the provided channel ID.",
+		Example: fmt.Sprintf("%s query %s %s channel [channel-id]", version.AppName, exported.ModuleName, types.SubModuleName),
 		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientQueryContext(cmd)
 			if err != nil {
 				return err
 			}
-			clientID := args[0]
+			channelID := args[0]
 
 			queryClient := types.NewQueryClient(clientCtx)
 
-			req := &types.QueryChannelRequest{ChannelId: clientID}
+			req := &types.QueryChannelRequest{ChannelId: channelID}
 
 			res, err := queryClient.Channel(cmd.Context(), req)
 			if err != nil {

modules/core/04-channel/v2/client/cli/tx.go

@@ -1,7 +1,9 @@
 package cli
 
 import (
+	"encoding/hex"
 	"fmt"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -11,16 +13,47 @@ import (
 	"github.com/cosmos/cosmos-sdk/version"
 
 	"github.com/cosmos/ibc-go/v9/modules/core/04-channel/v2/types"
+	commitmenttypesv2 "github.com/cosmos/ibc-go/v9/modules/core/23-commitment/types/v2"
 	"github.com/cosmos/ibc-go/v9/modules/core/exported"
 )
 
-// newProvideCounterpartyCmd defines the command to provide the counterparty to an IBC channel.
-func newProvideCounterpartyCmd() *cobra.Command {
+// newCreateChannelTxCmd defines the command to create an IBC channel/v2.
+func newCreateChannelTxCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:     "create-channel [client-identifier] [merkle-path-prefix]",
+		Args:    cobra.ExactArgs(2),
+		Short:   "create an IBC channel/v2",
+		Long:    `Creates an IBC channel/v2 using the client identifier representing the counterparty chain and the hex-encoded merkle path prefix under which the counterparty stores packet flow information.`,
+		Example: fmt.Sprintf("%s tx %s %s create-channel 07-tendermint-0 696263,657572656b61", version.AppName, exported.ModuleName, types.SubModuleName),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			clientID := args[0]
+			merklePathPrefix, err := parseMerklePathPrefix(args[2])
+			if err != nil {
+				return err
+			}
+
+			msg := types.NewMsgCreateChannel(clientID, merklePathPrefix, clientCtx.GetFromAddress().String())
+
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+		},
+	}
+
+	flags.AddTxFlagsToCmd(cmd)
+	return cmd
+}
+
+// newProvideCounterpartyCmd defines the command to provide the counterparty channel identifier to an IBC channel.
+func newProvideCounterpartyTxCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "provide-counterparty [channel-identifier] [counterparty-channel-identifier]",
 		Args:    cobra.ExactArgs(2),
-		Short:   "provide the counterparty channel id to an IBC channel end",
-		Long:    `Provide the counterparty channel id to an IBC channel end specified by its channel ID.`,
+		Short:   "provide the counterparty channel id to an IBC channel",
+		Long:    `Provide the counterparty channel id to an IBC channel specified by its channel ID.`,
 		Example: fmt.Sprintf("%s tx %s %s provide-counterparty channel-0 channel-1", version.AppName, exported.ModuleName, types.SubModuleName),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientTxContext(cmd)
@@ -43,3 +76,18 @@ func newProvideCounterpartyCmd() *cobra.Command {
 	flags.AddTxFlagsToCmd(cmd)
 	return cmd
 }
+
+// parseMerklePathPrefix parses a comma-separated list of hex-encoded strings into a MerklePath.
+func parseMerklePathPrefix(merklePathPrefixString string) (commitmenttypesv2.MerklePath, error) {
+	var keyPath [][]byte
+	hexPrefixes := strings.Split(merklePathPrefixString, ",")
+	for _, hexPrefix := range hexPrefixes {
+		prefix, err := hex.DecodeString(hexPrefix)
+		if err != nil {
+			return commitmenttypesv2.MerklePath{}, fmt.Errorf("invalid hex merkle path prefix: %w", err)
+		}
+		keyPath = append(keyPath, prefix)
+	}
+
+	return commitmenttypesv2.MerklePath{KeyPath: keyPath}, nil
+}

modules/core/04-channel/v2/keeper/events.go

@@ -28,6 +28,11 @@ func EmitTimeoutPacketEvents(ctx context.Context, packet channeltypesv2.Packet)
 	// TODO: https://github.com/cosmos/ibc-go/issues/7386
 }
 
+// EmitWriteAcknowledgementEvents emits events for WriteAcknowledgement.
+func EmitWriteAcknowledgementEvents(ctx context.Context, packet channeltypesv2.Packet, ack channeltypesv2.Acknowledgement) {
+	// TODO: https://github.com/cosmos/ibc-go/issues/7386
+}
+
 // EmitCreateChannelEvent emits a channel create event.
 func (*Keeper) EmitCreateChannelEvent(ctx context.Context, channelID string) {
 	sdkCtx := sdk.UnwrapSDKContext(ctx)

modules/core/04-channel/v2/keeper/grpc_query.go

@@ -16,7 +16,7 @@ import (
 
 var _ types.QueryServer = (*queryServer)(nil)
 
-// queryServer implements the packet-server types.QueryServer interface.
+// queryServer implements the channel/v2 types.QueryServer interface.
 type queryServer struct {
 	*Keeper
 }

modules/core/04-channel/v2/keeper/keeper.go

@@ -79,27 +79,27 @@ func (k *Keeper) GetChannel(ctx context.Context, channelID string) (types.Channe
 	return channel, true
 }
 
-// GetCreator returns the creator of the client.
-func (k *Keeper) GetCreator(ctx context.Context, clientID string) (string, bool) {
+// GetCreator returns the creator of the channel.
+func (k *Keeper) GetCreator(ctx context.Context, channelID string) (string, bool) {
 	sdkCtx := sdk.UnwrapSDKContext(ctx) // TODO: https://github.com/cosmos/ibc-go/issues/5917
-	bz := k.ChannelStore(sdkCtx, clientID).Get([]byte(types.CreatorKey))
+	bz := k.ChannelStore(sdkCtx, channelID).Get([]byte(types.CreatorKey))
 	if len(bz) == 0 {
 		return "", false
 	}
 
 	return string(bz), true
 }
 
-// SetCreator sets the creator of the client.
-func (k *Keeper) SetCreator(ctx context.Context, clientID, creator string) {
+// SetCreator sets the creator of the channel.
+func (k *Keeper) SetCreator(ctx context.Context, channelID, creator string) {
 	sdkCtx := sdk.UnwrapSDKContext(ctx) // TODO: https://github.com/cosmos/ibc-go/issues/5917
-	k.ChannelStore(sdkCtx, clientID).Set([]byte(types.CreatorKey), []byte(creator))
+	k.ChannelStore(sdkCtx, channelID).Set([]byte(types.CreatorKey), []byte(creator))
 }
 
-// DeleteCreator deletes the creator associated with the client.
-func (k *Keeper) DeleteCreator(ctx context.Context, clientID string) {
+// DeleteCreator deletes the creator associated with the channel.
+func (k *Keeper) DeleteCreator(ctx context.Context, channelID string) {
 	sdkCtx := sdk.UnwrapSDKContext(ctx) // TODO: https://github.com/cosmos/ibc-go/issues/5917
-	k.ChannelStore(sdkCtx, clientID).Delete([]byte(types.CreatorKey))
+	k.ChannelStore(sdkCtx, channelID).Delete([]byte(types.CreatorKey))
 }
 
 // GetPacketReceipt returns the packet receipt from the packet receipt path based on the channelID and sequence.
@@ -135,6 +135,16 @@ func (k *Keeper) SetPacketReceipt(ctx context.Context, channelID string, sequenc
 	}
 }
 
+// GetPacketAcknowledgement fetches the packet acknowledgement from the store.
+func (k *Keeper) GetPacketAcknowledgement(ctx context.Context, channelID string, sequence uint64) []byte {
+	store := k.storeService.OpenKVStore(ctx)
+	bz, err := store.Get(hostv2.PacketAcknowledgementKey(channelID, sequence))
+	if err != nil {
+		panic(err)
+	}
+	return bz
+}
+
 // SetPacketAcknowledgement writes the acknowledgement hash under the acknowledgement path
 // This is a public path that is standardized by the IBC V2 specification.
 func (k *Keeper) SetPacketAcknowledgement(ctx context.Context, channelID string, sequence uint64, ackHash []byte) {
@@ -146,13 +156,7 @@ func (k *Keeper) SetPacketAcknowledgement(ctx context.Context, channelID string,
 
 // HasPacketAcknowledgement check if the packet ack hash is already on the store.
 func (k *Keeper) HasPacketAcknowledgement(ctx context.Context, channelID string, sequence uint64) bool {
-	store := k.storeService.OpenKVStore(ctx)
-	found, err := store.Has(hostv2.PacketAcknowledgementKey(channelID, sequence))
-	if err != nil {
-		panic(err)
-	}
-
-	return found
+	return len(k.GetPacketAcknowledgement(ctx, channelID, sequence)) > 0
 }
 
 // GetPacketCommitment returns the packet commitment hash under the commitment path.

modules/core/04-channel/v2/keeper/keeper_test.go

@@ -121,34 +121,33 @@ func (suite *KeeperTestSuite) TestSetChannel() {
 	suite.Require().True(found, "GetChannel does not return channel")
 	suite.Require().Equal(channel, retrievedChannel, "Channel retrieved not equal")
 
-	// Channel not yet stored for another client.
-	retrievedChannel, found = suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.GetChannel(suite.chainA.GetContext(), ibctesting.SecondClientID)
+	// No channel stored under other channel identifier.
+	retrievedChannel, found = suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.GetChannel(suite.chainA.GetContext(), ibctesting.SecondChannelID)
 	suite.Require().False(found, "GetChannel unexpectedly returned a channel")
 	suite.Require().Equal(channeltypes2.Channel{}, retrievedChannel, "Channel retrieved not empty")
 }
 
 func (suite *KeeperTestSuite) TestSetCreator() {
-	clientID := ibctesting.FirstClientID
 	expectedCreator := "test-creator"
 
 	// Set the creator for the client
-	suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.SetCreator(suite.chainA.GetContext(), clientID, expectedCreator)
+	suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.SetCreator(suite.chainA.GetContext(), ibctesting.FirstChannelID, expectedCreator)
 
 	// Retrieve the creator from the store
-	retrievedCreator, found := suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.GetCreator(suite.chainA.GetContext(), clientID)
+	retrievedCreator, found := suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.GetCreator(suite.chainA.GetContext(), ibctesting.FirstChannelID)
 
 	// Verify that the retrieved creator matches the expected creator
 	suite.Require().True(found, "GetCreator did not return stored creator")
 	suite.Require().Equal(expectedCreator, retrievedCreator, "Creator is not retrieved correctly")
 
-	// Verify non stored creator is not found
-	retrievedCreator, found = suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.GetCreator(suite.chainA.GetContext(), ibctesting.SecondClientID)
+	// Verify that the creator is deleted from the store
+	suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.DeleteCreator(suite.chainA.GetContext(), ibctesting.FirstChannelID)
+	retrievedCreator, found = suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.GetCreator(suite.chainA.GetContext(), ibctesting.FirstChannelID)
 	suite.Require().False(found, "GetCreator unexpectedly returned a creator")
 	suite.Require().Empty(retrievedCreator, "Creator is not empty")
 
-	// Verify that the creator is deleted from the store
-	suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.DeleteCreator(suite.chainA.GetContext(), clientID)
-	retrievedCreator, found = suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.GetCreator(suite.chainA.GetContext(), clientID)
+	// Verify non stored creator is not found
+	retrievedCreator, found = suite.chainA.App.GetIBCKeeper().ChannelKeeperV2.GetCreator(suite.chainA.GetContext(), ibctesting.SecondChannelID)
 	suite.Require().False(found, "GetCreator unexpectedly returned a creator")
 	suite.Require().Empty(retrievedCreator, "Creator is not empty")
 }