ibc: core restructure (#7434)

* ibc: protobuf v1

* update codec

* core client

* core connection

* core host

* core commitment

* core port

* core channel

* core ibc module files

* core exported

* core types & simulation

* core spec

* make proto-all

* ibc alias

CHANGELOG.md

@@ -173,7 +173,7 @@ be used to retrieve the actual proposal `Content`. Also the `NewMsgSubmitProposa
 * (x/ibc) [\#5588](https://github.com/cosmos/cosmos-sdk/pull/5588) Add [ICS 024 - Host State Machine Requirements](https://github.com/cosmos/ics/tree/master/spec/ics-024-host-requirements) subpackage to `x/ibc` module.
 * (baseapp) [\#5803](https://github.com/cosmos/cosmos-sdk/pull/5803) Added support for taking state snapshots at regular height intervals, via options `snapshot-interval` and `snapshot-keep-recent`.
 * (store) [\#5803](https://github.com/cosmos/cosmos-sdk/pull/5803) Added `rootmulti.Store` methods for taking and restoring snapshots, based on `iavl.Store` export/import.
-* (x/ibc) [\#5277](https://github.com/cosmos/cosmos-sdk/pull/5277) `x/ibc` changes from IBC alpha. For more details check the the  [`x/ibc/spec`](https://github.com/cosmos/tree/master/x/ibc/spec) directory:
+* (x/ibc) [\#5277](https://github.com/cosmos/cosmos-sdk/pull/5277) `x/ibc` changes from IBC alpha. For more details check the the  [`x/ibc/core/spec`](https://github.com/cosmos/tree/master/x/ibc/core/spec) directory:
   * [ICS 002 - Client Semantics](https://github.com/cosmos/ics/tree/master/spec/ics-002-client-semantics) subpackage
   * [ICS 003 - Connection Semantics](https://github.com/cosmos/ics/blob/master/spec/ics-003-connection-semantics) subpackage
   * [ICS 004 - Channel and Packet Semantics](https://github.com/cosmos/ics/blob/master/spec/ics-004-channel-and-packet-semantics) subpackage

docs/architecture/adr-025-ibc-passive-channels.md

@@ -15,7 +15,7 @@ The current "naive" IBC Relayer strategy currently establishes a single predeter
 
 We wish to expand this "naive" strategy to a "passive" one which detects and relays both channel handshake messages and packets on a given connection, without the need to know each channel in advance of relaying it.
 
-In order to accomplish this, we propose adding more comprehensive events to expose channel metadata for each transaction sent from the `x/ibc/04-channel/keeper/handshake.go` and `x/ibc/04-channel/keeper/packet.go` modules.
+In order to accomplish this, we propose adding more comprehensive events to expose channel metadata for each transaction sent from the `x/ibc/core/04-channel/keeper/handshake.go` and `x/ibc/core/04-channel/keeper/packet.go` modules.
 
 Here is an example of what would be in `ChanOpenInit`:
 

docs/ibc/custom.md

@@ -31,7 +31,7 @@ module correctly.
 ### Implement `IBCModule` Interface and callbacks
 
 The Cosmos SDK expects all IBC modules to implement the [`IBCModule`
-interface](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/05-port/types/module.go). This
+interface](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/05-port/types/module.go). This
 interface contains all of the callbacks IBC expects modules to implement. This section will describe
 the callbacks that are called during channel handshake execution.
 
@@ -342,7 +342,7 @@ Thus, modules must agree on how to encode/decode acknowledgements. The process o
 acknowledgement struct along with encoding and decoding it, is very similar to the packet data
 example above. [ICS 04](https://github.com/cosmos/ics/tree/master/spec/ics-004-channel-and-packet-semantics#acknowledgement-envelope)
 specifies a recommended format for acknowledgements. This acknowledgement type can be imported from
-[channel types](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/04-channel/types).
+[channel types](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/04-channel/types).
 
 #### Acknowledging Packets
 

docs/ibc/integration.md

@@ -120,7 +120,7 @@ IBC needs to know which module is bound to which port so that it can route packe
 appropriate module and call the appropriate callbacks. The port to module name mapping is handled by
 IBC's port `Keeper`. However, the mapping from module name to the relevant callbacks is accomplished
 by the port
-[`Router`](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc//05-port/types/router.go) on the
+[`Router`](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc//core/05-port/types/router.go) on the
 IBC module.
 
 Adding the module routes allows the IBC handler to call the appropriate callback when processing a
@@ -204,7 +204,7 @@ past historical info at any given height in order to verify the light client `Co
 connection handhake.
 
 The IBC module also has
-[`BeginBlock`](https://github.com/cosmos/cosmos-sdk/blob/master/x/ibc/02-client/abci.go) logic as
+[`BeginBlock`](https://github.com/cosmos/cosmos-sdk/blob/master/x/ibc/core/02-client/abci.go) logic as
 well. This is optional as it is only required if your application uses the [localhost
 client](https://github.com/cosmos/ics/blob/master/spec/ics-009-loopback-client) to connect two
 different modules from the same chain.

docs/ibc/overview.md

@@ -26,7 +26,7 @@ module correctly.
 
 ## Components Overview
 
-### [Clients](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/02-client)
+### [Clients](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/02-client)
 
 IBC Clients are light clients (identified by a unique client-id) that track the consensus states of
 other blockchains, along with the proof spec necessary to properly verify proofs against the
@@ -38,7 +38,7 @@ chains. The supported IBC clients are:
 * [Localhost (loopback) client](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/light-clients/09-localhost): Useful for
 testing, simulation and relaying packets to modules on the same application.
 
-### [Connections](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/03-connection)
+### [Connections](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/03-connection)
 
 Connections encapsulate two `ConnectionEnd` objects on two seperate blockchains. Each
 `ConnectionEnd` is associated with a client of the other blockchain (ie counterparty blockchain).
@@ -47,7 +47,7 @@ correct for their respective counterparties. Connections, once established, are
 facilitation all cross-chain verification of IBC state. A connection may be associated with any
 number of channels.
 
-### [Proofs](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/23-commitment) and [Paths](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/24-host)
+### [Proofs](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/23-commitment) and [Paths](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/24-host)
 
 In IBC, blockchains do not directly pass messages to each other over the network. Instead, to
 communicate, a blockchain will commit some state to a specifically defined path reserved for a
@@ -82,7 +82,7 @@ IBC will correctly route all packets to the relevant module using the (channelID
 IBC module may also communicate with another IBC module over multiple ports, with each
 `(portID<->portID)` packet stream being sent on a different unique channel.
 
-### [Ports](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/05-port)
+### [Ports](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/05-port)
 
 An IBC module may bind to any number of ports. Each port must be identified by a unique `portID`.
 Since IBC is designed to be secure with mutually-distrusted modules operating on the same ledger,
@@ -91,7 +91,7 @@ binding a port will return a dynamic object capability. In order to take action
 handler. This prevents a malicious module from opening channels with ports it does not own. Thus,
 IBC modules are responsible for claiming the capability that is returned on `BindPort`.
 
-### [Channels](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/04-channel)
+### [Channels](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/04-channel)
 
 An IBC channel can be established between 2 IBC ports. Currently, a port is exclusively owned by a
 single module. IBC packets are sent over channels. Just as IP packets contain the destination IP
@@ -126,7 +126,7 @@ that the module **must** claim so that they can pass in a capability to authenti
 like sending packets. The channel capability is passed into the callback on the first parts of the
 handshake; either `OnChanOpenInit` on the initializing chain or `OnChanOpenTry` on the other chain.
 
-### [Packets](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/04-channel)
+### [Packets](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/04-channel)
 
 Modules communicate with each other by sending packets over IBC channels. As mentioned above, all
 IBC packets contain the destination `portID` and `channelID` along with the source `portID` and

docs/ibc/relayer.md

@@ -14,7 +14,7 @@ order: 4
 Events are emitted for every transaction processed by the base application to indicate the execution
 of some logic clients may want to be aware of. This is extremely useful when relaying IBC packets.
 Any message that uses IBC will emit events for the corresponding TAO logic executed as defined in
-the [IBC events spec](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/spec/06_events.md).
+the [IBC events spec](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/spec/06_events.md).
 
 In the SDK, it can be assumed that for every message there is an event emitted with the type `message`,
 attribute key `action`, and an attribute value representing the type of message sent 

proto/ibc/core/channel/v1/channel.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package ibc.core.channel.v1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types";
 
 import "gogoproto/gogo.proto";
 import "ibc/core/client/v1/client.proto";

proto/ibc/core/channel/v1/genesis.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package ibc.core.channel.v1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types";
 
 import "gogoproto/gogo.proto";
 import "ibc/core/channel/v1/channel.proto";

proto/ibc/core/channel/v1/query.proto

@@ -8,7 +8,7 @@ import "google/api/annotations.proto";
 import "google/protobuf/any.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types";
 
 // Query provides defines the gRPC querier service
 service Query {

proto/ibc/core/client/v1/client.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package ibc.core.client.v1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types";
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";

proto/ibc/core/client/v1/genesis.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package ibc.core.client.v1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types";
 
 import "ibc/core/client/v1/client.proto";
 import "gogoproto/gogo.proto";

proto/ibc/core/client/v1/query.proto

@@ -7,7 +7,7 @@ import "google/protobuf/any.proto";
 import "google/api/annotations.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types";
 
 // Query provides defines the gRPC querier service
 service Query {

proto/ibc/core/commitment/v1/commitment.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package ibc.core.commitment.v1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types";
 
 import "gogoproto/gogo.proto";
 import "tendermint/crypto/proof.proto";

proto/ibc/core/connection/v1/connection.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package ibc.core.connection.v1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types";
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";

proto/ibc/core/connection/v1/genesis.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package ibc.core.connection.v1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types";
 
 import "gogoproto/gogo.proto";
 import "ibc/core/connection/v1/connection.proto";

proto/ibc/core/connection/v1/query.proto

@@ -8,7 +8,7 @@ import "ibc/core/connection/v1/connection.proto";
 import "google/api/annotations.proto";
 import "google/protobuf/any.proto";
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types";
 
 // Query provides defines the gRPC querier service
 service Query {

proto/ibc/core/types/v1/genesis.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package ibc.core.types.v1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/types";
 
 import "gogoproto/gogo.proto";
 import "ibc/core/client/v1/genesis.proto";

simapp/app.go

@@ -54,14 +54,14 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/gov"
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc"
-	ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/02-client"
-	porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types"
-	ibchost "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	transfer "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer"
 	ibctransferkeeper "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/keeper"
 	ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
-	ibckeeper "github.com/cosmos/cosmos-sdk/x/ibc/keeper"
+	ibc "github.com/cosmos/cosmos-sdk/x/ibc/core"
+	ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client"
+	porttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/types"
+	ibchost "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host"
+	ibckeeper "github.com/cosmos/cosmos-sdk/x/ibc/core/keeper"
 	ibcmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock"
 	"github.com/cosmos/cosmos-sdk/x/mint"
 	mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"

simapp/sim_test.go

@@ -24,8 +24,8 @@ import (
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-	ibchost "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
+	ibchost "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	"github.com/cosmos/cosmos-sdk/x/simulation"

x/ibc/applications/transfer/client/cli/tx.go

@@ -11,9 +11,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/version"
-	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	channelutils "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/client/utils"
 	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
+	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
+	channelutils "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/client/utils"
 )
 
 const (

x/ibc/applications/transfer/handler_test.go

@@ -6,9 +6,9 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
+	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
+	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )
 

x/ibc/applications/transfer/keeper/keeper.go

@@ -13,9 +13,9 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
-	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
-	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
+	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"
+	host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 )
 

x/ibc/applications/transfer/keeper/relay.go

@@ -5,10 +5,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
-	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
+	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
+	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"
+	host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host"
 )
 
 // SendTransfer handles transfer sending logic. There are 2 possible cases:

x/ibc/applications/transfer/keeper/relay_test.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
-	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
+	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
+	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"
+	host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )
 

x/ibc/applications/transfer/module.go

@@ -22,13 +22,13 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
-	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
-	porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types"
-	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/client/cli"
 	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/keeper"
 	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/simulation"
 	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
+	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"
+	porttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/types"
+	host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host"
 )
 
 var (

x/ibc/applications/transfer/module_test.go

@@ -2,9 +2,9 @@ package transfer_test
 
 import (
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
-	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
-	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
+	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"
+	host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )
 

x/ibc/applications/transfer/types/expected_keepers.go

@@ -4,9 +4,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
-	connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types"
-	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
-	ibcexported "github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types"
+	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"
+	ibcexported "github.com/cosmos/cosmos-sdk/x/ibc/core/exported"
 )
 
 // AccountKeeper defines the contract required for account APIs.

x/ibc/applications/transfer/types/genesis.go

@@ -1,7 +1,7 @@
 package types
 
 import (
-	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host"
 )
 
 // NewGenesisState creates a new ibc-transfer GenesisState instance.

x/ibc/applications/transfer/types/msgs.go

@@ -3,8 +3,8 @@ package types
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
+	host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host"
 )
 
 // msg types

x/ibc/applications/transfer/types/msgs_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
+	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
 )
 
 // define constants used for testing