From 5436c994235b72debdba8f6e5bf9684d6ac50f29 Mon Sep 17 00:00:00 2001 From: Farhad Shabani Date: Sun, 19 Nov 2023 08:29:45 -0800 Subject: [PATCH] imp: define ics25-handler + move tendermint-specific impls into ibc-core-host-tendermint --- Cargo.toml | 14 ++-- crates/ibc-apps/ics20-transfer/src/context.rs | 2 +- .../src/handler/send_transfer.rs | 4 +- crates/ibc-apps/ics20-transfer/src/module.rs | 4 +- .../ics20-transfer/types/src/denom.rs | 2 +- .../ics20-transfer/types/src/error.rs | 6 +- .../ics20-transfer/types/src/msgs/transfer.rs | 4 +- crates/ibc-core/Cargo.toml | 36 ++++----- crates/ibc-core/extra/src/lib.rs | 2 - crates/ibc-core/ics02-client/Cargo.toml | 24 +++--- .../ibc-core/ics02-client/context/Cargo.toml | 12 +-- .../ics02-client/context/src/context.rs | 2 +- .../ics02-client/src/handler/create_client.rs | 8 +- .../ics02-client/src/handler/update_client.rs | 6 +- .../src/handler/upgrade_client.rs | 8 +- crates/ibc-core/ics03-connection/Cargo.toml | 21 ++--- crates/ibc-core/ics03-connection/src/delay.rs | 4 +- .../src/handler/conn_open_ack.rs | 10 +-- .../src/handler/conn_open_confirm.rs | 10 +-- .../src/handler/conn_open_init.rs | 10 +-- .../src/handler/conn_open_try.rs | 10 +-- crates/ibc-core/ics04-channel/Cargo.toml | 24 +++--- crates/ibc-core/ics04-channel/src/context.rs | 10 +-- .../src/handler/acknowledgement.rs | 8 +- .../src/handler/chan_close_confirm.rs | 8 +- .../src/handler/chan_close_init.rs | 8 +- .../src/handler/chan_open_ack.rs | 8 +- .../src/handler/chan_open_confirm.rs | 8 +- .../src/handler/chan_open_init.rs | 10 +-- .../src/handler/chan_open_try.rs | 10 +-- .../ics04-channel/src/handler/recv_packet.rs | 8 +- .../ics04-channel/src/handler/send_packet.rs | 6 +- .../ics04-channel/src/handler/timeout.rs | 8 +- .../src/handler/timeout_on_close.rs | 6 +- .../{context => ics24-host}/Cargo.toml | 12 +-- .../{context => ics24-host}/src/context.rs | 8 +- .../{context => ics24-host}/src/lib.rs | 2 +- .../{context => ics24-host}/src/utils.rs | 0 .../tendermint}/Cargo.toml | 16 ++-- .../tendermint/src/lib.rs} | 0 .../src}/upgrade_proposal/context.rs | 0 .../src}/upgrade_proposal/events.rs | 0 .../src}/upgrade_proposal/handler.rs | 4 +- .../tendermint/src}/upgrade_proposal/mod.rs | 0 .../tendermint/src}/upgrade_proposal/plan.rs | 0 .../src}/upgrade_proposal/proposal.rs | 0 .../tendermint/src}/validate_self_client.rs | 2 +- crates/ibc-core/ics25-handler/Cargo.toml | 76 +++++++++++++++++++ .../{ => ics25-handler}/src/entrypoint.rs | 6 +- crates/ibc-core/ics25-handler/src/lib.rs | 19 +++++ .../types/Cargo.toml | 9 +-- .../types/src/error.rs | 0 .../types/src/events.rs | 0 .../types/src/lib.rs | 2 +- .../types/src/msgs.rs | 0 crates/ibc-core/src/lib.rs | 15 ++-- crates/ibc-data-types/Cargo.toml | 12 +-- crates/ibc-data-types/src/lib.rs | 8 +- crates/ibc-derive/src/utils.rs | 12 +-- crates/ibc-query/Cargo.toml | 2 +- crates/ibc-query/src/core/channel/query.rs | 6 +- crates/ibc-query/src/core/channel/service.rs | 2 +- crates/ibc-query/src/core/client/query.rs | 10 ++- crates/ibc-query/src/core/client/service.rs | 4 +- crates/ibc-query/src/core/connection/query.rs | 6 +- .../ibc-query/src/core/connection/service.rs | 2 +- crates/ibc-query/src/core/context.rs | 8 +- crates/ibc-query/src/error.rs | 4 +- crates/ibc-testkit/src/hosts/block.rs | 2 +- crates/ibc-testkit/src/relayer/context.rs | 10 +-- crates/ibc-testkit/src/relayer/error.rs | 4 +- .../ibc/applications/transfer/context.rs | 2 +- .../ibc/applications/transfer/module.rs | 2 +- .../testapp/ibc/clients/mock/client_state.rs | 10 ++- .../ibc/clients/mock/consensus_state.rs | 2 +- .../testapp/ibc/clients/mock/misbehaviour.rs | 2 +- .../src/testapp/ibc/core/client_ctx.rs | 8 +- .../src/testapp/ibc/core/core_ctx.rs | 12 +-- .../src/testapp/ibc/core/router/context.rs | 2 +- .../src/testapp/ibc/core/router/types.rs | 2 +- .../ibc-testkit/src/testapp/ibc/core/types.rs | 8 +- .../utils/dummies/applications/transfer.rs | 2 +- .../src/utils/dummies/clients/tendermint.rs | 4 +- .../core/channel/chan_close_confirm.rs | 2 +- .../dummies/core/channel/chan_close_init.rs | 2 +- .../dummies/core/channel/chan_open_ack.rs | 2 +- .../dummies/core/channel/chan_open_confirm.rs | 2 +- .../dummies/core/channel/chan_open_init.rs | 2 +- .../dummies/core/channel/chan_open_try.rs | 2 +- .../src/utils/dummies/core/channel/mod.rs | 2 +- .../src/utils/dummies/core/channel/packet.rs | 2 +- .../utils/dummies/core/channel/recv_packet.rs | 2 +- .../dummies/core/client/msg_upgrade_client.rs | 2 +- .../src/utils/dummies/core/commitment.rs | 6 +- .../dummies/core/connection/conn_open_ack.rs | 2 +- .../dummies/core/connection/conn_open_init.rs | 2 +- .../dummies/core/connection/conn_open_try.rs | 2 +- .../src/utils/dummies/core/connection/mod.rs | 4 +- .../src/utils/dummies/core/context.rs | 2 +- crates/ibc-testkit/src/utils/fixture.rs | 2 +- .../tests/applications/transfer.rs | 2 +- .../tests/core/ics02_client/create_client.rs | 6 +- .../tests/core/ics02_client/update_client.rs | 12 +-- .../tests/core/ics02_client/upgrade_client.rs | 12 +-- .../core/ics03_connection/conn_open_ack.rs | 12 +-- .../ics03_connection/conn_open_confirm.rs | 10 +-- .../core/ics03_connection/conn_open_init.rs | 6 +- .../core/ics03_connection/conn_open_try.rs | 8 +- .../core/ics04_channel/acknowledgement.rs | 8 +- .../core/ics04_channel/chan_close_confirm.rs | 8 +- .../core/ics04_channel/chan_close_init.rs | 8 +- .../tests/core/ics04_channel/chan_open_ack.rs | 6 +- .../core/ics04_channel/chan_open_confirm.rs | 6 +- .../core/ics04_channel/chan_open_init.rs | 8 +- .../tests/core/ics04_channel/chan_open_try.rs | 8 +- .../tests/core/ics04_channel/recv_packet.rs | 8 +- .../tests/core/ics04_channel/send_packet.rs | 4 +- .../tests/core/ics04_channel/timeout.rs | 8 +- .../core/ics04_channel/timeout_on_close.rs | 6 +- crates/ibc-testkit/tests/core/router.rs | 12 +-- .../clients/ics07_tendermint/client_state.rs | 20 +++-- .../client_state/misbehaviour.rs | 4 +- .../client_state/update_client.rs | 4 +- .../ics07_tendermint/consensus_state.rs | 2 +- .../src/clients/ics07_tendermint/context.rs | 6 +- .../ibc/src/clients/ics07_tendermint/error.rs | 4 +- .../src/clients/ics07_tendermint/header.rs | 2 +- .../clients/ics07_tendermint/misbehaviour.rs | 2 +- .../ibc/src/clients/ics07_tendermint/mod.rs | 2 +- 129 files changed, 496 insertions(+), 388 deletions(-) delete mode 100644 crates/ibc-core/extra/src/lib.rs rename crates/ibc-core/{context => ics24-host}/Cargo.toml (90%) rename crates/ibc-core/{context => ics24-host}/src/context.rs (98%) rename crates/ibc-core/{context => ics24-host}/src/lib.rs (94%) rename crates/ibc-core/{context => ics24-host}/src/utils.rs (100%) rename crates/ibc-core/{extra => ics24-host/tendermint}/Cargo.toml (84%) rename crates/ibc-core/{extra/src/tendermint/mod.rs => ics24-host/tendermint/src/lib.rs} (100%) rename crates/ibc-core/{extra/src/tendermint => ics24-host/tendermint/src}/upgrade_proposal/context.rs (100%) rename crates/ibc-core/{extra/src/tendermint => ics24-host/tendermint/src}/upgrade_proposal/events.rs (100%) rename crates/ibc-core/{extra/src/tendermint => ics24-host/tendermint/src}/upgrade_proposal/handler.rs (92%) rename crates/ibc-core/{extra/src/tendermint => ics24-host/tendermint/src}/upgrade_proposal/mod.rs (100%) rename crates/ibc-core/{extra/src/tendermint => ics24-host/tendermint/src}/upgrade_proposal/plan.rs (100%) rename crates/ibc-core/{extra/src/tendermint => ics24-host/tendermint/src}/upgrade_proposal/proposal.rs (100%) rename crates/ibc-core/{extra/src/tendermint => ics24-host/tendermint/src}/validate_self_client.rs (99%) create mode 100644 crates/ibc-core/ics25-handler/Cargo.toml rename crates/ibc-core/{ => ics25-handler}/src/entrypoint.rs (98%) create mode 100644 crates/ibc-core/ics25-handler/src/lib.rs rename crates/ibc-core/{context => ics25-handler}/types/Cargo.toml (92%) rename crates/ibc-core/{context => ics25-handler}/types/src/error.rs (100%) rename crates/ibc-core/{context => ics25-handler}/types/src/events.rs (100%) rename crates/ibc-core/{context => ics25-handler}/types/src/lib.rs (98%) rename crates/ibc-core/{context => ics25-handler}/types/src/msgs.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index c59a7da84..8187170d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,12 +16,13 @@ members = [ "crates/ibc-core/ics04-channel", "crates/ibc-core/ics04-channel/types", "crates/ibc-core/ics23-commitment/types", + "crates/ibc-core/ics24-host", "crates/ibc-core/ics24-host/types", + "crates/ibc-core/ics24-host/tendermint", + "crates/ibc-core/ics25-handler", + "crates/ibc-core/ics25-handler/types", "crates/ibc-core/ics26-routing", "crates/ibc-core/ics26-routing/types", - "crates/ibc-core/context", - "crates/ibc-core/context/types", - "crates/ibc-core/extra", "crates/ibc-apps/ics20-transfer", "crates/ibc-apps/ics20-transfer/types", ] @@ -74,9 +75,9 @@ ibc-derive = { version = "0.3.0", path = "./crates/ibc-derive" } ibc-core-client = { version = "0.47.0", path = "./crates/ibc-core/ics02-client", default-features = false } ibc-core-connection = { version = "0.47.0", path = "./crates/ibc-core/ics03-connection", default-features = false } ibc-core-channel = { version = "0.47.0", path = "./crates/ibc-core/ics04-channel", default-features = false } +ibc-core-host = { version = "0.47.0", path = "./crates/ibc-core/ics24-host", default-features = false } +ibc-core-handler = { version = "0.47.0", path = "./crates/ibc-core/ics25-handler", default-features = false } ibc-core-router = { version = "0.47.0", path = "./crates/ibc-core/ics26-routing", default-features = false } -ibc-core-context = { version = "0.47.0", path = "./crates/ibc-core/context", default-features = false } -ibc-core-extra = { version = "0.47.0", path = "./crates/ibc-core/extra", default-features = false } ibc-app-transfer = { version = "0.47.0", path = "./crates/ibc-apps/ics20-transfer", default-features = false } ibc-core-client-context = { version = "0.47.0", path = "./crates/ibc-core/ics02-client/context", default-features = false } @@ -84,9 +85,10 @@ ibc-core-client-types = { version = "0.47.0", path = "./crates/ibc-core/ics0 ibc-core-channel-types = { version = "0.47.0", path = "./crates/ibc-core/ics04-channel/types", default-features = false } ibc-core-connection-types = { version = "0.47.0", path = "./crates/ibc-core/ics03-connection/types", default-features = false } ibc-core-commitment-types = { version = "0.47.0", path = "./crates/ibc-core/ics23-commitment/types", default-features = false } +ibc-core-host-tendermint = { version = "0.47.0", path = "./crates/ibc-core/ics24-host/tendermint", default-features = false } ibc-core-host-types = { version = "0.47.0", path = "./crates/ibc-core/ics24-host/types", default-features = false } +ibc-core-handler-types = { version = "0.47.0", path = "./crates/ibc-core/ics25-handler/types", default-features = false } ibc-core-router-types = { version = "0.47.0", path = "./crates/ibc-core/ics26-routing/types", default-features = false } -ibc-core-context-types = { version = "0.47.0", path = "./crates/ibc-core/context/types", default-features = false } ibc-app-transfer-types = { version = "0.47.0", path = "./crates/ibc-apps/ics20-transfer/types", default-features = false } ibc-proto = { version = "0.38.0", default-features = false } diff --git a/crates/ibc-apps/ics20-transfer/src/context.rs b/crates/ibc-apps/ics20-transfer/src/context.rs index c2718f97a..62bd07e1d 100644 --- a/crates/ibc-apps/ics20-transfer/src/context.rs +++ b/crates/ibc-apps/ics20-transfer/src/context.rs @@ -2,7 +2,7 @@ use ibc_app_transfer_types::error::TokenTransferError; use ibc_app_transfer_types::{PrefixedCoin, PrefixedDenom, VERSION}; -use ibc_core::host::identifiers::{ChannelId, PortId}; +use ibc_core::host::types::identifiers::{ChannelId, PortId}; use ibc_core::primitives::prelude::*; use ibc_core::primitives::Signer; use sha2::{Digest, Sha256}; diff --git a/crates/ibc-apps/ics20-transfer/src/handler/send_transfer.rs b/crates/ibc-apps/ics20-transfer/src/handler/send_transfer.rs index fbbe0c4ca..683b96edf 100644 --- a/crates/ibc-apps/ics20-transfer/src/handler/send_transfer.rs +++ b/crates/ibc-apps/ics20-transfer/src/handler/send_transfer.rs @@ -5,8 +5,8 @@ use ibc_app_transfer_types::{is_sender_chain_source, MODULE_ID_STR}; use ibc_core::channel::context::{SendPacketExecutionContext, SendPacketValidationContext}; use ibc_core::channel::handler::{send_packet_execute, send_packet_validate}; use ibc_core::channel::types::packet::Packet; -use ibc_core::context::types::events::MessageEvent; -use ibc_core::host::path::{ChannelEndPath, SeqSendPath}; +use ibc_core::handler::types::events::MessageEvent; +use ibc_core::host::types::path::{ChannelEndPath, SeqSendPath}; use ibc_core::primitives::prelude::*; use ibc_core::router::types::event::ModuleEvent; diff --git a/crates/ibc-apps/ics20-transfer/src/module.rs b/crates/ibc-apps/ics20-transfer/src/module.rs index ba97a162d..a33b67bc3 100644 --- a/crates/ibc-apps/ics20-transfer/src/module.rs +++ b/crates/ibc-apps/ics20-transfer/src/module.rs @@ -6,8 +6,8 @@ use ibc_core::channel::types::acknowledgement::{Acknowledgement, Acknowledgement use ibc_core::channel::types::channel::{Counterparty, Order}; use ibc_core::channel::types::packet::Packet; use ibc_core::channel::types::Version; -use ibc_core::context::types::error::ContextError; -use ibc_core::host::identifiers::{ChannelId, ConnectionId, PortId}; +use ibc_core::handler::types::error::ContextError; +use ibc_core::host::types::identifiers::{ChannelId, ConnectionId, PortId}; use ibc_core::primitives::prelude::*; use ibc_core::primitives::Signer; use ibc_core::router::types::module::ModuleExtras; diff --git a/crates/ibc-apps/ics20-transfer/types/src/denom.rs b/crates/ibc-apps/ics20-transfer/types/src/denom.rs index c93dcf2df..92f60c9d3 100644 --- a/crates/ibc-apps/ics20-transfer/types/src/denom.rs +++ b/crates/ibc-apps/ics20-transfer/types/src/denom.rs @@ -3,7 +3,7 @@ use core::fmt::{Display, Error as FmtError, Formatter}; use core::str::FromStr; use derive_more::{Display, From}; -use ibc_core::host::identifiers::{ChannelId, PortId}; +use ibc_core::host::types::identifiers::{ChannelId, PortId}; use ibc_core::primitives::prelude::*; use ibc_proto::ibc::applications::transfer::v1::DenomTrace as RawDenomTrace; diff --git a/crates/ibc-apps/ics20-transfer/types/src/error.rs b/crates/ibc-apps/ics20-transfer/types/src/error.rs index 64bc33444..8737ddf96 100644 --- a/crates/ibc-apps/ics20-transfer/types/src/error.rs +++ b/crates/ibc-apps/ics20-transfer/types/src/error.rs @@ -5,9 +5,9 @@ use core::str::Utf8Error; use displaydoc::Display; use ibc_core::channel::types::acknowledgement::StatusValue; use ibc_core::channel::types::channel::Order; -use ibc_core::context::types::error::ContextError; -use ibc_core::host::error::IdentifierError; -use ibc_core::host::identifiers::{ChannelId, PortId}; +use ibc_core::handler::types::error::ContextError; +use ibc_core::host::types::error::IdentifierError; +use ibc_core::host::types::identifiers::{ChannelId, PortId}; use ibc_core::primitives::prelude::*; use uint::FromDecStrErr; diff --git a/crates/ibc-apps/ics20-transfer/types/src/msgs/transfer.rs b/crates/ibc-apps/ics20-transfer/types/src/msgs/transfer.rs index ff4fe77d7..b892f9f40 100644 --- a/crates/ibc-apps/ics20-transfer/types/src/msgs/transfer.rs +++ b/crates/ibc-apps/ics20-transfer/types/src/msgs/transfer.rs @@ -2,8 +2,8 @@ use ibc_core::channel::types::error::PacketError; use ibc_core::channel::types::timeout::TimeoutHeight; -use ibc_core::context::types::error::ContextError; -use ibc_core::host::identifiers::{ChannelId, PortId}; +use ibc_core::handler::types::error::ContextError; +use ibc_core::host::types::identifiers::{ChannelId, PortId}; use ibc_core::primitives::prelude::*; use ibc_core::primitives::{Msg, Timestamp}; use ibc_proto::google::protobuf::Any; diff --git a/crates/ibc-core/Cargo.toml b/crates/ibc-core/Cargo.toml index 929eea508..ec48298fd 100644 --- a/crates/ibc-core/Cargo.toml +++ b/crates/ibc-core/Cargo.toml @@ -9,7 +9,7 @@ repository = { workspace = true } keywords = ["blockchain", "cosmos", "ibc"] readme = "README.md" description = """ - `ibc-core` provides a comprehensive set of libraries for IBC core (TAO) layers, + `ibc-core` re-exports a comprehensive set of libraries for IBC core (TAO) modules, facilitating seamless integration of IBC core business logic into any blockchain system. """ @@ -17,14 +17,14 @@ description = """ all-features = true [dependencies] -ibc-core-client = { workspace = true } -ibc-core-connection = { workspace = true } -ibc-core-channel = { workspace = true } +ibc-core-client = { workspace = true } +ibc-core-connection = { workspace = true } +ibc-core-channel = { workspace = true } ibc-core-commitment-types = { workspace = true } -ibc-core-router = { workspace = true } -ibc-core-context = { workspace = true } -ibc-core-host-types = { workspace = true } -ibc-primitives = { workspace = true } +ibc-core-host = { workspace = true } +ibc-core-router = { workspace = true } +ibc-core-handler = { workspace = true } +ibc-primitives = { workspace = true } [features] default = ["std"] @@ -33,43 +33,43 @@ std = [ "ibc-core-connection/std", "ibc-core-channel/std", "ibc-core-commitment-types/std", + "ibc-core-host/std", "ibc-core-router/std", - "ibc-core-context/std", - "ibc-core-host-types/std", + "ibc-core-handler/std", ] serde = [ "ibc-core-client/serde", "ibc-core-connection/serde", "ibc-core-channel/serde", "ibc-core-commitment-types/serde", + "ibc-core-host/serde", "ibc-core-router/serde", - "ibc-core-context/serde", - "ibc-core-host-types/serde", + "ibc-core-handler/serde", ] borsh = [ "ibc-core-client/borsh", "ibc-core-connection/borsh", "ibc-core-channel/borsh", "ibc-core-commitment-types/borsh", + "ibc-core-host/borsh", "ibc-core-router/borsh", - "ibc-core-context/borsh", - "ibc-core-host-types/borsh", + "ibc-core-handler/borsh", ] schema = [ "ibc-core-client/schema", "ibc-core-connection/schema", "ibc-core-channel/schema", "ibc-core-commitment-types/schema", + "ibc-core-host/schema", "ibc-core-router/schema", - "ibc-core-context/schema", - "ibc-core-host-types/schema", + "ibc-core-handler/schema", ] parity-scale-codec = [ "ibc-core-client/parity-scale-codec", "ibc-core-connection/parity-scale-codec", "ibc-core-channel/parity-scale-codec", + "ibc-core-host/parity-scale-codec", "ibc-core-router/parity-scale-codec", - "ibc-core-context/parity-scale-codec", - "ibc-core-host-types/parity-scale-codec", + "ibc-core-handler/parity-scale-codec", "ibc-primitives/parity-scale-codec", ] diff --git a/crates/ibc-core/extra/src/lib.rs b/crates/ibc-core/extra/src/lib.rs deleted file mode 100644 index 8d3836cfe..000000000 --- a/crates/ibc-core/extra/src/lib.rs +++ /dev/null @@ -1,2 +0,0 @@ -//! Provides convenience implementations for various hosts -pub mod tendermint; diff --git a/crates/ibc-core/ics02-client/Cargo.toml b/crates/ibc-core/ics02-client/Cargo.toml index ad2f4613c..9f5dcd8ba 100644 --- a/crates/ibc-core/ics02-client/Cargo.toml +++ b/crates/ibc-core/ics02-client/Cargo.toml @@ -24,8 +24,8 @@ prost = { workspace = true } ibc-core-client-types = { workspace = true } ibc-core-client-context = { workspace = true } ibc-core-commitment-types = { workspace = true } -ibc-core-host-types = { workspace = true } -ibc-core-context = { workspace = true } +ibc-core-host = { workspace = true } +ibc-core-handler-types = { workspace = true } ibc-derive = { workspace = true } ibc-primitives = { workspace = true } @@ -36,32 +36,32 @@ std = [ "ibc-core-client-types/std", "ibc-core-client-context/std", "ibc-core-commitment-types/std", - "ibc-core-host-types/std", - "ibc-core-context/std", + "ibc-core-host/std", + "ibc-core-handler-types/std", "ibc-primitives/std", ] serde = [ "ibc-core-client-types/serde", "ibc-core-client-context/serde", "ibc-core-commitment-types/serde", - "ibc-core-host-types/serde", - "ibc-core-context/serde", + "ibc-core-host/serde", + "ibc-core-handler-types/serde", "ibc-primitives/serde", ] borsh = [ "ibc-core-client-types/borsh", "ibc-core-client-context/borsh", "ibc-core-commitment-types/borsh", - "ibc-core-host-types/borsh", - "ibc-core-context/borsh", + "ibc-core-host/borsh", + "ibc-core-handler-types/borsh", "ibc-primitives/borsh", ] schema = [ "ibc-core-client-types/schema", "ibc-core-client-context/schema", "ibc-core-commitment-types/schema", - "ibc-core-host-types/schema", - "ibc-core-context/schema", + "ibc-core-host/schema", + "ibc-core-handler-types/schema", "ibc-primitives/schema", "serde", "std" @@ -70,7 +70,7 @@ parity-scale-codec = [ "ibc-core-client-types/parity-scale-codec", "ibc-core-client-context/parity-scale-codec", "ibc-core-commitment-types/parity-scale-codec", - "ibc-core-context/parity-scale-codec", - "ibc-core-host-types/parity-scale-codec", + "ibc-core-host/parity-scale-codec", + "ibc-core-handler-types/parity-scale-codec", "ibc-primitives/parity-scale-codec", ] diff --git a/crates/ibc-core/ics02-client/context/Cargo.toml b/crates/ibc-core/ics02-client/context/Cargo.toml index 6c7d93ea3..ba6f2779a 100644 --- a/crates/ibc-core/ics02-client/context/Cargo.toml +++ b/crates/ibc-core/ics02-client/context/Cargo.toml @@ -27,7 +27,7 @@ subtle-encoding = { workspace = true } ibc-core-client-types = { workspace = true } ibc-core-commitment-types = { workspace = true } ibc-core-host-types = { workspace = true } -ibc-core-context-types = { workspace = true } +ibc-core-handler-types = { workspace = true } ibc-derive = { workspace = true } ibc-primitives = { workspace = true } @@ -46,7 +46,7 @@ std = [ "ibc-core-client-types/std", "ibc-core-commitment-types/std", "ibc-core-host-types/std", - "ibc-core-context-types/std", + "ibc-core-handler-types/std", "ibc-primitives/std", "tendermint/std", ] @@ -54,20 +54,20 @@ serde = [ "ibc-core-client-types/serde", "ibc-core-commitment-types/serde", "ibc-core-host-types/serde", - "ibc-core-context-types/serde", + "ibc-core-handler-types/serde", "ibc-primitives/serde", ] borsh = [ "ibc-core-client-types/borsh", "ibc-core-commitment-types/borsh", "ibc-core-host-types/borsh", - "ibc-core-context-types/borsh", + "ibc-core-handler-types/borsh", "ibc-primitives/borsh", ] schema = [ "ibc-core-client-types/schema", "ibc-core-host-types/schema", - "ibc-core-context-types/schema", + "ibc-core-handler-types/schema", "serde", "std" ] @@ -75,6 +75,6 @@ parity-scale-codec = [ "ibc-core-client-types/parity-scale-codec", "ibc-core-commitment-types/parity-scale-codec", "ibc-core-host-types/parity-scale-codec", - "ibc-core-context-types/parity-scale-codec", + "ibc-core-handler-types/parity-scale-codec", "ibc-primitives/parity-scale-codec", ] diff --git a/crates/ibc-core/ics02-client/context/src/context.rs b/crates/ibc-core/ics02-client/context/src/context.rs index 8cd3a968d..368e2c446 100644 --- a/crates/ibc-core/ics02-client/context/src/context.rs +++ b/crates/ibc-core/ics02-client/context/src/context.rs @@ -1,5 +1,5 @@ use ibc_core_client_types::Height; -use ibc_core_context_types::error::ContextError; +use ibc_core_handler_types::error::ContextError; use ibc_core_host_types::identifiers::ClientId; use ibc_core_host_types::path::{ClientConsensusStatePath, ClientStatePath}; use ibc_primitives::Timestamp; diff --git a/crates/ibc-core/ics02-client/src/handler/create_client.rs b/crates/ibc-core/ics02-client/src/handler/create_client.rs index e9ee0e2d3..c4624fefb 100644 --- a/crates/ibc-core/ics02-client/src/handler/create_client.rs +++ b/crates/ibc-core/ics02-client/src/handler/create_client.rs @@ -4,10 +4,10 @@ use ibc_core_client_context::client_state::{ClientStateCommon, ClientStateExecut use ibc_core_client_types::error::ClientError; use ibc_core_client_types::events::CreateClient; use ibc_core_client_types::msgs::MsgCreateClient; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::identifiers::ClientId; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::identifiers::ClientId; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_primitives::prelude::*; pub fn validate(ctx: &Ctx, msg: MsgCreateClient) -> Result<(), ContextError> diff --git a/crates/ibc-core/ics02-client/src/handler/update_client.rs b/crates/ibc-core/ics02-client/src/handler/update_client.rs index 9dacb285c..8970bc527 100644 --- a/crates/ibc-core/ics02-client/src/handler/update_client.rs +++ b/crates/ibc-core/ics02-client/src/handler/update_client.rs @@ -7,9 +7,9 @@ use ibc_core_client_types::error::ClientError; use ibc_core_client_types::events::{ClientMisbehaviour, UpdateClient}; use ibc_core_client_types::msgs::MsgUpdateOrMisbehaviour; use ibc_core_client_types::UpdateKind; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_primitives::prelude::*; use prost::Message; diff --git a/crates/ibc-core/ics02-client/src/handler/upgrade_client.rs b/crates/ibc-core/ics02-client/src/handler/upgrade_client.rs index ba430efe3..f15c4ce99 100644 --- a/crates/ibc-core/ics02-client/src/handler/upgrade_client.rs +++ b/crates/ibc-core/ics02-client/src/handler/upgrade_client.rs @@ -7,10 +7,10 @@ use ibc_core_client_context::consensus_state::ConsensusState; use ibc_core_client_types::error::ClientError; use ibc_core_client_types::events::UpgradeClient; use ibc_core_client_types::msgs::MsgUpgradeClient; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::path::ClientConsensusStatePath; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::path::ClientConsensusStatePath; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_primitives::prelude::*; pub fn validate(ctx: &Ctx, msg: MsgUpgradeClient) -> Result<(), ContextError> diff --git a/crates/ibc-core/ics03-connection/Cargo.toml b/crates/ibc-core/ics03-connection/Cargo.toml index 87579a045..43ac08cb6 100644 --- a/crates/ibc-core/ics03-connection/Cargo.toml +++ b/crates/ibc-core/ics03-connection/Cargo.toml @@ -23,8 +23,8 @@ prost = { workspace = true } # ibc dependencies ibc-core-client = { workspace = true } ibc-core-connection-types = { workspace = true } -ibc-core-host-types = { workspace = true } -ibc-core-context = { workspace = true } +ibc-core-host = { workspace = true } +ibc-core-handler-types = { workspace = true } ibc-primitives = { workspace = true } [features] @@ -33,33 +33,34 @@ std = [ "prost/std", "ibc-core-client/std", "ibc-core-connection-types/std", - "ibc-core-host-types/std", - "ibc-core-context/std", + "ibc-core-host/std", + "ibc-core-handler-types/std", "ibc-primitives/std", ] serde = [ "ibc-core-client/serde", "ibc-core-connection-types/serde", - "ibc-core-host-types/serde", - "ibc-core-context/serde", + "ibc-core-host/serde", + "ibc-core-handler-types/serde", "ibc-primitives/serde", ] schema = [ "ibc-core-client/schema", "ibc-core-connection-types/schema", - "ibc-core-host-types/schema", + "ibc-core-host/schema", "ibc-primitives/schema", "serde", "std" ] borsh = [ "ibc-core-client/borsh", - "ibc-core-host-types/borsh", - "ibc-core-context/borsh", + "ibc-core-host/borsh", + "ibc-core-handler-types/borsh", "ibc-primitives/borsh", ] parity-scale-codec = [ "ibc-core-client/parity-scale-codec", - "ibc-core-host-types/parity-scale-codec", + "ibc-core-host/parity-scale-codec", + "ibc-core-handler-types/parity-scale-codec", "ibc-primitives/parity-scale-codec", ] \ No newline at end of file diff --git a/crates/ibc-core/ics03-connection/src/delay.rs b/crates/ibc-core/ics03-connection/src/delay.rs index 68c49897d..d573a6eac 100644 --- a/crates/ibc-core/ics03-connection/src/delay.rs +++ b/crates/ibc-core/ics03-connection/src/delay.rs @@ -2,8 +2,8 @@ use ibc_core_client::context::ClientValidationContext; use ibc_core_client::types::Height; use ibc_core_connection_types::error::ConnectionError; use ibc_core_connection_types::ConnectionEnd; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::ValidationContext; +use ibc_core_handler_types::error::ContextError; +use ibc_core_host::ValidationContext; pub fn verify_conn_delay_passed( ctx: &Ctx, diff --git a/crates/ibc-core/ics03-connection/src/handler/conn_open_ack.rs b/crates/ibc-core/ics03-connection/src/handler/conn_open_ack.rs index f79b3c149..6132f99bf 100644 --- a/crates/ibc-core/ics03-connection/src/handler/conn_open_ack.rs +++ b/crates/ibc-core/ics03-connection/src/handler/conn_open_ack.rs @@ -8,11 +8,11 @@ use ibc_core_connection_types::events::OpenAck; use ibc_core_connection_types::msgs::MsgConnectionOpenAck; use ibc_core_connection_types::proto::Protobuf; use ibc_core_connection_types::{ConnectionEnd, Counterparty, State}; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::identifiers::ClientId; -use ibc_core_host_types::path::{ClientConsensusStatePath, ClientStatePath, ConnectionPath, Path}; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::identifiers::ClientId; +use ibc_core_host::types::path::{ClientConsensusStatePath, ClientStatePath, ConnectionPath, Path}; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_primitives::prelude::*; use prost::Message; diff --git a/crates/ibc-core/ics03-connection/src/handler/conn_open_confirm.rs b/crates/ibc-core/ics03-connection/src/handler/conn_open_confirm.rs index fe3f688da..ac5a90ff0 100644 --- a/crates/ibc-core/ics03-connection/src/handler/conn_open_confirm.rs +++ b/crates/ibc-core/ics03-connection/src/handler/conn_open_confirm.rs @@ -8,11 +8,11 @@ use ibc_core_connection_types::events::OpenConfirm; use ibc_core_connection_types::msgs::MsgConnectionOpenConfirm; use ibc_core_connection_types::proto::Protobuf; use ibc_core_connection_types::{ConnectionEnd, Counterparty, State}; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::identifiers::{ClientId, ConnectionId}; -use ibc_core_host_types::path::{ClientConsensusStatePath, ConnectionPath, Path}; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::identifiers::{ClientId, ConnectionId}; +use ibc_core_host::types::path::{ClientConsensusStatePath, ConnectionPath, Path}; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_primitives::prelude::*; pub fn validate(ctx_b: &Ctx, msg: &MsgConnectionOpenConfirm) -> Result<(), ContextError> diff --git a/crates/ibc-core/ics03-connection/src/handler/conn_open_init.rs b/crates/ibc-core/ics03-connection/src/handler/conn_open_init.rs index 6a2484442..b7deac746 100644 --- a/crates/ibc-core/ics03-connection/src/handler/conn_open_init.rs +++ b/crates/ibc-core/ics03-connection/src/handler/conn_open_init.rs @@ -4,11 +4,11 @@ use ibc_core_client::types::error::ClientError; use ibc_core_connection_types::events::OpenInit; use ibc_core_connection_types::msgs::MsgConnectionOpenInit; use ibc_core_connection_types::{ConnectionEnd, Counterparty, State}; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::identifiers::ConnectionId; -use ibc_core_host_types::path::{ClientConnectionPath, ConnectionPath}; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::identifiers::ConnectionId; +use ibc_core_host::types::path::{ClientConnectionPath, ConnectionPath}; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_primitives::prelude::*; pub fn validate(ctx_a: &Ctx, msg: MsgConnectionOpenInit) -> Result<(), ContextError> diff --git a/crates/ibc-core/ics03-connection/src/handler/conn_open_try.rs b/crates/ibc-core/ics03-connection/src/handler/conn_open_try.rs index 9e9ba7f4f..46edb9cde 100644 --- a/crates/ibc-core/ics03-connection/src/handler/conn_open_try.rs +++ b/crates/ibc-core/ics03-connection/src/handler/conn_open_try.rs @@ -7,13 +7,13 @@ use ibc_core_connection_types::events::OpenTry; use ibc_core_connection_types::msgs::MsgConnectionOpenTry; use ibc_core_connection_types::proto::Protobuf; use ibc_core_connection_types::{ConnectionEnd, Counterparty, State}; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::identifiers::{ClientId, ConnectionId}; -use ibc_core_host_types::path::{ +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::identifiers::{ClientId, ConnectionId}; +use ibc_core_host::types::path::{ ClientConnectionPath, ClientConsensusStatePath, ClientStatePath, ConnectionPath, Path, }; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_primitives::prelude::*; use prost::Message; diff --git a/crates/ibc-core/ics04-channel/Cargo.toml b/crates/ibc-core/ics04-channel/Cargo.toml index b23ca197f..775b651bd 100644 --- a/crates/ibc-core/ics04-channel/Cargo.toml +++ b/crates/ibc-core/ics04-channel/Cargo.toml @@ -25,8 +25,8 @@ ibc-core-client = { workspace = true } ibc-core-connection = { workspace = true } ibc-core-channel-types = { workspace = true } ibc-core-commitment-types = { workspace = true } -ibc-core-host-types = { workspace = true } -ibc-core-context = { workspace = true } +ibc-core-host = { workspace = true } +ibc-core-handler-types = { workspace = true } ibc-core-router = { workspace = true } ibc-primitives = { workspace = true } @@ -37,8 +37,8 @@ std = [ "ibc-core-connection/std", "ibc-core-channel-types/std", "ibc-core-commitment-types/std", - "ibc-core-host-types/std", - "ibc-core-context/std", + "ibc-core-host/std", + "ibc-core-handler-types/std", "ibc-core-router/std", "ibc-primitives/std", ] @@ -47,8 +47,8 @@ serde = [ "ibc-core-connection/serde", "ibc-core-channel-types/serde", "ibc-core-commitment-types/serde", - "ibc-core-host-types/serde", - "ibc-core-context/serde", + "ibc-core-host/serde", + "ibc-core-handler-types/serde", "ibc-core-router/serde", "ibc-primitives/serde", ] @@ -57,8 +57,8 @@ schema = [ "ibc-core-connection/schema", "ibc-core-channel-types/schema", "ibc-core-commitment-types/schema", - "ibc-core-host-types/schema", - "ibc-core-context/schema", + "ibc-core-host/schema", + "ibc-core-handler-types/schema", "ibc-core-router/schema", "ibc-primitives/schema", ] @@ -67,8 +67,8 @@ borsh = [ "ibc-core-connection/borsh", "ibc-core-channel-types/borsh", "ibc-core-commitment-types/borsh", - "ibc-core-host-types/borsh", - "ibc-core-context/borsh", + "ibc-core-host/borsh", + "ibc-core-handler-types/borsh", "ibc-core-router/borsh", "ibc-primitives/borsh", ] @@ -77,8 +77,8 @@ parity-scale-codec = [ "ibc-core-connection/parity-scale-codec", "ibc-core-channel-types/parity-scale-codec", "ibc-core-commitment-types/parity-scale-codec", - "ibc-core-host-types/parity-scale-codec", - "ibc-core-context/parity-scale-codec", + "ibc-core-host/parity-scale-codec", + "ibc-core-handler-types/parity-scale-codec", "ibc-core-router/parity-scale-codec", "ibc-primitives/parity-scale-codec", ] diff --git a/crates/ibc-core/ics04-channel/src/context.rs b/crates/ibc-core/ics04-channel/src/context.rs index cef1019ad..8dcd05fac 100644 --- a/crates/ibc-core/ics04-channel/src/context.rs +++ b/crates/ibc-core/ics04-channel/src/context.rs @@ -6,13 +6,13 @@ use ibc_core_client::context::client_state::ClientState; use ibc_core_client::context::consensus_state::ConsensusState; use ibc_core_client::context::{ClientExecutionContext, ClientValidationContext}; use ibc_core_connection::types::ConnectionEnd; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::IbcEvent; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::identifiers::{ClientId, ConnectionId, Sequence}; -use ibc_core_host_types::path::{ +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::IbcEvent; +use ibc_core_host::types::identifiers::{ClientId, ConnectionId, Sequence}; +use ibc_core_host::types::path::{ ChannelEndPath, ClientConsensusStatePath, CommitmentPath, SeqSendPath, }; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_primitives::prelude::*; /// Methods required in send packet validation, to be implemented by the host diff --git a/crates/ibc-core/ics04-channel/src/handler/acknowledgement.rs b/crates/ibc-core/ics04-channel/src/handler/acknowledgement.rs index 37f1849af..2ae3a39e6 100644 --- a/crates/ibc-core/ics04-channel/src/handler/acknowledgement.rs +++ b/crates/ibc-core/ics04-channel/src/handler/acknowledgement.rs @@ -8,12 +8,12 @@ use ibc_core_client::context::consensus_state::ConsensusState; use ibc_core_client::types::error::ClientError; use ibc_core_connection::delay::verify_conn_delay_passed; use ibc_core_connection::types::State as ConnectionState; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::path::{ +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::path::{ AckPath, ChannelEndPath, ClientConsensusStatePath, CommitmentPath, Path, SeqAckPath, }; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_core_router::module::Module; use ibc_primitives::prelude::*; diff --git a/crates/ibc-core/ics04-channel/src/handler/chan_close_confirm.rs b/crates/ibc-core/ics04-channel/src/handler/chan_close_confirm.rs index 56397380a..32b0b3b43 100644 --- a/crates/ibc-core/ics04-channel/src/handler/chan_close_confirm.rs +++ b/crates/ibc-core/ics04-channel/src/handler/chan_close_confirm.rs @@ -9,10 +9,10 @@ use ibc_core_client::context::client_state::{ClientStateCommon, ClientStateValid use ibc_core_client::context::consensus_state::ConsensusState; use ibc_core_client::types::error::ClientError; use ibc_core_connection::types::State as ConnectionState; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::path::{ChannelEndPath, ClientConsensusStatePath, Path}; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::path::{ChannelEndPath, ClientConsensusStatePath, Path}; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_core_router::module::Module; use ibc_primitives::prelude::*; diff --git a/crates/ibc-core/ics04-channel/src/handler/chan_close_init.rs b/crates/ibc-core/ics04-channel/src/handler/chan_close_init.rs index c8dac9782..a7f03163e 100644 --- a/crates/ibc-core/ics04-channel/src/handler/chan_close_init.rs +++ b/crates/ibc-core/ics04-channel/src/handler/chan_close_init.rs @@ -6,10 +6,10 @@ use ibc_core_channel_types::msgs::MsgChannelCloseInit; use ibc_core_client::context::client_state::ClientStateValidation; use ibc_core_client::types::error::ClientError; use ibc_core_connection::types::State as ConnectionState; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::path::ChannelEndPath; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::path::ChannelEndPath; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_core_router::module::Module; use ibc_primitives::prelude::*; diff --git a/crates/ibc-core/ics04-channel/src/handler/chan_open_ack.rs b/crates/ibc-core/ics04-channel/src/handler/chan_open_ack.rs index 59cee69af..ae08300f4 100644 --- a/crates/ibc-core/ics04-channel/src/handler/chan_open_ack.rs +++ b/crates/ibc-core/ics04-channel/src/handler/chan_open_ack.rs @@ -8,10 +8,10 @@ use ibc_core_client::context::client_state::{ClientStateCommon, ClientStateValid use ibc_core_client::context::consensus_state::ConsensusState; use ibc_core_client::types::error::ClientError; use ibc_core_connection::types::State as ConnectionState; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::path::{ChannelEndPath, ClientConsensusStatePath, Path}; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::path::{ChannelEndPath, ClientConsensusStatePath, Path}; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_core_router::module::Module; use ibc_primitives::prelude::*; diff --git a/crates/ibc-core/ics04-channel/src/handler/chan_open_confirm.rs b/crates/ibc-core/ics04-channel/src/handler/chan_open_confirm.rs index 03cbc614d..b00231c48 100644 --- a/crates/ibc-core/ics04-channel/src/handler/chan_open_confirm.rs +++ b/crates/ibc-core/ics04-channel/src/handler/chan_open_confirm.rs @@ -9,10 +9,10 @@ use ibc_core_client::context::client_state::{ClientStateCommon, ClientStateValid use ibc_core_client::context::consensus_state::ConsensusState; use ibc_core_client::types::error::ClientError; use ibc_core_connection::types::State as ConnectionState; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::path::{ChannelEndPath, ClientConsensusStatePath, Path}; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::path::{ChannelEndPath, ClientConsensusStatePath, Path}; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_core_router::module::Module; use ibc_primitives::prelude::*; diff --git a/crates/ibc-core/ics04-channel/src/handler/chan_open_init.rs b/crates/ibc-core/ics04-channel/src/handler/chan_open_init.rs index 315163745..31f74ce0c 100644 --- a/crates/ibc-core/ics04-channel/src/handler/chan_open_init.rs +++ b/crates/ibc-core/ics04-channel/src/handler/chan_open_init.rs @@ -5,11 +5,11 @@ use ibc_core_channel_types::events::OpenInit; use ibc_core_channel_types::msgs::MsgChannelOpenInit; use ibc_core_client::context::client_state::ClientStateValidation; use ibc_core_client::types::error::ClientError; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::identifiers::ChannelId; -use ibc_core_host_types::path::{ChannelEndPath, SeqAckPath, SeqRecvPath, SeqSendPath}; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::identifiers::ChannelId; +use ibc_core_host::types::path::{ChannelEndPath, SeqAckPath, SeqRecvPath, SeqSendPath}; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_core_router::module::Module; use ibc_primitives::prelude::*; diff --git a/crates/ibc-core/ics04-channel/src/handler/chan_open_try.rs b/crates/ibc-core/ics04-channel/src/handler/chan_open_try.rs index aac7e49eb..f16541392 100644 --- a/crates/ibc-core/ics04-channel/src/handler/chan_open_try.rs +++ b/crates/ibc-core/ics04-channel/src/handler/chan_open_try.rs @@ -9,13 +9,13 @@ use ibc_core_client::context::client_state::{ClientStateCommon, ClientStateValid use ibc_core_client::context::consensus_state::ConsensusState; use ibc_core_client::types::error::ClientError; use ibc_core_connection::types::State as ConnectionState; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::identifiers::ChannelId; -use ibc_core_host_types::path::{ +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::identifiers::ChannelId; +use ibc_core_host::types::path::{ ChannelEndPath, ClientConsensusStatePath, Path, SeqAckPath, SeqRecvPath, SeqSendPath, }; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_core_router::module::Module; use ibc_primitives::prelude::*; diff --git a/crates/ibc-core/ics04-channel/src/handler/recv_packet.rs b/crates/ibc-core/ics04-channel/src/handler/recv_packet.rs index 18fc683a4..cc59d9100 100644 --- a/crates/ibc-core/ics04-channel/src/handler/recv_packet.rs +++ b/crates/ibc-core/ics04-channel/src/handler/recv_packet.rs @@ -9,13 +9,13 @@ use ibc_core_client::context::consensus_state::ConsensusState; use ibc_core_client::types::error::ClientError; use ibc_core_connection::delay::verify_conn_delay_passed; use ibc_core_connection::types::State as ConnectionState; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::path::{ +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::path::{ AckPath, ChannelEndPath, ClientConsensusStatePath, CommitmentPath, Path, ReceiptPath, SeqRecvPath, }; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_core_router::module::Module; use ibc_primitives::prelude::*; use ibc_primitives::Expiry; diff --git a/crates/ibc-core/ics04-channel/src/handler/send_packet.rs b/crates/ibc-core/ics04-channel/src/handler/send_packet.rs index 8eac6b9d7..da97c51c2 100644 --- a/crates/ibc-core/ics04-channel/src/handler/send_packet.rs +++ b/crates/ibc-core/ics04-channel/src/handler/send_packet.rs @@ -6,9 +6,9 @@ use ibc_core_channel_types::packet::Packet; use ibc_core_client::context::client_state::{ClientStateCommon, ClientStateValidation}; use ibc_core_client::context::consensus_state::ConsensusState; use ibc_core_client::types::error::ClientError; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_host_types::path::{ +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::path::{ ChannelEndPath, ClientConsensusStatePath, CommitmentPath, SeqSendPath, }; use ibc_primitives::prelude::*; diff --git a/crates/ibc-core/ics04-channel/src/handler/timeout.rs b/crates/ibc-core/ics04-channel/src/handler/timeout.rs index 5704465a0..28cfd6587 100644 --- a/crates/ibc-core/ics04-channel/src/handler/timeout.rs +++ b/crates/ibc-core/ics04-channel/src/handler/timeout.rs @@ -7,12 +7,12 @@ use ibc_core_client::context::client_state::{ClientStateCommon, ClientStateValid use ibc_core_client::context::consensus_state::ConsensusState; use ibc_core_client::types::error::ClientError; use ibc_core_connection::delay::verify_conn_delay_passed; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::events::{IbcEvent, MessageEvent}; -use ibc_core_context::{ExecutionContext, ValidationContext}; -use ibc_core_host_types::path::{ +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::{IbcEvent, MessageEvent}; +use ibc_core_host::types::path::{ ChannelEndPath, ClientConsensusStatePath, CommitmentPath, Path, ReceiptPath, SeqRecvPath, }; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_core_router::module::Module; use ibc_primitives::prelude::*; use prost::Message; diff --git a/crates/ibc-core/ics04-channel/src/handler/timeout_on_close.rs b/crates/ibc-core/ics04-channel/src/handler/timeout_on_close.rs index 78d2eaedd..85f6b9d12 100644 --- a/crates/ibc-core/ics04-channel/src/handler/timeout_on_close.rs +++ b/crates/ibc-core/ics04-channel/src/handler/timeout_on_close.rs @@ -7,11 +7,11 @@ use ibc_core_client::context::client_state::{ClientStateCommon, ClientStateValid use ibc_core_client::context::consensus_state::ConsensusState; use ibc_core_client::types::error::ClientError; use ibc_core_connection::delay::verify_conn_delay_passed; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::ValidationContext; -use ibc_core_host_types::path::{ +use ibc_core_handler_types::error::ContextError; +use ibc_core_host::types::path::{ ChannelEndPath, ClientConsensusStatePath, CommitmentPath, Path, ReceiptPath, SeqRecvPath, }; +use ibc_core_host::ValidationContext; use ibc_primitives::prelude::*; use prost::Message; diff --git a/crates/ibc-core/context/Cargo.toml b/crates/ibc-core/ics24-host/Cargo.toml similarity index 90% rename from crates/ibc-core/context/Cargo.toml rename to crates/ibc-core/ics24-host/Cargo.toml index 6dd93f04d..18d3a037f 100644 --- a/crates/ibc-core/context/Cargo.toml +++ b/crates/ibc-core/ics24-host/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ibc-core-context" +name = "ibc-core-host" version = { workspace = true } authors = { workspace = true } edition = { workspace = true } @@ -32,7 +32,7 @@ ibc-core-channel-types = { workspace = true } ibc-core-commitment-types = { workspace = true } ibc-core-host-types = { workspace = true } ibc-core-router = { workspace = true } -ibc-core-context-types = { workspace = true } +ibc-core-handler-types = { workspace = true } ibc-primitives = { workspace = true } [dev-dependencies] @@ -48,7 +48,7 @@ std = [ "ibc-core-commitment-types/std", "ibc-core-host-types/std", "ibc-core-router/std", - "ibc-core-context-types/std", + "ibc-core-handler-types/std", "ibc-primitives/std", ] serde = [ @@ -59,7 +59,7 @@ serde = [ "ibc-core-commitment-types/serde", "ibc-core-host-types/serde", "ibc-core-router/serde", - "ibc-core-context-types/serde", + "ibc-core-handler-types/serde", "ibc-primitives/serde", ] schema = [ @@ -68,7 +68,7 @@ schema = [ "ibc-core-channel-types/schema", "ibc-core-commitment-types/schema", "ibc-core-host-types/schema", - "ibc-core-context-types/schema", + "ibc-core-handler-types/schema", "ibc-primitives/schema", "serde", "std" @@ -79,6 +79,7 @@ borsh = [ "ibc-core-channel-types/borsh", "ibc-core-commitment-types/borsh", "ibc-core-host-types/borsh", + "ibc-core-handler-types/borsh", "ibc-primitives/borsh", ] parity-scale-codec = [ @@ -87,5 +88,6 @@ parity-scale-codec = [ "ibc-core-channel-types/parity-scale-codec", "ibc-core-commitment-types/parity-scale-codec", "ibc-core-host-types/parity-scale-codec", + "ibc-core-handler-types/parity-scale-codec", "ibc-primitives/parity-scale-codec", ] \ No newline at end of file diff --git a/crates/ibc-core/context/src/context.rs b/crates/ibc-core/ics24-host/src/context.rs similarity index 98% rename from crates/ibc-core/context/src/context.rs rename to crates/ibc-core/ics24-host/src/context.rs index 7c2b69f73..ba5b5c2d9 100644 --- a/crates/ibc-core/context/src/context.rs +++ b/crates/ibc-core/ics24-host/src/context.rs @@ -12,9 +12,9 @@ use ibc_core_connection_types::version::{ get_compatible_versions, pick_version, Version as ConnectionVersion, }; use ibc_core_connection_types::ConnectionEnd; -use ibc_core_context_types::error::ContextError; -use ibc_core_context_types::events::IbcEvent; -use ibc_core_context_types::proto::Any; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::events::IbcEvent; +use ibc_core_handler_types::proto::Any; use ibc_core_host_types::identifiers::{ClientId, ConnectionId, Sequence}; use ibc_core_host_types::path::{ AckPath, ChannelEndPath, ClientConnectionPath, ClientConsensusStatePath, CommitmentPath, @@ -83,7 +83,7 @@ pub trait ValidationContext { /// requirements](https://github.com/cosmos/ibc/tree/main/spec/core/ics-024-host-requirements#client-state-validation) /// /// Additionally, implementations specific to individual chains can be found - /// in the `ibc-core-extra` crate. + /// in the `ibc-core-hostkit` crate. fn validate_self_client( &self, client_state_of_host_on_counterparty: Any, diff --git a/crates/ibc-core/context/src/lib.rs b/crates/ibc-core/ics24-host/src/lib.rs similarity index 94% rename from crates/ibc-core/context/src/lib.rs rename to crates/ibc-core/ics24-host/src/lib.rs index 7f876eb5d..7e0128da6 100644 --- a/crates/ibc-core/context/src/lib.rs +++ b/crates/ibc-core/ics24-host/src/lib.rs @@ -21,5 +21,5 @@ pub use context::*; pub mod types { #[doc(inline)] - pub use ibc_core_context_types::*; + pub use ibc_core_host_types::*; } diff --git a/crates/ibc-core/context/src/utils.rs b/crates/ibc-core/ics24-host/src/utils.rs similarity index 100% rename from crates/ibc-core/context/src/utils.rs rename to crates/ibc-core/ics24-host/src/utils.rs diff --git a/crates/ibc-core/extra/Cargo.toml b/crates/ibc-core/ics24-host/tendermint/Cargo.toml similarity index 84% rename from crates/ibc-core/extra/Cargo.toml rename to crates/ibc-core/ics24-host/tendermint/Cargo.toml index 7411aa1da..6e0110a38 100644 --- a/crates/ibc-core/extra/Cargo.toml +++ b/crates/ibc-core/ics24-host/tendermint/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ibc-core-extra" +name = "ibc-core-host-tendermint" version = { workspace = true } authors = { workspace = true } edition = { workspace = true } @@ -9,8 +9,8 @@ repository = { workspace = true } keywords = ["blockchain", "cosmos", "ibc"] readme = "./../README.md" description = """ - /// Provides chain-specific helper traits and implementations to facilitate integration of ibc-rs, - /// ensuring efficient interaction with modules/components beyond the IBC modules on host chains. + Provides Tendermint-specific helper traits and implementations to facilitate `ibc-rs` integration, + ensuring proper interaction with modules/components beyond the IBC modules on host chains. """ [package.metadata.docs.rs] @@ -32,7 +32,7 @@ ibc-core-client-context = { workspace = true } ibc-core-connection-types = { workspace = true } ibc-core-commitment-types = { workspace = true } ibc-core-host-types = { workspace = true } -ibc-core-context-types = { workspace = true } +ibc-core-handler-types = { workspace = true } ibc-primitives = { workspace = true } ibc-proto = { workspace = true } @@ -45,6 +45,8 @@ scale-info = { workspace = true, optional = true } [dev-dependencies] ibc-testkit = { workspace = true } +rstest = { workspace = true } + [features] default = ["std"] std = [ @@ -54,7 +56,7 @@ std = [ "ibc-core-connection-types/std", "ibc-core-commitment-types/std", "ibc-core-host-types/std", - "ibc-core-context-types/std", + "ibc-core-handler-types/std", "ibc-primitives/std", "ibc-proto/std", ] @@ -66,7 +68,7 @@ serde = [ "ibc-core-connection-types/serde", "ibc-core-commitment-types/serde", "ibc-core-host-types/serde", - "ibc-core-context-types/serde", + "ibc-core-handler-types/serde", "ibc-primitives/serde", "ibc-proto/serde", ] @@ -87,7 +89,7 @@ parity-scale-codec = [ "ibc-core-connection-types/parity-scale-codec", "ibc-core-commitment-types/parity-scale-codec", "ibc-core-host-types/parity-scale-codec", - "ibc-core-context-types/parity-scale-codec", + "ibc-core-handler-types/parity-scale-codec", "ibc-primitives/parity-scale-codec", "ibc-proto/parity-scale-codec", ] diff --git a/crates/ibc-core/extra/src/tendermint/mod.rs b/crates/ibc-core/ics24-host/tendermint/src/lib.rs similarity index 100% rename from crates/ibc-core/extra/src/tendermint/mod.rs rename to crates/ibc-core/ics24-host/tendermint/src/lib.rs diff --git a/crates/ibc-core/extra/src/tendermint/upgrade_proposal/context.rs b/crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/context.rs similarity index 100% rename from crates/ibc-core/extra/src/tendermint/upgrade_proposal/context.rs rename to crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/context.rs diff --git a/crates/ibc-core/extra/src/tendermint/upgrade_proposal/events.rs b/crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/events.rs similarity index 100% rename from crates/ibc-core/extra/src/tendermint/upgrade_proposal/events.rs rename to crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/events.rs diff --git a/crates/ibc-core/extra/src/tendermint/upgrade_proposal/handler.rs b/crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/handler.rs similarity index 92% rename from crates/ibc-core/extra/src/tendermint/upgrade_proposal/handler.rs rename to crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/handler.rs index 7f0de895a..f861a2e35 100644 --- a/crates/ibc-core/extra/src/tendermint/upgrade_proposal/handler.rs +++ b/crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/handler.rs @@ -4,9 +4,7 @@ use ibc_core_host_types::path::UpgradeClientPath; use ibc_primitives::prelude::*; use tendermint::abci::Event as TmEvent; -use crate::tendermint::upgrade_proposal::{ - UpgradeClientProposal, UpgradeExecutionContext, UpgradeProposal, -}; +use crate::upgrade_proposal::{UpgradeClientProposal, UpgradeExecutionContext, UpgradeProposal}; /// Handles an upgrade client proposal /// diff --git a/crates/ibc-core/extra/src/tendermint/upgrade_proposal/mod.rs b/crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/mod.rs similarity index 100% rename from crates/ibc-core/extra/src/tendermint/upgrade_proposal/mod.rs rename to crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/mod.rs diff --git a/crates/ibc-core/extra/src/tendermint/upgrade_proposal/plan.rs b/crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/plan.rs similarity index 100% rename from crates/ibc-core/extra/src/tendermint/upgrade_proposal/plan.rs rename to crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/plan.rs diff --git a/crates/ibc-core/extra/src/tendermint/upgrade_proposal/proposal.rs b/crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/proposal.rs similarity index 100% rename from crates/ibc-core/extra/src/tendermint/upgrade_proposal/proposal.rs rename to crates/ibc-core/ics24-host/tendermint/src/upgrade_proposal/proposal.rs diff --git a/crates/ibc-core/extra/src/tendermint/validate_self_client.rs b/crates/ibc-core/ics24-host/tendermint/src/validate_self_client.rs similarity index 99% rename from crates/ibc-core/extra/src/tendermint/validate_self_client.rs rename to crates/ibc-core/ics24-host/tendermint/src/validate_self_client.rs index 4ec53f2ee..b2154d94f 100644 --- a/crates/ibc-core/extra/src/tendermint/validate_self_client.rs +++ b/crates/ibc-core/ics24-host/tendermint/src/validate_self_client.rs @@ -6,7 +6,7 @@ use ibc_core_client_types::error::ClientError; use ibc_core_client_types::Height; use ibc_core_commitment_types::specs::ProofSpecs; use ibc_core_connection_types::error::ConnectionError; -use ibc_core_context_types::error::ContextError; +use ibc_core_handler_types::error::ContextError; use ibc_core_host_types::identifiers::ChainId; use ibc_primitives::prelude::*; use ibc_proto::google::protobuf::Any; diff --git a/crates/ibc-core/ics25-handler/Cargo.toml b/crates/ibc-core/ics25-handler/Cargo.toml new file mode 100644 index 000000000..18e408687 --- /dev/null +++ b/crates/ibc-core/ics25-handler/Cargo.toml @@ -0,0 +1,76 @@ +[package] +name = "ibc-core-handler" +version = { workspace = true } +authors = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } +license = { workspace = true } +repository = { workspace = true } +keywords = ["blockchain", "cosmos", "ibc"] +readme = "README.md" +description = """ + Exposes IBC handler entry points for an integrated IBC core modules via the `ibc-rs` crates. + These entry points are responsible for processing incoming IBC messages, performing validation, + and execution of the appropriate handler logic. +""" + +[package.metadata.docs.rs] +all-features = true + +[dependencies] +ibc-core-client = { workspace = true } +ibc-core-connection = { workspace = true } +ibc-core-channel = { workspace = true } +ibc-core-commitment-types = { workspace = true } +ibc-core-router = { workspace = true } +ibc-core-handler-types = { workspace = true } +ibc-core-host = { workspace = true } +ibc-primitives = { workspace = true } + +[features] +default = ["std"] +std = [ + "ibc-core-client/std", + "ibc-core-connection/std", + "ibc-core-channel/std", + "ibc-core-commitment-types/std", + "ibc-core-host/std", + "ibc-core-router/std", + "ibc-core-handler-types/std", +] +serde = [ + "ibc-core-client/serde", + "ibc-core-connection/serde", + "ibc-core-channel/serde", + "ibc-core-commitment-types/serde", + "ibc-core-host/serde", + "ibc-core-router/serde", + "ibc-core-handler-types/serde", +] +borsh = [ + "ibc-core-client/borsh", + "ibc-core-connection/borsh", + "ibc-core-channel/borsh", + "ibc-core-commitment-types/borsh", + "ibc-core-host/borsh", + "ibc-core-router/borsh", + "ibc-core-handler-types/borsh", +] +schema = [ + "ibc-core-client/schema", + "ibc-core-connection/schema", + "ibc-core-channel/schema", + "ibc-core-commitment-types/schema", + "ibc-core-host/schema", + "ibc-core-router/schema", + "ibc-core-handler-types/schema", +] +parity-scale-codec = [ + "ibc-core-client/parity-scale-codec", + "ibc-core-connection/parity-scale-codec", + "ibc-core-channel/parity-scale-codec", + "ibc-core-host/parity-scale-codec", + "ibc-core-router/parity-scale-codec", + "ibc-core-handler-types/parity-scale-codec", + "ibc-primitives/parity-scale-codec", +] diff --git a/crates/ibc-core/src/entrypoint.rs b/crates/ibc-core/ics25-handler/src/entrypoint.rs similarity index 98% rename from crates/ibc-core/src/entrypoint.rs rename to crates/ibc-core/ics25-handler/src/entrypoint.rs index d67f6680c..957e147c0 100644 --- a/crates/ibc-core/src/entrypoint.rs +++ b/crates/ibc-core/ics25-handler/src/entrypoint.rs @@ -15,9 +15,9 @@ use ibc_core_connection::handler::{ conn_open_ack, conn_open_confirm, conn_open_init, conn_open_try, }; use ibc_core_connection::types::msgs::ConnectionMsg; -use ibc_core_context::types::error::ContextError; -use ibc_core_context::types::msgs::MsgEnvelope; -use ibc_core_context::{ExecutionContext, ValidationContext}; +use ibc_core_handler_types::error::ContextError; +use ibc_core_handler_types::msgs::MsgEnvelope; +use ibc_core_host::{ExecutionContext, ValidationContext}; use ibc_core_router::router::Router; use ibc_core_router::types::error::RouterError; diff --git a/crates/ibc-core/ics25-handler/src/lib.rs b/crates/ibc-core/ics25-handler/src/lib.rs new file mode 100644 index 000000000..a41f8ffd2 --- /dev/null +++ b/crates/ibc-core/ics25-handler/src/lib.rs @@ -0,0 +1,19 @@ +//! Exports data structures and implementations of different IBC core (TAO) components. +#![no_std] +#![forbid(unsafe_code)] +#![cfg_attr(not(test), deny(clippy::unwrap_used))] +#![cfg_attr(not(test), deny(clippy::disallowed_methods, clippy::disallowed_types,))] +#![deny( + warnings, + trivial_numeric_casts, + unused_import_braces, + unused_qualifications, + rust_2018_idioms +)] + +pub mod entrypoint; + +pub mod types { + #[doc(inline)] + pub use ibc_core_handler_types::*; +} diff --git a/crates/ibc-core/context/types/Cargo.toml b/crates/ibc-core/ics25-handler/types/Cargo.toml similarity index 92% rename from crates/ibc-core/context/types/Cargo.toml rename to crates/ibc-core/ics25-handler/types/Cargo.toml index 56715f708..6819d01b3 100644 --- a/crates/ibc-core/context/types/Cargo.toml +++ b/crates/ibc-core/ics25-handler/types/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ibc-core-context-types" +name = "ibc-core-handler-types" version = { workspace = true } authors = { workspace = true } edition = { workspace = true } @@ -9,9 +9,8 @@ repository = { workspace = true } keywords = ["blockchain", "cosmos", "ibc", "data structures"] readme = "./../../README.md" description = """ - Encapsulates essential top-level data structures necessary for the `ibc-core-context` - crate facilitating the seamless interaction between an implemented IBC modules using - `ibc-rs` and the underlying host blockchain. + Encapsulates top-level pivotal data structures, especially enums, designed to handle + any kind of incoming IBC messages within implemented IBC core modules. """ [package.metadata.docs.rs] @@ -84,9 +83,9 @@ schema = [ "ibc-core-commitment-types/schema", "ibc-core-host-types/schema", "ibc-core-router-types/schema", - "serde", "ibc-primitives/schema", "ibc-proto/json-schema", + "serde", "std" ] borsh = [ diff --git a/crates/ibc-core/context/types/src/error.rs b/crates/ibc-core/ics25-handler/types/src/error.rs similarity index 100% rename from crates/ibc-core/context/types/src/error.rs rename to crates/ibc-core/ics25-handler/types/src/error.rs diff --git a/crates/ibc-core/context/types/src/events.rs b/crates/ibc-core/ics25-handler/types/src/events.rs similarity index 100% rename from crates/ibc-core/context/types/src/events.rs rename to crates/ibc-core/ics25-handler/types/src/events.rs diff --git a/crates/ibc-core/context/types/src/lib.rs b/crates/ibc-core/ics25-handler/types/src/lib.rs similarity index 98% rename from crates/ibc-core/context/types/src/lib.rs rename to crates/ibc-core/ics25-handler/types/src/lib.rs index 4a4cc4dac..33fc3fdba 100644 --- a/crates/ibc-core/context/types/src/lib.rs +++ b/crates/ibc-core/ics25-handler/types/src/lib.rs @@ -21,7 +21,7 @@ pub mod events; pub mod msgs; /// Re-exports necessary proto types from the `ibc-proto-rs` crate, which are -/// instrumental in the implementation of the higher-level `ibc-core-context` +/// instrumental in the implementation of the higher-level `ibc-core-handler` /// crate. pub mod proto { pub use ibc_proto::google::protobuf::Any; diff --git a/crates/ibc-core/context/types/src/msgs.rs b/crates/ibc-core/ics25-handler/types/src/msgs.rs similarity index 100% rename from crates/ibc-core/context/types/src/msgs.rs rename to crates/ibc-core/ics25-handler/types/src/msgs.rs diff --git a/crates/ibc-core/src/lib.rs b/crates/ibc-core/src/lib.rs index 43abc3b41..34ae5ca9e 100644 --- a/crates/ibc-core/src/lib.rs +++ b/crates/ibc-core/src/lib.rs @@ -11,7 +11,10 @@ rust_2018_idioms )] -pub mod entrypoint; +pub mod entrypoint { + #[doc(inline)] + pub use ibc_core_handler::entrypoint::*; +} pub mod channel { #[doc(inline)] @@ -23,7 +26,7 @@ pub mod client { pub use ibc_core_client::*; } -pub mod commitment { +pub mod commitment_types { #[doc(inline)] pub use ibc_core_commitment_types::*; } @@ -33,14 +36,14 @@ pub mod connection { pub use ibc_core_connection::*; } -pub mod context { +pub mod host { #[doc(inline)] - pub use ibc_core_context::*; + pub use ibc_core_host::*; } -pub mod host { +pub mod handler { #[doc(inline)] - pub use ibc_core_host_types::*; + pub use ibc_core_handler::*; } pub mod router { diff --git a/crates/ibc-data-types/Cargo.toml b/crates/ibc-data-types/Cargo.toml index de252867d..12ab57609 100644 --- a/crates/ibc-data-types/Cargo.toml +++ b/crates/ibc-data-types/Cargo.toml @@ -24,7 +24,7 @@ ibc-core-channel-types = { workspace = true } ibc-core-commitment-types = { workspace = true } ibc-core-host-types = { workspace = true } ibc-core-router-types = { workspace = true } -ibc-core-context-types = { workspace = true } +ibc-core-handler-types = { workspace = true } ibc-primitives = { workspace = true } [features] @@ -37,7 +37,7 @@ std = [ "ibc-core-commitment-types/std", "ibc-core-host-types/std", "ibc-core-router-types/std", - "ibc-core-context-types/std", + "ibc-core-handler-types/std", "ibc-primitives/std", ] serde = [ @@ -48,7 +48,7 @@ serde = [ "ibc-core-commitment-types/serde", "ibc-core-host-types/serde", "ibc-core-router-types/serde", - "ibc-core-context-types/serde", + "ibc-core-handler-types/serde", "ibc-primitives/serde", ] borsh = [ @@ -58,7 +58,7 @@ borsh = [ "ibc-core-channel-types/borsh", "ibc-core-host-types/borsh", "ibc-core-router-types/borsh", - "ibc-core-context-types/borsh", + "ibc-core-handler-types/borsh", "ibc-primitives/borsh", ] schema = [ @@ -68,7 +68,7 @@ schema = [ "ibc-core-channel-types/schema", "ibc-core-host-types/schema", "ibc-core-router-types/schema", - "ibc-core-context-types/schema", + "ibc-core-handler-types/schema", "ibc-primitives/schema", ] parity-scale-codec = [ @@ -78,6 +78,6 @@ parity-scale-codec = [ "ibc-core-channel-types/parity-scale-codec", "ibc-core-host-types/parity-scale-codec", "ibc-core-router-types/parity-scale-codec", - "ibc-core-context-types/parity-scale-codec", + "ibc-core-handler-types/parity-scale-codec", "ibc-primitives/parity-scale-codec", ] \ No newline at end of file diff --git a/crates/ibc-data-types/src/lib.rs b/crates/ibc-data-types/src/lib.rs index a5e42d2b5..907158709 100644 --- a/crates/ibc-data-types/src/lib.rs +++ b/crates/ibc-data-types/src/lib.rs @@ -37,14 +37,14 @@ pub mod commitment { pub use ibc_core_commitment_types::*; } -pub mod context { +pub mod host { #[doc(inline)] - pub use ibc_core_context_types::*; + pub use ibc_core_host_types::*; } -pub mod host { +pub mod handler { #[doc(inline)] - pub use ibc_core_host_types::*; + pub use ibc_core_handler_types::*; } pub mod router { diff --git a/crates/ibc-derive/src/utils.rs b/crates/ibc-derive/src/utils.rs index 362578027..d54f20d31 100644 --- a/crates/ibc-derive/src/utils.rs +++ b/crates/ibc-derive/src/utils.rs @@ -10,19 +10,19 @@ pub struct Imports; impl Imports { pub fn CommitmentRoot() -> TokenStream { - quote! {ibc::core::commitment::commitment::CommitmentRoot} + quote! {ibc::core::commitment_types::commitment::CommitmentRoot} } pub fn CommitmentPrefix() -> TokenStream { - quote! {ibc::core::commitment::commitment::CommitmentPrefix} + quote! {ibc::core::commitment_types::commitment::CommitmentPrefix} } pub fn CommitmentProofBytes() -> TokenStream { - quote! {ibc::core::commitment::commitment::CommitmentProofBytes} + quote! {ibc::core::commitment_types::commitment::CommitmentProofBytes} } pub fn Path() -> TokenStream { - quote! {ibc::core::host::path::Path} + quote! {ibc::core::host::types::path::Path} } pub fn ConsensusState() -> TokenStream { @@ -42,11 +42,11 @@ impl Imports { } pub fn ClientId() -> TokenStream { - quote! {ibc::core::host::identifiers::ClientId} + quote! {ibc::core::host::types::identifiers::ClientId} } pub fn ClientType() -> TokenStream { - quote! {ibc::core::host::identifiers::ClientType} + quote! {ibc::core::host::types::identifiers::ClientType} } pub fn ClientError() -> TokenStream { diff --git a/crates/ibc-query/Cargo.toml b/crates/ibc-query/Cargo.toml index 5f017f71e..ca5397e3b 100644 --- a/crates/ibc-query/Cargo.toml +++ b/crates/ibc-query/Cargo.toml @@ -20,7 +20,7 @@ tonic = "0.10" # ibc dependencies ibc = { workspace = true } -ibc-core-extra = { workspace = true } +ibc-core-host-tendermint = { workspace = true } ibc-proto = { workspace = true, features = ["server"] } [features] diff --git a/crates/ibc-query/src/core/channel/query.rs b/crates/ibc-query/src/core/channel/query.rs index 2dcf611f7..5d9e22681 100644 --- a/crates/ibc-query/src/core/channel/query.rs +++ b/crates/ibc-query/src/core/channel/query.rs @@ -4,12 +4,12 @@ use alloc::format; use core::str::FromStr; use ibc::core::client::types::Height; -use ibc::core::context::ValidationContext; -use ibc::core::host::identifiers::{ChannelId, ConnectionId, PortId, Sequence}; -use ibc::core::host::path::{ +use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId, Sequence}; +use ibc::core::host::types::path::{ AckPath, ChannelEndPath, ClientConsensusStatePath, ClientStatePath, CommitmentPath, Path, ReceiptPath, SeqRecvPath, }; +use ibc::core::host::ValidationContext; use ibc_proto::google::protobuf::Any; use ibc_proto::ibc::core::channel::v1::{ QueryChannelClientStateRequest, QueryChannelClientStateResponse, diff --git a/crates/ibc-query/src/core/channel/service.rs b/crates/ibc-query/src/core/channel/service.rs index 030c3083e..4aeb18ddc 100644 --- a/crates/ibc-query/src/core/channel/service.rs +++ b/crates/ibc-query/src/core/channel/service.rs @@ -4,7 +4,7 @@ use alloc::boxed::Box; -use ibc::core::context::ValidationContext; +use ibc::core::host::ValidationContext; use ibc::core::primitives::prelude::*; use ibc_proto::google::protobuf::Any; use ibc_proto::ibc::core::channel::v1::query_server::Query as ChannelQuery; diff --git a/crates/ibc-query/src/core/client/query.rs b/crates/ibc-query/src/core/client/query.rs index e80a56584..66f621637 100644 --- a/crates/ibc-query/src/core/client/query.rs +++ b/crates/ibc-query/src/core/client/query.rs @@ -6,10 +6,12 @@ use core::str::FromStr; use ibc::core::client::context::client_state::ClientStateValidation; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; -use ibc::core::context::ValidationContext; -use ibc::core::host::identifiers::ClientId; -use ibc::core::host::path::{ClientConsensusStatePath, ClientStatePath, Path, UpgradeClientPath}; -use ibc_core_extra::tendermint::upgrade_proposal::UpgradeValidationContext; +use ibc::core::host::types::identifiers::ClientId; +use ibc::core::host::types::path::{ + ClientConsensusStatePath, ClientStatePath, Path, UpgradeClientPath, +}; +use ibc::core::host::ValidationContext; +use ibc_core_host_tendermint::upgrade_proposal::UpgradeValidationContext; use ibc_proto::google::protobuf::Any; use ibc_proto::ibc::core::client::v1::{ ConsensusStateWithHeight, IdentifiedClientState, QueryClientStateRequest, diff --git a/crates/ibc-query/src/core/client/service.rs b/crates/ibc-query/src/core/client/service.rs index 646abc20c..1eed041ad 100644 --- a/crates/ibc-query/src/core/client/service.rs +++ b/crates/ibc-query/src/core/client/service.rs @@ -4,9 +4,9 @@ use alloc::boxed::Box; -use ibc::core::context::ValidationContext; +use ibc::core::host::ValidationContext; use ibc::core::primitives::prelude::*; -use ibc_core_extra::tendermint::upgrade_proposal::UpgradeValidationContext; +use ibc_core_host_tendermint::upgrade_proposal::UpgradeValidationContext; use ibc_proto::google::protobuf::Any; use ibc_proto::ibc::core::client::v1::query_server::Query as ClientQuery; use ibc_proto::ibc::core::client::v1::{ diff --git a/crates/ibc-query/src/core/connection/query.rs b/crates/ibc-query/src/core/connection/query.rs index bd80f20d5..e7eafc92f 100644 --- a/crates/ibc-query/src/core/connection/query.rs +++ b/crates/ibc-query/src/core/connection/query.rs @@ -5,11 +5,11 @@ use alloc::vec::Vec; use core::str::FromStr; use ibc::core::client::types::Height; -use ibc::core::context::ValidationContext; -use ibc::core::host::identifiers::{ClientId, ConnectionId}; -use ibc::core::host::path::{ +use ibc::core::host::types::identifiers::{ClientId, ConnectionId}; +use ibc::core::host::types::path::{ ClientConnectionPath, ClientConsensusStatePath, ClientStatePath, ConnectionPath, Path, }; +use ibc::core::host::ValidationContext; use ibc_proto::google::protobuf::Any; use ibc_proto::ibc::core::client::v1::IdentifiedClientState; use ibc_proto::ibc::core::connection::v1::{ diff --git a/crates/ibc-query/src/core/connection/service.rs b/crates/ibc-query/src/core/connection/service.rs index f5ca237c4..04811b883 100644 --- a/crates/ibc-query/src/core/connection/service.rs +++ b/crates/ibc-query/src/core/connection/service.rs @@ -4,7 +4,7 @@ use alloc::boxed::Box; -use ibc::core::context::ValidationContext; +use ibc::core::host::ValidationContext; use ibc::core::primitives::prelude::*; use ibc_proto::google::protobuf::Any; use ibc_proto::ibc::core::connection::v1::query_server::Query as ConnectionQuery; diff --git a/crates/ibc-query/src/core/context.rs b/crates/ibc-query/src/core/context.rs index bb9eebc5e..2f4eef7a1 100644 --- a/crates/ibc-query/src/core/context.rs +++ b/crates/ibc-query/src/core/context.rs @@ -4,10 +4,10 @@ use ibc::core::channel::types::channel::IdentifiedChannelEnd; use ibc::core::channel::types::packet::PacketState; use ibc::core::client::types::Height; use ibc::core::connection::types::IdentifiedConnectionEnd; -use ibc::core::context::types::error::ContextError; -use ibc::core::context::ValidationContext; -use ibc::core::host::identifiers::{ClientId, ConnectionId, Sequence}; -use ibc::core::host::path::{ChannelEndPath, Path}; +use ibc::core::handler::types::error::ContextError; +use ibc::core::host::types::identifiers::{ClientId, ConnectionId, Sequence}; +use ibc::core::host::types::path::{ChannelEndPath, Path}; +use ibc::core::host::ValidationContext; use ibc::core::primitives::prelude::*; /// Context to be implemented by the host to provide proofs in query responses diff --git a/crates/ibc-query/src/error.rs b/crates/ibc-query/src/error.rs index 0178cee61..9b8eb54f2 100644 --- a/crates/ibc-query/src/error.rs +++ b/crates/ibc-query/src/error.rs @@ -2,8 +2,8 @@ use alloc::string::{String, ToString}; use displaydoc::Display; use ibc::core::client::types::error::ClientError; -use ibc::core::context::types::error::ContextError; -use ibc::core::host::error::IdentifierError; +use ibc::core::handler::types::error::ContextError; +use ibc::core::host::types::error::IdentifierError; use tonic::Status; #[derive(Debug, Display)] diff --git a/crates/ibc-testkit/src/hosts/block.rs b/crates/ibc-testkit/src/hosts/block.rs index 9b3639e9d..c85379625 100644 --- a/crates/ibc-testkit/src/hosts/block.rs +++ b/crates/ibc-testkit/src/hosts/block.rs @@ -6,7 +6,7 @@ use ibc::clients::ics07_tendermint::consensus_state::ConsensusState as TmConsens use ibc::clients::ics07_tendermint::header::{Header, TENDERMINT_HEADER_TYPE_URL}; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; -use ibc::core::host::identifiers::ChainId; +use ibc::core::host::types::identifiers::ChainId; use ibc::core::primitives::prelude::*; use ibc::core::primitives::Timestamp; use ibc::proto::tendermint::v1::Header as RawHeader; diff --git a/crates/ibc-testkit/src/relayer/context.rs b/crates/ibc-testkit/src/relayer/context.rs index 63cebce99..9fab6a8e6 100644 --- a/crates/ibc-testkit/src/relayer/context.rs +++ b/crates/ibc-testkit/src/relayer/context.rs @@ -1,7 +1,7 @@ use ibc::core::client::types::Height; -use ibc::core::context::types::error::ContextError; -use ibc::core::context::ValidationContext; -use ibc::core::host::identifiers::ClientId; +use ibc::core::handler::types::error::ContextError; +use ibc::core::host::types::identifiers::ClientId; +use ibc::core::host::ValidationContext; use ibc::core::primitives::prelude::*; use ibc::core::primitives::Signer; @@ -47,8 +47,8 @@ mod tests { use ibc::core::client::context::client_state::ClientStateCommon; use ibc::core::client::types::msgs::{ClientMsg, MsgUpdateClient}; use ibc::core::client::types::Height; - use ibc::core::context::types::msgs::MsgEnvelope; - use ibc::core::host::identifiers::ChainId; + use ibc::core::handler::types::msgs::MsgEnvelope; + use ibc::core::host::types::identifiers::ChainId; use test_log::test; use tracing::debug; diff --git a/crates/ibc-testkit/src/relayer/error.rs b/crates/ibc-testkit/src/relayer/error.rs index d334e7ca6..2e5c368c8 100644 --- a/crates/ibc-testkit/src/relayer/error.rs +++ b/crates/ibc-testkit/src/relayer/error.rs @@ -1,8 +1,8 @@ use displaydoc::Display; use ibc::core::client::types::Height; use ibc::core::connection::types::error::ConnectionError; -use ibc::core::context::types::error::ContextError; -use ibc::core::host::identifiers::ClientId; +use ibc::core::handler::types::error::ContextError; +use ibc::core::host::types::identifiers::ClientId; #[derive(Debug, Display)] pub enum RelayerError { diff --git a/crates/ibc-testkit/src/testapp/ibc/applications/transfer/context.rs b/crates/ibc-testkit/src/testapp/ibc/applications/transfer/context.rs index 4c16d1a9d..3ee8efac0 100644 --- a/crates/ibc-testkit/src/testapp/ibc/applications/transfer/context.rs +++ b/crates/ibc-testkit/src/testapp/ibc/applications/transfer/context.rs @@ -1,4 +1,4 @@ -use ibc::core::host::identifiers::{ChannelId, PortId}; +use ibc::core::host::types::identifiers::{ChannelId, PortId}; use ibc::core::primitives::Signer; use ibc_app_transfer::context::{ cosmos_adr028_escrow_address, TokenTransferExecutionContext, TokenTransferValidationContext, diff --git a/crates/ibc-testkit/src/testapp/ibc/applications/transfer/module.rs b/crates/ibc-testkit/src/testapp/ibc/applications/transfer/module.rs index 3d86da642..2246c893b 100644 --- a/crates/ibc-testkit/src/testapp/ibc/applications/transfer/module.rs +++ b/crates/ibc-testkit/src/testapp/ibc/applications/transfer/module.rs @@ -3,7 +3,7 @@ use ibc::core::channel::types::channel::{Counterparty, Order}; use ibc::core::channel::types::error::{ChannelError, PacketError}; use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::Version; -use ibc::core::host::identifiers::{ChannelId, ConnectionId, PortId}; +use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId}; use ibc::core::primitives::prelude::*; use ibc::core::primitives::Signer; use ibc::core::router::module::Module; diff --git a/crates/ibc-testkit/src/testapp/ibc/clients/mock/client_state.rs b/crates/ibc-testkit/src/testapp/ibc/clients/mock/client_state.rs index 4956aeecd..20ca29604 100644 --- a/crates/ibc-testkit/src/testapp/ibc/clients/mock/client_state.rs +++ b/crates/ibc-testkit/src/testapp/ibc/clients/mock/client_state.rs @@ -7,10 +7,12 @@ use ibc::core::client::context::client_state::{ use ibc::core::client::context::{ClientExecutionContext, ClientValidationContext}; use ibc::core::client::types::error::{ClientError, UpgradeClientError}; use ibc::core::client::types::{Height, Status, UpdateKind}; -use ibc::core::commitment::commitment::{CommitmentPrefix, CommitmentProofBytes, CommitmentRoot}; -use ibc::core::context::types::error::ContextError; -use ibc::core::host::identifiers::{ClientId, ClientType}; -use ibc::core::host::path::{ClientConsensusStatePath, ClientStatePath, Path}; +use ibc::core::commitment_types::commitment::{ + CommitmentPrefix, CommitmentProofBytes, CommitmentRoot, +}; +use ibc::core::handler::types::error::ContextError; +use ibc::core::host::types::identifiers::{ClientId, ClientType}; +use ibc::core::host::types::path::{ClientConsensusStatePath, ClientStatePath, Path}; use ibc::core::primitives::prelude::*; use ibc::core::primitives::Timestamp; use ibc::proto::{Any, Protobuf}; diff --git a/crates/ibc-testkit/src/testapp/ibc/clients/mock/consensus_state.rs b/crates/ibc-testkit/src/testapp/ibc/clients/mock/consensus_state.rs index 0b47edb11..184645d18 100644 --- a/crates/ibc-testkit/src/testapp/ibc/clients/mock/consensus_state.rs +++ b/crates/ibc-testkit/src/testapp/ibc/clients/mock/consensus_state.rs @@ -1,6 +1,6 @@ use ibc::core::client::context::consensus_state::ConsensusState; use ibc::core::client::types::error::ClientError; -use ibc::core::commitment::commitment::CommitmentRoot; +use ibc::core::commitment_types::commitment::CommitmentRoot; use ibc::core::primitives::prelude::*; use ibc::core::primitives::Timestamp; use ibc::proto::{Any, Protobuf}; diff --git a/crates/ibc-testkit/src/testapp/ibc/clients/mock/misbehaviour.rs b/crates/ibc-testkit/src/testapp/ibc/clients/mock/misbehaviour.rs index fee3a4d44..c3e66e4d7 100644 --- a/crates/ibc-testkit/src/testapp/ibc/clients/mock/misbehaviour.rs +++ b/crates/ibc-testkit/src/testapp/ibc/clients/mock/misbehaviour.rs @@ -1,6 +1,6 @@ use bytes::Buf; use ibc::core::client::types::error::ClientError; -use ibc::core::host::identifiers::ClientId; +use ibc::core::host::types::identifiers::ClientId; use ibc::core::primitives::prelude::*; use ibc::proto::{Any, Protobuf}; diff --git a/crates/ibc-testkit/src/testapp/ibc/core/client_ctx.rs b/crates/ibc-testkit/src/testapp/ibc/core/client_ctx.rs index f7050856b..01301a93b 100644 --- a/crates/ibc-testkit/src/testapp/ibc/core/client_ctx.rs +++ b/crates/ibc-testkit/src/testapp/ibc/core/client_ctx.rs @@ -7,10 +7,10 @@ use ibc::clients::ics07_tendermint::{ use ibc::core::client::context::{ClientExecutionContext, ClientValidationContext}; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; -use ibc::core::context::types::error::ContextError; -use ibc::core::context::ValidationContext; -use ibc::core::host::identifiers::{ChannelId, ClientId, PortId}; -use ibc::core::host::path::{ClientConsensusStatePath, ClientStatePath}; +use ibc::core::handler::types::error::ContextError; +use ibc::core::host::types::identifiers::{ChannelId, ClientId, PortId}; +use ibc::core::host::types::path::{ClientConsensusStatePath, ClientStatePath}; +use ibc::core::host::ValidationContext; use ibc::core::primitives::Timestamp; use crate::testapp::ibc::clients::mock::client_state::MockClientContext; diff --git a/crates/ibc-testkit/src/testapp/ibc/core/core_ctx.rs b/crates/ibc-testkit/src/testapp/ibc/core/core_ctx.rs index a81e0c4b9..a37b185d3 100644 --- a/crates/ibc-testkit/src/testapp/ibc/core/core_ctx.rs +++ b/crates/ibc-testkit/src/testapp/ibc/core/core_ctx.rs @@ -10,17 +10,17 @@ use ibc::core::channel::types::error::{ChannelError, PacketError}; use ibc::core::channel::types::packet::Receipt; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; -use ibc::core::commitment::commitment::CommitmentPrefix; +use ibc::core::commitment_types::commitment::CommitmentPrefix; use ibc::core::connection::types::error::ConnectionError; use ibc::core::connection::types::ConnectionEnd; -use ibc::core::context::types::error::ContextError; -use ibc::core::context::types::events::IbcEvent; -use ibc::core::context::{ExecutionContext, ValidationContext}; -use ibc::core::host::identifiers::{ClientId, ConnectionId, Sequence}; -use ibc::core::host::path::{ +use ibc::core::handler::types::error::ContextError; +use ibc::core::handler::types::events::IbcEvent; +use ibc::core::host::types::identifiers::{ClientId, ConnectionId, Sequence}; +use ibc::core::host::types::path::{ AckPath, ChannelEndPath, ClientConnectionPath, ClientConsensusStatePath, CommitmentPath, ConnectionPath, ReceiptPath, SeqAckPath, SeqRecvPath, SeqSendPath, }; +use ibc::core::host::{ExecutionContext, ValidationContext}; use ibc::core::primitives::prelude::*; use ibc::core::primitives::{Signer, Timestamp}; use ibc::proto::Any; diff --git a/crates/ibc-testkit/src/testapp/ibc/core/router/context.rs b/crates/ibc-testkit/src/testapp/ibc/core/router/context.rs index 37ba9b0e0..aa8faefc8 100644 --- a/crates/ibc-testkit/src/testapp/ibc/core/router/context.rs +++ b/crates/ibc-testkit/src/testapp/ibc/core/router/context.rs @@ -1,6 +1,6 @@ use alloc::sync::Arc; -use ibc::core::host::identifiers::PortId; +use ibc::core::host::types::identifiers::PortId; use ibc::core::router::module::Module; use ibc::core::router::router::Router; use ibc::core::router::types::module::ModuleId; diff --git a/crates/ibc-testkit/src/testapp/ibc/core/router/types.rs b/crates/ibc-testkit/src/testapp/ibc/core/router/types.rs index a51eac12d..f6d78a6a3 100644 --- a/crates/ibc-testkit/src/testapp/ibc/core/router/types.rs +++ b/crates/ibc-testkit/src/testapp/ibc/core/router/types.rs @@ -1,7 +1,7 @@ use alloc::collections::BTreeMap; use alloc::sync::Arc; -use ibc::core::host::identifiers::PortId; +use ibc::core::host::types::identifiers::PortId; use ibc::core::primitives::prelude::*; use ibc::core::router::module::Module; use ibc::core::router::types::module::ModuleId; diff --git a/crates/ibc-testkit/src/testapp/ibc/core/types.rs b/crates/ibc-testkit/src/testapp/ibc/core/types.rs index b0c9e9f84..8ff12281e 100644 --- a/crates/ibc-testkit/src/testapp/ibc/core/types.rs +++ b/crates/ibc-testkit/src/testapp/ibc/core/types.rs @@ -14,13 +14,13 @@ use ibc::core::channel::types::commitment::{AcknowledgementCommitment, PacketCom use ibc::core::channel::types::packet::Receipt; use ibc::core::client::types::Height; use ibc::core::connection::types::ConnectionEnd; -use ibc::core::context::types::events::IbcEvent; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; use ibc::core::entrypoint::dispatch; -use ibc::core::host::identifiers::{ +use ibc::core::handler::types::events::IbcEvent; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ ChainId, ChannelId, ClientId, ClientType, ConnectionId, PortId, Sequence, }; +use ibc::core::host::ValidationContext; use ibc::core::primitives::prelude::*; use ibc::core::primitives::Timestamp; use ibc::core::router::router::Router; diff --git a/crates/ibc-testkit/src/utils/dummies/applications/transfer.rs b/crates/ibc-testkit/src/utils/dummies/applications/transfer.rs index 4ed1f012e..ec0191777 100644 --- a/crates/ibc-testkit/src/utils/dummies/applications/transfer.rs +++ b/crates/ibc-testkit/src/utils/dummies/applications/transfer.rs @@ -2,7 +2,7 @@ use alloc::string::ToString; use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::timeout::TimeoutHeight; -use ibc::core::host::identifiers::{ChannelId, PortId, Sequence}; +use ibc::core::host::types::identifiers::{ChannelId, PortId, Sequence}; use ibc::core::primitives::{Signer, Timestamp}; use ibc_app_transfer::types::msgs::transfer::MsgTransfer; use ibc_app_transfer::types::packet::PacketData; diff --git a/crates/ibc-testkit/src/utils/dummies/clients/tendermint.rs b/crates/ibc-testkit/src/utils/dummies/clients/tendermint.rs index ab193d894..9c2ebbd95 100644 --- a/crates/ibc-testkit/src/utils/dummies/clients/tendermint.rs +++ b/crates/ibc-testkit/src/utils/dummies/clients/tendermint.rs @@ -8,8 +8,8 @@ use ibc::clients::ics07_tendermint::header::Header; use ibc::clients::ics07_tendermint::trust_threshold::TrustThreshold; use ibc::core::client::types::proto::v1::Height as RawHeight; use ibc::core::client::types::Height; -use ibc::core::commitment::specs::ProofSpecs; -use ibc::core::host::identifiers::ChainId; +use ibc::core::commitment_types::specs::ProofSpecs; +use ibc::core::host::types::identifiers::ChainId; use ibc::core::primitives::prelude::*; use ibc::proto::tendermint::v1::{ClientState as RawTmClientState, Fraction}; use tendermint::block::Header as TmHeader; diff --git a/crates/ibc-testkit/src/utils/dummies/core/channel/chan_close_confirm.rs b/crates/ibc-testkit/src/utils/dummies/core/channel/chan_close_confirm.rs index 1e877feac..1ee818729 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/channel/chan_close_confirm.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/channel/chan_close_confirm.rs @@ -1,6 +1,6 @@ use ibc::core::channel::types::proto::v1::MsgChannelCloseConfirm as RawMsgChannelCloseConfirm; use ibc::core::client::types::proto::v1::Height; -use ibc::core::host::identifiers::{ChannelId, PortId}; +use ibc::core::host::types::identifiers::{ChannelId, PortId}; use ibc::core::primitives::prelude::*; use super::dummy_proof; diff --git a/crates/ibc-testkit/src/utils/dummies/core/channel/chan_close_init.rs b/crates/ibc-testkit/src/utils/dummies/core/channel/chan_close_init.rs index 5b49a1354..9753b02a5 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/channel/chan_close_init.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/channel/chan_close_init.rs @@ -1,5 +1,5 @@ use ibc::core::channel::types::proto::v1::MsgChannelCloseInit as RawMsgChannelCloseInit; -use ibc::core::host::identifiers::{ChannelId, PortId}; +use ibc::core::host::types::identifiers::{ChannelId, PortId}; use ibc::core::primitives::prelude::*; use crate::utils::dummies::core::signer::dummy_bech32_account; diff --git a/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_ack.rs b/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_ack.rs index 3920a3955..0436fc1b2 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_ack.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_ack.rs @@ -1,6 +1,6 @@ use ibc::core::channel::types::proto::v1::MsgChannelOpenAck as RawMsgChannelOpenAck; use ibc::core::client::types::proto::v1::Height; -use ibc::core::host::identifiers::{ChannelId, PortId}; +use ibc::core::host::types::identifiers::{ChannelId, PortId}; use ibc::core::primitives::prelude::*; use super::dummy_proof; diff --git a/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_confirm.rs b/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_confirm.rs index 86b806fec..03c661f6d 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_confirm.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_confirm.rs @@ -1,6 +1,6 @@ use ibc::core::channel::types::proto::v1::MsgChannelOpenConfirm as RawMsgChannelOpenConfirm; use ibc::core::client::types::proto::v1::Height; -use ibc::core::host::identifiers::{ChannelId, PortId}; +use ibc::core::host::types::identifiers::{ChannelId, PortId}; use ibc::core::primitives::prelude::*; use super::dummy_proof; diff --git a/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_init.rs b/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_init.rs index 3bb2071df..090027aba 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_init.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_init.rs @@ -1,5 +1,5 @@ use ibc::core::channel::types::proto::v1::MsgChannelOpenInit as RawMsgChannelOpenInit; -use ibc::core::host::identifiers::PortId; +use ibc::core::host::types::identifiers::PortId; use ibc::core::primitives::prelude::*; use super::dummy_raw_channel_end; diff --git a/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_try.rs b/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_try.rs index 2fef523b0..85a4fa036 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_try.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/channel/chan_open_try.rs @@ -1,6 +1,6 @@ use ibc::core::channel::types::proto::v1::MsgChannelOpenTry as RawMsgChannelOpenTry; use ibc::core::client::types::proto::v1::Height; -use ibc::core::host::identifiers::PortId; +use ibc::core::host::types::identifiers::PortId; use ibc::core::primitives::prelude::*; use super::{dummy_proof, dummy_raw_channel_end}; diff --git a/crates/ibc-testkit/src/utils/dummies/core/channel/mod.rs b/crates/ibc-testkit/src/utils/dummies/core/channel/mod.rs index 46490bc2c..fad50ad02 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/channel/mod.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/channel/mod.rs @@ -20,7 +20,7 @@ pub use chan_open_try::*; use ibc::core::channel::types::proto::v1::{ Channel as RawChannel, Counterparty as RawCounterparty, }; -use ibc::core::host::identifiers::{ChannelId, ConnectionId, PortId}; +use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId}; use ibc::core::primitives::prelude::*; pub use packet::*; pub use recv_packet::*; diff --git a/crates/ibc-testkit/src/utils/dummies/core/channel/packet.rs b/crates/ibc-testkit/src/utils/dummies/core/channel/packet.rs index a27d8f178..7682c4200 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/channel/packet.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/channel/packet.rs @@ -2,7 +2,7 @@ use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::proto::v1::Packet as RawPacket; use ibc::core::channel::types::timeout::TimeoutHeight; use ibc::core::client::types::proto::v1::Height as RawHeight; -use ibc::core::host::identifiers::{ChannelId, PortId, Sequence}; +use ibc::core::host::types::identifiers::{ChannelId, PortId, Sequence}; use ibc::core::primitives::prelude::*; use ibc::core::primitives::Timestamp; use typed_builder::TypedBuilder; diff --git a/crates/ibc-testkit/src/utils/dummies/core/channel/recv_packet.rs b/crates/ibc-testkit/src/utils/dummies/core/channel/recv_packet.rs index 7962de063..a758961c4 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/channel/recv_packet.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/channel/recv_packet.rs @@ -6,7 +6,7 @@ use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::proto::v1::MsgRecvPacket as RawMsgRecvPacket; use ibc::core::client::types::proto::v1::Height as RawHeight; use ibc::core::client::types::Height; -use ibc::core::commitment::commitment::CommitmentProofBytes; +use ibc::core::commitment_types::commitment::CommitmentProofBytes; use ibc::core::primitives::{Signer, Timestamp}; use super::{dummy_proof, dummy_raw_packet}; diff --git a/crates/ibc-testkit/src/utils/dummies/core/client/msg_upgrade_client.rs b/crates/ibc-testkit/src/utils/dummies/core/client/msg_upgrade_client.rs index fcf6229ae..c5e75aae3 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/client/msg_upgrade_client.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/client/msg_upgrade_client.rs @@ -1,7 +1,7 @@ use ibc::core::client::types::msgs::MsgUpgradeClient; use ibc::core::client::types::proto::v1::MsgUpgradeClient as RawMsgUpgradeClient; use ibc::core::client::types::Height; -use ibc::core::host::identifiers::ClientId; +use ibc::core::host::types::identifiers::ClientId; use crate::testapp::ibc::clients::mock::client_state::MockClientState; use crate::testapp::ibc::clients::mock::consensus_state::MockConsensusState; diff --git a/crates/ibc-testkit/src/utils/dummies/core/commitment.rs b/crates/ibc-testkit/src/utils/dummies/core/commitment.rs index d387fd036..7abbd95c5 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/commitment.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/commitment.rs @@ -1,6 +1,6 @@ -use ibc::core::commitment::commitment::CommitmentProofBytes; -use ibc::core::commitment::proto::ics23::CommitmentProof; -use ibc::core::commitment::proto::v1::MerkleProof as RawMerkleProof; +use ibc::core::commitment_types::commitment::CommitmentProofBytes; +use ibc::core::commitment_types::proto::ics23::CommitmentProof; +use ibc::core::commitment_types::proto::v1::MerkleProof as RawMerkleProof; use ibc::core::primitives::prelude::*; /// Returns a dummy `CommitmentProofBytes`, for testing purposes only! diff --git a/crates/ibc-testkit/src/utils/dummies/core/connection/conn_open_ack.rs b/crates/ibc-testkit/src/utils/dummies/core/connection/conn_open_ack.rs index 6acb3705d..f0782cae2 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/connection/conn_open_ack.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/connection/conn_open_ack.rs @@ -3,7 +3,7 @@ use ibc::core::client::types::Height; use ibc::core::connection::types::msgs::MsgConnectionOpenAck; use ibc::core::connection::types::proto::v1::MsgConnectionOpenAck as RawMsgConnectionOpenAck; use ibc::core::connection::types::version::Version; -use ibc::core::host::identifiers::ConnectionId; +use ibc::core::host::types::identifiers::ConnectionId; use ibc::core::primitives::prelude::*; use crate::testapp::ibc::clients::mock::client_state::MockClientState; diff --git a/crates/ibc-testkit/src/utils/dummies/core/connection/conn_open_init.rs b/crates/ibc-testkit/src/utils/dummies/core/connection/conn_open_init.rs index db3547a74..24eadd989 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/connection/conn_open_init.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/connection/conn_open_init.rs @@ -4,7 +4,7 @@ use ibc::core::connection::types::proto::v1::{ }; use ibc::core::connection::types::version::Version; use ibc::core::connection::types::Counterparty; -use ibc::core::host::identifiers::ClientId; +use ibc::core::host::types::identifiers::ClientId; use ibc::core::primitives::prelude::*; use super::dummy_raw_counterparty_conn; diff --git a/crates/ibc-testkit/src/utils/dummies/core/connection/conn_open_try.rs b/crates/ibc-testkit/src/utils/dummies/core/connection/conn_open_try.rs index 4c77762b8..464e2c7f0 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/connection/conn_open_try.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/connection/conn_open_try.rs @@ -3,7 +3,7 @@ use ibc::core::client::types::Height; use ibc::core::connection::types::msgs::MsgConnectionOpenTry; use ibc::core::connection::types::proto::v1::MsgConnectionOpenTry as RawMsgConnectionOpenTry; use ibc::core::connection::types::version::get_compatible_versions; -use ibc::core::host::identifiers::{ClientId, ConnectionId}; +use ibc::core::host::types::identifiers::{ClientId, ConnectionId}; use ibc::core::primitives::prelude::*; use super::dummy_raw_counterparty_conn; diff --git a/crates/ibc-testkit/src/utils/dummies/core/connection/mod.rs b/crates/ibc-testkit/src/utils/dummies/core/connection/mod.rs index f7767677e..0567705c0 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/connection/mod.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/connection/mod.rs @@ -7,9 +7,9 @@ pub use conn_open_ack::*; pub use conn_open_confirm::*; pub use conn_open_init::*; pub use conn_open_try::*; -use ibc::core::commitment::proto::v1::MerklePrefix; +use ibc::core::commitment_types::proto::v1::MerklePrefix; use ibc::core::connection::types::proto::v1::Counterparty as RawCounterparty; -use ibc::core::host::identifiers::{ClientId, ConnectionId}; +use ibc::core::host::types::identifiers::{ClientId, ConnectionId}; use ibc::core::primitives::prelude::*; use typed_builder::TypedBuilder; diff --git a/crates/ibc-testkit/src/utils/dummies/core/context.rs b/crates/ibc-testkit/src/utils/dummies/core/context.rs index fd73a3510..9d1e0e345 100644 --- a/crates/ibc-testkit/src/utils/dummies/core/context.rs +++ b/crates/ibc-testkit/src/utils/dummies/core/context.rs @@ -4,7 +4,7 @@ use core::ops::{Add, Sub}; use core::time::Duration; use ibc::core::client::types::Height; -use ibc::core::host::identifiers::ChainId; +use ibc::core::host::types::identifiers::ChainId; use ibc::core::primitives::prelude::*; use ibc::core::primitives::Timestamp; use parking_lot::Mutex; diff --git a/crates/ibc-testkit/src/utils/fixture.rs b/crates/ibc-testkit/src/utils/fixture.rs index fa4222c61..6b3a5eb1a 100644 --- a/crates/ibc-testkit/src/utils/fixture.rs +++ b/crates/ibc-testkit/src/utils/fixture.rs @@ -1,6 +1,6 @@ use core::fmt::Debug; -use ibc::core::context::types::error::ContextError; +use ibc::core::handler::types::error::ContextError; use ibc::core::primitives::prelude::*; use crate::testapp::ibc::core::types::MockContext; diff --git a/crates/ibc-testkit/tests/applications/transfer.rs b/crates/ibc-testkit/tests/applications/transfer.rs index 05b4f6449..fd80415e7 100644 --- a/crates/ibc-testkit/tests/applications/transfer.rs +++ b/crates/ibc-testkit/tests/applications/transfer.rs @@ -1,6 +1,6 @@ use ibc::core::channel::types::channel::{Counterparty, Order}; use ibc::core::channel::types::Version; -use ibc::core::host::identifiers::{ChannelId, ConnectionId, PortId}; +use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId}; use ibc::core::primitives::prelude::*; use ibc_app_transfer::context::cosmos_adr028_escrow_address; use ibc_app_transfer::module::{ diff --git a/crates/ibc-testkit/tests/core/ics02_client/create_client.rs b/crates/ibc-testkit/tests/core/ics02_client/create_client.rs index 7083556c5..ef661aa91 100644 --- a/crates/ibc-testkit/tests/core/ics02_client/create_client.rs +++ b/crates/ibc-testkit/tests/core/ics02_client/create_client.rs @@ -3,10 +3,10 @@ use ibc::clients::ics07_tendermint::consensus_state::ConsensusState as TmConsens use ibc::core::client::context::client_state::ClientStateCommon; use ibc::core::client::types::msgs::{ClientMsg, MsgCreateClient}; use ibc::core::client::types::Height; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::ClientId; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::ClientId; +use ibc::core::host::ValidationContext; use ibc_testkit::testapp::ibc::clients::mock::client_state::{ client_type as mock_client_type, MockClientState, }; diff --git a/crates/ibc-testkit/tests/core/ics02_client/update_client.rs b/crates/ibc-testkit/tests/core/ics02_client/update_client.rs index 4eeb27b30..fd163e7f9 100644 --- a/crates/ibc-testkit/tests/core/ics02_client/update_client.rs +++ b/crates/ibc-testkit/tests/core/ics02_client/update_client.rs @@ -9,13 +9,13 @@ use ibc::core::client::context::client_state::{ClientStateCommon, ClientStateVal use ibc::core::client::context::ClientValidationContext; use ibc::core::client::types::msgs::{ClientMsg, MsgSubmitMisbehaviour, MsgUpdateClient}; use ibc::core::client::types::Height; -use ibc::core::commitment::specs::ProofSpecs; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; +use ibc::core::commitment_types::specs::ProofSpecs; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::{ChainId, ClientId, ClientType}; -use ibc::core::host::path::ClientConsensusStatePath; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ChainId, ClientId, ClientType}; +use ibc::core::host::types::path::ClientConsensusStatePath; +use ibc::core::host::ValidationContext; use ibc::core::primitives::{downcast, Timestamp}; use ibc::proto::tendermint::v1::{ClientState as RawTmClientState, Fraction}; use ibc::proto::Any; diff --git a/crates/ibc-testkit/tests/core/ics02_client/upgrade_client.rs b/crates/ibc-testkit/tests/core/ics02_client/upgrade_client.rs index 32ff52fdd..a0b32d809 100644 --- a/crates/ibc-testkit/tests/core/ics02_client/upgrade_client.rs +++ b/crates/ibc-testkit/tests/core/ics02_client/upgrade_client.rs @@ -2,13 +2,13 @@ use ibc::clients::ics07_tendermint::client_type; use ibc::core::client::types::error::{ClientError, UpgradeClientError}; use ibc::core::client::types::msgs::{ClientMsg, MsgUpgradeClient}; use ibc::core::client::types::Height; -use ibc::core::context::types::error::ContextError; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::ClientId; -use ibc::core::host::path::ClientConsensusStatePath; +use ibc::core::handler::types::error::ContextError; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::ClientId; +use ibc::core::host::types::path::ClientConsensusStatePath; +use ibc::core::host::ValidationContext; use ibc::core::primitives::downcast; use ibc_testkit::testapp::ibc::clients::mock::client_state::client_type as mock_client_type; use ibc_testkit::testapp::ibc::clients::{AnyClientState, AnyConsensusState}; diff --git a/crates/ibc-testkit/tests/core/ics03_connection/conn_open_ack.rs b/crates/ibc-testkit/tests/core/ics03_connection/conn_open_ack.rs index 8d90465ea..51617f664 100644 --- a/crates/ibc-testkit/tests/core/ics03_connection/conn_open_ack.rs +++ b/crates/ibc-testkit/tests/core/ics03_connection/conn_open_ack.rs @@ -1,16 +1,16 @@ use core::str::FromStr; use ibc::core::client::types::Height; -use ibc::core::commitment::commitment::CommitmentPrefix; +use ibc::core::commitment_types::commitment::CommitmentPrefix; use ibc::core::connection::types::error::ConnectionError; use ibc::core::connection::types::msgs::{ConnectionMsg, MsgConnectionOpenAck}; use ibc::core::connection::types::{ConnectionEnd, Counterparty, State}; -use ibc::core::context::types::error::ContextError; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::{ChainId, ClientId}; +use ibc::core::handler::types::error::ContextError; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ChainId, ClientId}; +use ibc::core::host::ValidationContext; use ibc::core::primitives::prelude::*; use ibc::core::primitives::ZERO_DURATION; use ibc_testkit::hosts::block::HostType; diff --git a/crates/ibc-testkit/tests/core/ics03_connection/conn_open_confirm.rs b/crates/ibc-testkit/tests/core/ics03_connection/conn_open_confirm.rs index d23e005c1..f39417b8a 100644 --- a/crates/ibc-testkit/tests/core/ics03_connection/conn_open_confirm.rs +++ b/crates/ibc-testkit/tests/core/ics03_connection/conn_open_confirm.rs @@ -1,14 +1,14 @@ use core::str::FromStr; use ibc::core::client::types::Height; -use ibc::core::commitment::commitment::CommitmentPrefix; +use ibc::core::commitment_types::commitment::CommitmentPrefix; use ibc::core::connection::types::msgs::{ConnectionMsg, MsgConnectionOpenConfirm}; use ibc::core::connection::types::{ConnectionEnd, Counterparty, State}; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::ClientId; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::ClientId; +use ibc::core::host::ValidationContext; use ibc::core::primitives::prelude::*; use ibc::core::primitives::ZERO_DURATION; use ibc_testkit::testapp::ibc::core::router::MockRouter; diff --git a/crates/ibc-testkit/tests/core/ics03_connection/conn_open_init.rs b/crates/ibc-testkit/tests/core/ics03_connection/conn_open_init.rs index 4747cfb77..1e78e4dcd 100644 --- a/crates/ibc-testkit/tests/core/ics03_connection/conn_open_init.rs +++ b/crates/ibc-testkit/tests/core/ics03_connection/conn_open_init.rs @@ -2,10 +2,10 @@ use ibc::core::client::types::Height; use ibc::core::connection::types::msgs::{ConnectionMsg, MsgConnectionOpenInit}; use ibc::core::connection::types::version::Version; use ibc::core::connection::types::State; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; use ibc::core::entrypoint::{execute, validate}; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::ValidationContext; use ibc::core::primitives::prelude::*; use ibc_testkit::testapp::ibc::core::router::MockRouter; use ibc_testkit::testapp::ibc::core::types::MockContext; diff --git a/crates/ibc-testkit/tests/core/ics03_connection/conn_open_try.rs b/crates/ibc-testkit/tests/core/ics03_connection/conn_open_try.rs index 0b5c6b59b..e1a662c6c 100644 --- a/crates/ibc-testkit/tests/core/ics03_connection/conn_open_try.rs +++ b/crates/ibc-testkit/tests/core/ics03_connection/conn_open_try.rs @@ -1,11 +1,11 @@ use ibc::core::client::types::Height; use ibc::core::connection::types::msgs::{ConnectionMsg, MsgConnectionOpenTry}; use ibc::core::connection::types::State; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::ChainId; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::ChainId; +use ibc::core::host::ValidationContext; use ibc::core::primitives::prelude::*; use ibc_testkit::hosts::block::HostType; use ibc_testkit::testapp::ibc::core::router::MockRouter; diff --git a/crates/ibc-testkit/tests/core/ics04_channel/acknowledgement.rs b/crates/ibc-testkit/tests/core/ics04_channel/acknowledgement.rs index 8f794dbc0..11fed0970 100644 --- a/crates/ibc-testkit/tests/core/ics04_channel/acknowledgement.rs +++ b/crates/ibc-testkit/tests/core/ics04_channel/acknowledgement.rs @@ -8,11 +8,11 @@ use ibc::core::connection::types::version::get_compatible_versions; use ibc::core::connection::types::{ ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState, }; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ExecutionContext; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::{ChannelId, ClientId, ConnectionId, PortId}; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ChannelId, ClientId, ConnectionId, PortId}; +use ibc::core::host::ExecutionContext; use ibc::core::primitives::*; use ibc_testkit::testapp::ibc::core::router::MockRouter; use ibc_testkit::testapp::ibc::core::types::MockContext; diff --git a/crates/ibc-testkit/tests/core/ics04_channel/chan_close_confirm.rs b/crates/ibc-testkit/tests/core/ics04_channel/chan_close_confirm.rs index a33b644e8..b308a2d29 100644 --- a/crates/ibc-testkit/tests/core/ics04_channel/chan_close_confirm.rs +++ b/crates/ibc-testkit/tests/core/ics04_channel/chan_close_confirm.rs @@ -5,11 +5,11 @@ use ibc::core::connection::types::version::get_compatible_versions; use ibc::core::connection::types::{ ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState, }; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::{ClientId, ConnectionId}; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ClientId, ConnectionId}; +use ibc::core::host::ValidationContext; use ibc::core::primitives::*; use ibc_testkit::testapp::ibc::clients::mock::client_state::client_type as mock_client_type; use ibc_testkit::testapp::ibc::core::router::MockRouter; diff --git a/crates/ibc-testkit/tests/core/ics04_channel/chan_close_init.rs b/crates/ibc-testkit/tests/core/ics04_channel/chan_close_init.rs index 22327349e..286a84c15 100644 --- a/crates/ibc-testkit/tests/core/ics04_channel/chan_close_init.rs +++ b/crates/ibc-testkit/tests/core/ics04_channel/chan_close_init.rs @@ -5,11 +5,11 @@ use ibc::core::connection::types::version::get_compatible_versions; use ibc::core::connection::types::{ ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState, }; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::{ClientId, ConnectionId}; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ClientId, ConnectionId}; +use ibc::core::host::ValidationContext; use ibc::core::primitives::*; use ibc_testkit::testapp::ibc::clients::mock::client_state::client_type as mock_client_type; use ibc_testkit::testapp::ibc::core::router::MockRouter; diff --git a/crates/ibc-testkit/tests/core/ics04_channel/chan_open_ack.rs b/crates/ibc-testkit/tests/core/ics04_channel/chan_open_ack.rs index 07b65b00f..4684a8728 100644 --- a/crates/ibc-testkit/tests/core/ics04_channel/chan_open_ack.rs +++ b/crates/ibc-testkit/tests/core/ics04_channel/chan_open_ack.rs @@ -5,10 +5,10 @@ use ibc::core::connection::types::version::get_compatible_versions; use ibc::core::connection::types::{ ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState, }; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::{ClientId, ConnectionId}; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ClientId, ConnectionId}; use ibc::core::primitives::*; use ibc::core::router::types::module::ModuleId; use ibc_app_transfer::types::MODULE_ID_STR; diff --git a/crates/ibc-testkit/tests/core/ics04_channel/chan_open_confirm.rs b/crates/ibc-testkit/tests/core/ics04_channel/chan_open_confirm.rs index cebe54810..6b3513571 100644 --- a/crates/ibc-testkit/tests/core/ics04_channel/chan_open_confirm.rs +++ b/crates/ibc-testkit/tests/core/ics04_channel/chan_open_confirm.rs @@ -6,10 +6,10 @@ use ibc::core::connection::types::version::get_compatible_versions; use ibc::core::connection::types::{ ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState, }; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::{ChannelId, ClientId, ConnectionId}; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ChannelId, ClientId, ConnectionId}; use ibc::core::primitives::*; use ibc_testkit::testapp::ibc::clients::mock::client_state::client_type as mock_client_type; use ibc_testkit::testapp::ibc::core::router::MockRouter; diff --git a/crates/ibc-testkit/tests/core/ics04_channel/chan_open_init.rs b/crates/ibc-testkit/tests/core/ics04_channel/chan_open_init.rs index 1b32334dc..efc1348f7 100644 --- a/crates/ibc-testkit/tests/core/ics04_channel/chan_open_init.rs +++ b/crates/ibc-testkit/tests/core/ics04_channel/chan_open_init.rs @@ -3,11 +3,11 @@ use ibc::core::channel::types::msgs::{ChannelMsg, MsgChannelOpenInit}; use ibc::core::client::types::Height; use ibc::core::connection::types::version::get_compatible_versions; use ibc::core::connection::types::{ConnectionEnd, State as ConnectionState}; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::{ClientId, ConnectionId}; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ClientId, ConnectionId}; +use ibc::core::host::ValidationContext; use ibc_testkit::testapp::ibc::core::router::MockRouter; use ibc_testkit::testapp::ibc::core::types::MockContext; use ibc_testkit::utils::core::channel::dummy_raw_msg_chan_open_init; diff --git a/crates/ibc-testkit/tests/core/ics04_channel/chan_open_try.rs b/crates/ibc-testkit/tests/core/ics04_channel/chan_open_try.rs index 240b78a36..3ebe68460 100644 --- a/crates/ibc-testkit/tests/core/ics04_channel/chan_open_try.rs +++ b/crates/ibc-testkit/tests/core/ics04_channel/chan_open_try.rs @@ -4,11 +4,11 @@ use ibc::core::connection::types::version::get_compatible_versions; use ibc::core::connection::types::{ ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState, }; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::{ClientId, ConnectionId}; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ClientId, ConnectionId}; +use ibc::core::host::ValidationContext; use ibc::core::primitives::*; use ibc_testkit::testapp::ibc::clients::mock::client_state::client_type as mock_client_type; use ibc_testkit::testapp::ibc::core::router::MockRouter; diff --git a/crates/ibc-testkit/tests/core/ics04_channel/recv_packet.rs b/crates/ibc-testkit/tests/core/ics04_channel/recv_packet.rs index 2aa1ed1cf..90fda5f92 100644 --- a/crates/ibc-testkit/tests/core/ics04_channel/recv_packet.rs +++ b/crates/ibc-testkit/tests/core/ics04_channel/recv_packet.rs @@ -8,11 +8,11 @@ use ibc::core::connection::types::version::get_compatible_versions; use ibc::core::connection::types::{ ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState, }; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ExecutionContext; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::{ChannelId, ClientId, ConnectionId, PortId}; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ChannelId, ClientId, ConnectionId, PortId}; +use ibc::core::host::ExecutionContext; use ibc::core::primitives::*; use ibc_testkit::relayer::context::RelayerContext; use ibc_testkit::testapp::ibc::core::router::MockRouter; diff --git a/crates/ibc-testkit/tests/core/ics04_channel/send_packet.rs b/crates/ibc-testkit/tests/core/ics04_channel/send_packet.rs index 7c434010a..d3b1fcbc4 100644 --- a/crates/ibc-testkit/tests/core/ics04_channel/send_packet.rs +++ b/crates/ibc-testkit/tests/core/ics04_channel/send_packet.rs @@ -10,8 +10,8 @@ use ibc::core::connection::types::version::get_compatible_versions; use ibc::core::connection::types::{ ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState, }; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::host::identifiers::{ChannelId, ClientId, ConnectionId, PortId}; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::host::types::identifiers::{ChannelId, ClientId, ConnectionId, PortId}; use ibc::core::primitives::*; use ibc_testkit::testapp::ibc::core::types::MockContext; use ibc_testkit::utils::core::channel::dummy_raw_packet; diff --git a/crates/ibc-testkit/tests/core/ics04_channel/timeout.rs b/crates/ibc-testkit/tests/core/ics04_channel/timeout.rs index 43cf92194..10cbe83c8 100644 --- a/crates/ibc-testkit/tests/core/ics04_channel/timeout.rs +++ b/crates/ibc-testkit/tests/core/ics04_channel/timeout.rs @@ -8,11 +8,11 @@ use ibc::core::connection::types::version::get_compatible_versions; use ibc::core::connection::types::{ ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState, }; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ExecutionContext; use ibc::core::entrypoint::{execute, validate}; -use ibc::core::host::identifiers::{ChannelId, ClientId, ConnectionId, PortId}; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ChannelId, ClientId, ConnectionId, PortId}; +use ibc::core::host::ExecutionContext; use ibc::core::primitives::*; use ibc_testkit::testapp::ibc::core::router::MockRouter; use ibc_testkit::testapp::ibc::core::types::MockContext; diff --git a/crates/ibc-testkit/tests/core/ics04_channel/timeout_on_close.rs b/crates/ibc-testkit/tests/core/ics04_channel/timeout_on_close.rs index 235017060..5e7a1b538 100644 --- a/crates/ibc-testkit/tests/core/ics04_channel/timeout_on_close.rs +++ b/crates/ibc-testkit/tests/core/ics04_channel/timeout_on_close.rs @@ -8,10 +8,10 @@ use ibc::core::connection::types::version::get_compatible_versions; use ibc::core::connection::types::{ ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState, }; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ExecutionContext; use ibc::core::entrypoint::validate; -use ibc::core::host::identifiers::{ChannelId, ClientId, ConnectionId, PortId}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::{ChannelId, ClientId, ConnectionId, PortId}; +use ibc::core::host::ExecutionContext; use ibc::core::primitives::*; use ibc_testkit::testapp::ibc::core::router::MockRouter; use ibc_testkit::testapp::ibc::core::types::MockContext; diff --git a/crates/ibc-testkit/tests/core/router.rs b/crates/ibc-testkit/tests/core/router.rs index f67a45b6e..e7ed1d107 100644 --- a/crates/ibc-testkit/tests/core/router.rs +++ b/crates/ibc-testkit/tests/core/router.rs @@ -7,13 +7,13 @@ use ibc::core::channel::types::timeout::TimeoutHeight; use ibc::core::client::types::msgs::{ClientMsg, MsgCreateClient, MsgUpdateClient}; use ibc::core::client::types::Height; use ibc::core::connection::types::msgs::ConnectionMsg; -use ibc::core::context::types::error::ContextError; -use ibc::core::context::types::events::{IbcEvent, MessageEvent}; -use ibc::core::context::types::msgs::MsgEnvelope; -use ibc::core::context::ValidationContext; use ibc::core::entrypoint::dispatch; -use ibc::core::host::identifiers::ConnectionId; -use ibc::core::host::path::CommitmentPath; +use ibc::core::handler::types::error::ContextError; +use ibc::core::handler::types::events::{IbcEvent, MessageEvent}; +use ibc::core::handler::types::msgs::MsgEnvelope; +use ibc::core::host::types::identifiers::ConnectionId; +use ibc::core::host::types::path::CommitmentPath; +use ibc::core::host::ValidationContext; use ibc::core::primitives::prelude::*; use ibc::core::primitives::Timestamp; use ibc_app_transfer::handler::send_transfer::send_transfer; diff --git a/crates/ibc/src/clients/ics07_tendermint/client_state.rs b/crates/ibc/src/clients/ics07_tendermint/client_state.rs index b30441b27..cd7137c51 100644 --- a/crates/ibc/src/clients/ics07_tendermint/client_state.rs +++ b/crates/ibc/src/clients/ics07_tendermint/client_state.rs @@ -16,12 +16,16 @@ use ibc_core::client::context::consensus_state::ConsensusState; use ibc_core::client::context::{ClientExecutionContext, ClientValidationContext}; use ibc_core::client::types::error::{ClientError, UpgradeClientError}; use ibc_core::client::types::{Height, Status, UpdateKind}; -use ibc_core::commitment::commitment::{CommitmentPrefix, CommitmentProofBytes, CommitmentRoot}; -use ibc_core::commitment::merkle::{apply_prefix, MerkleProof}; -use ibc_core::commitment::specs::ProofSpecs; -use ibc_core::context::ExecutionContext; -use ibc_core::host::identifiers::{ChainId, ClientId, ClientType}; -use ibc_core::host::path::{ClientConsensusStatePath, ClientStatePath, Path, UpgradeClientPath}; +use ibc_core::commitment_types::commitment::{ + CommitmentPrefix, CommitmentProofBytes, CommitmentRoot, +}; +use ibc_core::commitment_types::merkle::{apply_prefix, MerkleProof}; +use ibc_core::commitment_types::specs::ProofSpecs; +use ibc_core::host::types::identifiers::{ChainId, ClientId, ClientType}; +use ibc_core::host::types::path::{ + ClientConsensusStatePath, ClientStatePath, Path, UpgradeClientPath, +}; +use ibc_core::host::ExecutionContext; use ibc_core::primitives::prelude::*; use ibc_core::primitives::ZERO_DURATION; use ibc_proto::google::protobuf::Any; @@ -873,8 +877,8 @@ mod tests { use crate::clients::ics07_tendermint::client_state::{AllowUpdate, ClientState}; use crate::clients::ics07_tendermint::error::Error; use crate::core::client::types::Height; - use crate::core::commitment::specs::ProofSpecs; - use crate::core::host::identifiers::ChainId; + use crate::core::commitment_types::specs::ProofSpecs; + use crate::core::host::types::identifiers::ChainId; use crate::core::primitives::ZERO_DURATION; impl ClientState { diff --git a/crates/ibc/src/clients/ics07_tendermint/client_state/misbehaviour.rs b/crates/ibc/src/clients/ics07_tendermint/client_state/misbehaviour.rs index a312297eb..b1ab50809 100644 --- a/crates/ibc/src/clients/ics07_tendermint/client_state/misbehaviour.rs +++ b/crates/ibc/src/clients/ics07_tendermint/client_state/misbehaviour.rs @@ -1,7 +1,7 @@ use ibc_core::client::context::consensus_state::ConsensusState; use ibc_core::client::types::error::ClientError; -use ibc_core::host::identifiers::ClientId; -use ibc_core::host::path::ClientConsensusStatePath; +use ibc_core::host::types::identifiers::ClientId; +use ibc_core::host::types::path::ClientConsensusStatePath; use ibc_core::primitives::prelude::*; use ibc_core::primitives::Timestamp; use tendermint_light_client_verifier::Verifier; diff --git a/crates/ibc/src/clients/ics07_tendermint/client_state/update_client.rs b/crates/ibc/src/clients/ics07_tendermint/client_state/update_client.rs index caf49788b..4cc30834c 100644 --- a/crates/ibc/src/clients/ics07_tendermint/client_state/update_client.rs +++ b/crates/ibc/src/clients/ics07_tendermint/client_state/update_client.rs @@ -1,8 +1,8 @@ use ibc_core::client::context::consensus_state::ConsensusState; use ibc_core::client::context::ClientExecutionContext; use ibc_core::client::types::error::ClientError; -use ibc_core::host::identifiers::ClientId; -use ibc_core::host::path::ClientConsensusStatePath; +use ibc_core::host::types::identifiers::ClientId; +use ibc_core::host::types::path::ClientConsensusStatePath; use ibc_core::primitives::prelude::*; use tendermint_light_client_verifier::types::{TrustedBlockState, UntrustedBlockState}; use tendermint_light_client_verifier::Verifier; diff --git a/crates/ibc/src/clients/ics07_tendermint/consensus_state.rs b/crates/ibc/src/clients/ics07_tendermint/consensus_state.rs index 69db20430..c4de3bcb7 100644 --- a/crates/ibc/src/clients/ics07_tendermint/consensus_state.rs +++ b/crates/ibc/src/clients/ics07_tendermint/consensus_state.rs @@ -2,7 +2,7 @@ use ibc_core::client::context::consensus_state::ConsensusState as ConsensusStateTrait; use ibc_core::client::types::error::ClientError; -use ibc_core::commitment::commitment::CommitmentRoot; +use ibc_core::commitment_types::commitment::CommitmentRoot; use ibc_core::primitives::prelude::*; use ibc_core::primitives::Timestamp; use ibc_proto::google::protobuf::Any; diff --git a/crates/ibc/src/clients/ics07_tendermint/context.rs b/crates/ibc/src/clients/ics07_tendermint/context.rs index 7acc47185..ce9f850cc 100644 --- a/crates/ibc/src/clients/ics07_tendermint/context.rs +++ b/crates/ibc/src/clients/ics07_tendermint/context.rs @@ -2,9 +2,9 @@ use alloc::string::ToString; use ibc_core::client::context::ClientExecutionContext; use ibc_core::client::types::Height; -use ibc_core::context::types::error::ContextError; -use ibc_core::host::identifiers::ClientId; -use ibc_core::host::path::ClientConsensusStatePath; +use ibc_core::handler::types::error::ContextError; +use ibc_core::host::types::identifiers::ClientId; +use ibc_core::host::types::path::ClientConsensusStatePath; use ibc_core::primitives::prelude::*; use ibc_core::primitives::Timestamp; diff --git a/crates/ibc/src/clients/ics07_tendermint/error.rs b/crates/ibc/src/clients/ics07_tendermint/error.rs index cc54972fa..ef5a752ad 100644 --- a/crates/ibc/src/clients/ics07_tendermint/error.rs +++ b/crates/ibc/src/clients/ics07_tendermint/error.rs @@ -5,8 +5,8 @@ use core::time::Duration; use displaydoc::Display; use ibc_core::client::types::error::ClientError; use ibc_core::client::types::Height; -use ibc_core::host::error::IdentifierError; -use ibc_core::host::identifiers::ClientId; +use ibc_core::host::types::error::IdentifierError; +use ibc_core::host::types::identifiers::ClientId; use ibc_core::primitives::prelude::*; use tendermint::{Error as TendermintError, Hash}; use tendermint_light_client_verifier::errors::VerificationErrorDetail as LightClientErrorDetail; diff --git a/crates/ibc/src/clients/ics07_tendermint/header.rs b/crates/ibc/src/clients/ics07_tendermint/header.rs index beb688006..5f846cba5 100644 --- a/crates/ibc/src/clients/ics07_tendermint/header.rs +++ b/crates/ibc/src/clients/ics07_tendermint/header.rs @@ -7,7 +7,7 @@ use core::str::FromStr; use bytes::Buf; use ibc_core::client::types::error::ClientError; use ibc_core::client::types::Height; -use ibc_core::host::identifiers::ChainId; +use ibc_core::host::types::identifiers::ChainId; use ibc_core::primitives::prelude::*; use ibc_core::primitives::Timestamp; use ibc_proto::google::protobuf::Any; diff --git a/crates/ibc/src/clients/ics07_tendermint/misbehaviour.rs b/crates/ibc/src/clients/ics07_tendermint/misbehaviour.rs index 0e726280a..1462d4a61 100644 --- a/crates/ibc/src/clients/ics07_tendermint/misbehaviour.rs +++ b/crates/ibc/src/clients/ics07_tendermint/misbehaviour.rs @@ -2,7 +2,7 @@ use bytes::Buf; use ibc_core::client::types::error::ClientError; -use ibc_core::host::identifiers::ClientId; +use ibc_core::host::types::identifiers::ClientId; use ibc_core::primitives::prelude::*; use ibc_proto::google::protobuf::Any; use ibc_proto::ibc::lightclients::tendermint::v1::Misbehaviour as RawMisbehaviour; diff --git a/crates/ibc/src/clients/ics07_tendermint/mod.rs b/crates/ibc/src/clients/ics07_tendermint/mod.rs index c60af6939..62a0c2374 100644 --- a/crates/ibc/src/clients/ics07_tendermint/mod.rs +++ b/crates/ibc/src/clients/ics07_tendermint/mod.rs @@ -12,7 +12,7 @@ pub mod trust_threshold; mod context; pub use context::*; -use ibc_core::host::identifiers::ClientType; +use ibc_core::host::types::identifiers::ClientType; pub const TENDERMINT_CLIENT_TYPE: &str = "07-tendermint";